@vinctus/oql 1.1.23 → 1.1.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -68,7 +68,7 @@ Add the following lines to your `build.sbt`:
68
68
  ```sbt
69
69
  externalResolvers += "OQL" at "https://maven.pkg.github.com/vinctustech/oql"
70
70
 
71
- libraryDependencies += "com.vinctus" %%% "-vinctus-oql" % "1.1.23"
71
+ libraryDependencies += "com.vinctus" %%% "-vinctus-oql" % "1.1.24"
72
72
 
73
73
  Compile / npmDependencies ++= Seq(
74
74
  "pg" -> "8.10.0",
package/main.js CHANGED
@@ -1462,7 +1462,7 @@ $c_Lcom_vinctus_oql_AbstractOQL.prototype.processQuery__Lcom_vinctus_oql_OQLQuer
1462
1462
  return query
1463
1463
  });
1464
1464
  $c_Lcom_vinctus_oql_AbstractOQL.prototype.parseCondition__T__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression = (function(cond, entity) {
1465
- var expr = $m_Lcom_vinctus_oql_OQLParser$().parseBooleanExpression__T__Lcom_vinctus_oql_OQLExpression(cond);
1465
+ var expr = $m_Lcom_vinctus_oql_OQLParser$().parseExpression__T__Lcom_vinctus_oql_OQLExpression(cond);
1466
1466
  $m_Lcom_vinctus_oql_AbstractOQL$().decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, expr, this.Lcom_vinctus_oql_AbstractOQL__f_model, this.Lcom_vinctus_oql_AbstractOQL__f_ds, cond);
1467
1467
  return expr
1468
1468
  });
@@ -51690,16 +51690,16 @@ function $c_Lcom_vinctus_oql_OQLParser$() {
51690
51690
  this.Lcom_vinctus_oql_OQLParser$__f_restrictbitmap$1 = false;
51691
51691
  this.Lcom_vinctus_oql_OQLParser$__f_expressions$lzy1 = null;
51692
51692
  this.Lcom_vinctus_oql_OQLParser$__f_expressionsbitmap$1 = false;
51693
- this.Lcom_vinctus_oql_OQLParser$__f_booleanExpression$lzy1 = null;
51694
- this.Lcom_vinctus_oql_OQLParser$__f_booleanExpressionbitmap$1 = false;
51693
+ this.Lcom_vinctus_oql_OQLParser$__f_expression$lzy1 = null;
51694
+ this.Lcom_vinctus_oql_OQLParser$__f_expressionbitmap$1 = false;
51695
51695
  this.Lcom_vinctus_oql_OQLParser$__f_orExpression$lzy1 = null;
51696
51696
  this.Lcom_vinctus_oql_OQLParser$__f_orExpressionbitmap$1 = false;
51697
51697
  this.Lcom_vinctus_oql_OQLParser$__f_andExpression$lzy1 = null;
51698
51698
  this.Lcom_vinctus_oql_OQLParser$__f_andExpressionbitmap$1 = false;
51699
51699
  this.Lcom_vinctus_oql_OQLParser$__f_notExpression$lzy1 = null;
51700
51700
  this.Lcom_vinctus_oql_OQLParser$__f_notExpressionbitmap$1 = false;
51701
- this.Lcom_vinctus_oql_OQLParser$__f_booleanPrimary$lzy1 = null;
51702
- this.Lcom_vinctus_oql_OQLParser$__f_booleanPrimarybitmap$1 = false;
51701
+ this.Lcom_vinctus_oql_OQLParser$__f_comparisonExpression$lzy1 = null;
51702
+ this.Lcom_vinctus_oql_OQLParser$__f_comparisonExpressionbitmap$1 = false;
51703
51703
  this.Lcom_vinctus_oql_OQLParser$__f_isNull$lzy1 = null;
51704
51704
  this.Lcom_vinctus_oql_OQLParser$__f_isNullbitmap$1 = false;
51705
51705
  this.Lcom_vinctus_oql_OQLParser$__f_in$lzy1 = null;
@@ -51708,8 +51708,6 @@ function $c_Lcom_vinctus_oql_OQLParser$() {
51708
51708
  this.Lcom_vinctus_oql_OQLParser$__f_comparisonbitmap$1 = false;
51709
51709
  this.Lcom_vinctus_oql_OQLParser$__f_booleanLiteral$lzy1 = null;
51710
51710
  this.Lcom_vinctus_oql_OQLParser$__f_booleanLiteralbitmap$1 = false;
51711
- this.Lcom_vinctus_oql_OQLParser$__f_expression$lzy1 = null;
51712
- this.Lcom_vinctus_oql_OQLParser$__f_expressionbitmap$1 = false;
51713
51711
  this.Lcom_vinctus_oql_OQLParser$__f_additive$lzy1 = null;
51714
51712
  this.Lcom_vinctus_oql_OQLParser$__f_additivebitmap$1 = false;
51715
51713
  this.Lcom_vinctus_oql_OQLParser$__f_multiplicative$lzy1 = null;
@@ -52160,7 +52158,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.attributeName__s_util_parsing_combinato
52160
52158
  $c_Lcom_vinctus_oql_OQLParser$.prototype.applyExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52161
52159
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_applyExpressionbitmap$1)) {
52162
52160
  var p$1 = new $c_sjsr_AnonFunction0((() => $n($n(this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52163
- var p = new $c_sjsr_AnonFunction0((() => $n(this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))));
52161
+ var p = new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()));
52164
52162
  var q = new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(",", this)));
52165
52163
  return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
52166
52164
  })))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this)))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
@@ -52277,7 +52275,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.starExpression__s_util_parsing_combinat
52277
52275
  });
52278
52276
  $c_Lcom_vinctus_oql_OQLParser$.prototype.select__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52279
52277
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_selectbitmap$1)) {
52280
- var p = new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("[", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("]", this))))));
52278
+ var p = new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("[", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("]", this))))));
52281
52279
  this.Lcom_vinctus_oql_OQLParser$__f_select$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
52282
52280
  this.Lcom_vinctus_oql_OQLParser$__f_selectbitmap$1 = true
52283
52281
  };
@@ -52442,12 +52440,12 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.expressions__s_util_parsing_combinator_
52442
52440
  };
52443
52441
  return this.Lcom_vinctus_oql_OQLParser$__f_expressions$lzy1
52444
52442
  });
52445
- $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52446
- if ((!this.Lcom_vinctus_oql_OQLParser$__f_booleanExpressionbitmap$1)) {
52447
- this.Lcom_vinctus_oql_OQLParser$__f_booleanExpression$lzy1 = this.orExpression__s_util_parsing_combinator_PackratParsers$PackratParser();
52448
- this.Lcom_vinctus_oql_OQLParser$__f_booleanExpressionbitmap$1 = true
52443
+ $c_Lcom_vinctus_oql_OQLParser$.prototype.expression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52444
+ if ((!this.Lcom_vinctus_oql_OQLParser$__f_expressionbitmap$1)) {
52445
+ this.Lcom_vinctus_oql_OQLParser$__f_expression$lzy1 = this.orExpression__s_util_parsing_combinator_PackratParsers$PackratParser();
52446
+ this.Lcom_vinctus_oql_OQLParser$__f_expressionbitmap$1 = true
52449
52447
  };
52450
- return this.Lcom_vinctus_oql_OQLParser$__f_booleanExpression$lzy1
52448
+ return this.Lcom_vinctus_oql_OQLParser$__f_expression$lzy1
52451
52449
  });
52452
52450
  $c_Lcom_vinctus_oql_OQLParser$.prototype.orExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52453
52451
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_orExpressionbitmap$1)) {
@@ -52501,19 +52499,19 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.notExpression__s_util_parsing_combinato
52501
52499
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_notExpressionbitmap$1)) {
52502
52500
  var p = new $c_sjsr_AnonFunction0((() => {
52503
52501
  var r = this.kw__T__s_util_matching_Regex("NOT");
52504
- return $n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanPrimary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
52502
+ return $n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.comparisonExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
52505
52503
  var e$1 = $as_Lcom_vinctus_oql_OQLExpression(e);
52506
52504
  return new $c_Lcom_vinctus_oql_PrefixOQLExpression("NOT", e$1)
52507
- })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanPrimary__s_util_parsing_combinator_PackratParsers$PackratParser())))
52505
+ })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.comparisonExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))
52508
52506
  }));
52509
52507
  this.Lcom_vinctus_oql_OQLParser$__f_notExpression$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
52510
52508
  this.Lcom_vinctus_oql_OQLParser$__f_notExpressionbitmap$1 = true
52511
52509
  };
52512
52510
  return this.Lcom_vinctus_oql_OQLParser$__f_notExpression$lzy1
52513
52511
  });
52514
- $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52515
- if ((!this.Lcom_vinctus_oql_OQLParser$__f_booleanPrimarybitmap$1)) {
52516
- var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.comparison__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
52512
+ $c_Lcom_vinctus_oql_OQLParser$.prototype.comparisonExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52513
+ if ((!this.Lcom_vinctus_oql_OQLParser$__f_comparisonExpressionbitmap$1)) {
52514
+ var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n(this.additive__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.comparison__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.additive__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
52517
52515
  var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
52518
52516
  if ((x$1$1 !== null)) {
52519
52517
  $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -52527,7 +52525,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
52527
52525
  }
52528
52526
  };
52529
52527
  throw new $c_s_MatchError(x$1$1)
52530
- })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52528
+ })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.additive__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52531
52529
  var r$1 = this.kw__T__s_util_matching_Regex("NOT");
52532
52530
  return $n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$1, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52533
52531
  var r$2 = this.kw__T__s_util_matching_Regex("BETWEEN");
@@ -52536,10 +52534,10 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
52536
52534
  var r$3 = this.kw__T__s_util_matching_Regex("BETWEEN");
52537
52535
  return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$3, this)
52538
52536
  })))
52539
- })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52537
+ })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.additive__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52540
52538
  var r$4 = this.kw__T__s_util_matching_Regex("AND");
52541
52539
  return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$4, this)
52542
- })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$2) => {
52540
+ })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.additive__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$2) => {
52543
52541
  var x$1$3 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$2);
52544
52542
  if ((x$1$3 !== null)) {
52545
52543
  $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -52562,7 +52560,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
52562
52560
  }
52563
52561
  };
52564
52562
  throw new $c_s_MatchError(x$1$3)
52565
- }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.isNull__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$4) => {
52563
+ }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.additive__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.isNull__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$4) => {
52566
52564
  var x$1$5 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$4);
52567
52565
  if ((x$1$5 !== null)) {
52568
52566
  $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -52571,7 +52569,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
52571
52569
  return new $c_Lcom_vinctus_oql_PostfixOQLExpression(e$1, n)
52572
52570
  };
52573
52571
  throw new $c_s_MatchError(x$1$5)
52574
- }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.in__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expressions__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this)))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$6) => {
52572
+ }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.additive__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.in__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expressions__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this)))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$6) => {
52575
52573
  var x$1$7 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$6);
52576
52574
  if ((x$1$7 !== null)) {
52577
52575
  $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -52585,7 +52583,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
52585
52583
  }
52586
52584
  };
52587
52585
  throw new $c_s_MatchError(x$1$7)
52588
- }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.in__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this)))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$8) => {
52586
+ }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.additive__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.in__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this)))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$8) => {
52589
52587
  var x$1$9 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$8);
52590
52588
  if ((x$1$9 !== null)) {
52591
52589
  $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -52599,20 +52597,11 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
52599
52597
  }
52600
52598
  };
52601
52599
  throw new $c_s_MatchError(x$1$9)
52602
- }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52603
- var r$5 = this.kw__T__s_util_matching_Regex("EXISTS");
52604
- return $n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$5, this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query) => {
52605
- var query$1 = $as_Lcom_vinctus_oql_OQLQuery(query);
52606
- return new $c_Lcom_vinctus_oql_ExistsOQLExpression(query$1)
52607
- })))
52608
- })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanLiteral__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.qualifiedAttributeExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((expr) => {
52609
- var expr$1 = $as_Lcom_vinctus_oql_OQLExpression(expr);
52610
- return new $c_Lcom_vinctus_oql_GroupedOQLExpression(expr$1)
52611
- }))))))));
52612
- this.Lcom_vinctus_oql_OQLParser$__f_booleanPrimary$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
52613
- this.Lcom_vinctus_oql_OQLParser$__f_booleanPrimarybitmap$1 = true
52600
+ }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.additive__s_util_parsing_combinator_PackratParsers$PackratParser())))));
52601
+ this.Lcom_vinctus_oql_OQLParser$__f_comparisonExpression$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
52602
+ this.Lcom_vinctus_oql_OQLParser$__f_comparisonExpressionbitmap$1 = true
52614
52603
  };
52615
- return this.Lcom_vinctus_oql_OQLParser$__f_booleanPrimary$lzy1
52604
+ return this.Lcom_vinctus_oql_OQLParser$__f_comparisonExpression$lzy1
52616
52605
  });
52617
52606
  $c_Lcom_vinctus_oql_OQLParser$.prototype.isNull__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52618
52607
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_isNullbitmap$1)) {
@@ -52700,13 +52689,6 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanLiteral__s_util_parsing_combinat
52700
52689
  };
52701
52690
  return this.Lcom_vinctus_oql_OQLParser$__f_booleanLiteral$lzy1
52702
52691
  });
52703
- $c_Lcom_vinctus_oql_OQLParser$.prototype.expression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52704
- if ((!this.Lcom_vinctus_oql_OQLParser$__f_expressionbitmap$1)) {
52705
- this.Lcom_vinctus_oql_OQLParser$__f_expression$lzy1 = this.additive__s_util_parsing_combinator_PackratParsers$PackratParser();
52706
- this.Lcom_vinctus_oql_OQLParser$__f_expressionbitmap$1 = true
52707
- };
52708
- return this.Lcom_vinctus_oql_OQLParser$__f_expression$lzy1
52709
- });
52710
52692
  $c_Lcom_vinctus_oql_OQLParser$.prototype.additive__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52711
52693
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_additivebitmap$1)) {
52712
52694
  var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.additive__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("+", this).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("-", this)))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.multiplicative__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
@@ -52848,15 +52830,21 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.jsonExpression__s_util_parsing_combinat
52848
52830
  });
52849
52831
  $c_Lcom_vinctus_oql_OQLParser$.prototype.primary__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
52850
52832
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_primarybitmap$1)) {
52851
- var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n(this.castExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.literalExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.jsonExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.starExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.caseExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.applyExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.qualifiedAttributeExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("&", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifiers__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((_$2) => {
52833
+ var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n($n($n(this.booleanLiteral__s_util_parsing_combinator_PackratParsers$PackratParser()).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.castExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.literalExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.jsonExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.starExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.caseExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.applyExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52834
+ var r = this.kw__T__s_util_matching_Regex("EXISTS");
52835
+ return $n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query) => {
52836
+ var query$1 = $as_Lcom_vinctus_oql_OQLQuery(query);
52837
+ return new $c_Lcom_vinctus_oql_ExistsOQLExpression(query$1)
52838
+ })))
52839
+ })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.qualifiedAttributeExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("&", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifiers__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((_$2) => {
52852
52840
  var _$2$1 = $as_sci_List(_$2);
52853
52841
  return new $c_Lcom_vinctus_oql_ReferenceOQLExpression(_$2$1, null)
52854
52842
  }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("-", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.primary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
52855
52843
  var e$1 = $as_Lcom_vinctus_oql_OQLExpression(e);
52856
52844
  return new $c_Lcom_vinctus_oql_PrefixOQLExpression("-", e$1)
52857
- }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query) => {
52858
- var query$1 = $as_Lcom_vinctus_oql_OQLQuery(query);
52859
- return new $c_Lcom_vinctus_oql_QueryOQLExpression(query$1)
52845
+ }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query$2) => {
52846
+ var query$3 = $as_Lcom_vinctus_oql_OQLQuery(query$2);
52847
+ return new $c_Lcom_vinctus_oql_QueryOQLExpression(query$3)
52860
52848
  }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((expr) => {
52861
52849
  var expr$1 = $as_Lcom_vinctus_oql_OQLExpression(expr);
52862
52850
  return new $c_Lcom_vinctus_oql_GroupedOQLExpression(expr$1)
@@ -52902,7 +52890,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.when__s_util_parsing_combinator_Packrat
52902
52890
  if ((!this.Lcom_vinctus_oql_OQLParser$__f_whenbitmap$1)) {
52903
52891
  var p = new $c_sjsr_AnonFunction0((() => {
52904
52892
  var r = this.kw__T__s_util_matching_Regex("WHEN");
52905
- return $n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52893
+ return $n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
52906
52894
  var r$1 = this.kw__T__s_util_matching_Regex("THEN");
52907
52895
  return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$1, this)
52908
52896
  })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
@@ -53063,8 +53051,8 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.parseQuery__T__Lcom_vinctus_oql_OQLQuer
53063
53051
  };
53064
53052
  throw new $c_s_MatchError(x268)
53065
53053
  });
53066
- $c_Lcom_vinctus_oql_OQLParser$.prototype.parseBooleanExpression__T__Lcom_vinctus_oql_OQLExpression = (function(input) {
53067
- var p = this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser();
53054
+ $c_Lcom_vinctus_oql_OQLParser$.prototype.parseExpression__T__Lcom_vinctus_oql_OQLExpression = (function(input) {
53055
+ var p = this.expression__s_util_parsing_combinator_PackratParsers$PackratParser();
53068
53056
  var p$1 = $f_s_util_parsing_combinator_PackratParsers__phrase__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
53069
53057
  var in$1 = $ct_s_util_parsing_combinator_PackratParsers$PackratReader__s_util_parsing_combinator_PackratParsers__s_util_parsing_input_Reader__(new $c_s_util_parsing_combinator_PackratParsers$PackratReader(), this, $ct_s_util_parsing_input_CharSequenceReader__jl_CharSequence__(new $c_s_util_parsing_input_CharSequenceReader(), input));
53070
53058
  var x277 = $f_s_util_parsing_combinator_RegexParsers__parseAll__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_input_Reader__s_util_parsing_combinator_Parsers$ParseResult(this, p$1, in$1);