diff --git a/grammar.js b/grammar.js
index dfd3231..24a455d 100644
--- a/grammar.js
+++ b/grammar.js
@@ -4,6 +4,7 @@ module.exports = grammar({
   conflicts: $ => [
     [$.simpleId, $.className],
     [$.simpleId, $.literalId],
+    [$.moduleName, $.varName],
     [$.simpleId, $.moduleInstantiation],
     [$.className, $.moduleInstantiation],
   ],
@@ -407,7 +408,7 @@ module.exports = grammar({
     ),
 
     moduleInstantiation: $ => seq(
-      $._upper_id,
+      field("name", $.moduleName),
       "<",
       sep1($.signatureExpr, ","),
       ">"
diff --git a/package.json b/package.json
index 6cb9b0d..4f7c00b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "author": "Sam Lanning <sam@samlanning.com>",
   "license": "MIT",
   "devDependencies": {
-    "tree-sitter-cli": "^0.19.5"
+    "tree-sitter-cli": "^0.20.6"
   },
   "scripts": {
     "tree-sitter": "tree-sitter",
@@ -42,4 +42,4 @@
     "example": "examples",
     "test": "test"
   }
-}
+}
\ No newline at end of file
diff --git a/src/grammar.json b/src/grammar.json
index 576200a..39921fd 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -2962,8 +2962,12 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_upper_id"
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "moduleName"
+          }
         },
         {
           "type": "STRING",
@@ -3310,6 +3314,10 @@
       "simpleId",
       "literalId"
     ],
+    [
+      "moduleName",
+      "varName"
+    ],
     [
       "simpleId",
       "moduleInstantiation"
diff --git a/src/node-types.json b/src/node-types.json
index 80d934c..40f1ecb 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -3296,7 +3296,18 @@
   {
     "type": "moduleInstantiation",
     "named": true,
-    "fields": {},
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "moduleName",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": true,
diff --git a/src/parser.c b/src/parser.c
index 7ff542f..88134ef 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -6,7 +6,7 @@
 #endif
 
 #define LANGUAGE_VERSION 13
-#define STATE_COUNT 2003
+#define STATE_COUNT 2004
 #define LARGE_STATE_COUNT 359
 #define SYMBOL_COUNT 190
 #define ALIAS_COUNT 0
@@ -1421,9 +1421,9 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [2] = {.index = 1, .length = 1},
   [3] = {.index = 2, .length = 1},
   [4] = {.index = 3, .length = 2},
-  [5] = {.index = 5, .length = 1},
-  [6] = {.index = 6, .length = 1},
-  [7] = {.index = 7, .length = 2},
+  [5] = {.index = 5, .length = 2},
+  [6] = {.index = 7, .length = 1},
+  [7] = {.index = 8, .length = 1},
   [8] = {.index = 9, .length = 1},
   [9] = {.index = 10, .length = 2},
   [10] = {.index = 12, .length = 2},
@@ -1499,12 +1499,12 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_name, 0},
     {field_name, 1, .inherited = true},
   [5] =
-    {field_type_expr, 0},
-  [6] =
-    {field_predicate, 0},
-  [7] =
     {field_name, 1},
     {field_returnType, 0},
+  [7] =
+    {field_type_expr, 0},
+  [8] =
+    {field_predicate, 0},
   [9] =
     {field_name, 2},
   [10] =
@@ -3109,7 +3109,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [437] = {.lex_state = 0},
   [438] = {.lex_state = 0},
   [439] = {.lex_state = 0},
-  [440] = {.lex_state = 0},
+  [440] = {.lex_state = 16},
   [441] = {.lex_state = 0},
   [442] = {.lex_state = 0},
   [443] = {.lex_state = 0},
@@ -3126,10 +3126,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [454] = {.lex_state = 0},
   [455] = {.lex_state = 0},
   [456] = {.lex_state = 0},
-  [457] = {.lex_state = 0},
-  [458] = {.lex_state = 16},
-  [459] = {.lex_state = 0},
-  [460] = {.lex_state = 0},
+  [457] = {.lex_state = 16},
+  [458] = {.lex_state = 0},
+  [459] = {.lex_state = 16},
+  [460] = {.lex_state = 16},
   [461] = {.lex_state = 0},
   [462] = {.lex_state = 0},
   [463] = {.lex_state = 0},
@@ -3214,8 +3214,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [542] = {.lex_state = 0},
   [543] = {.lex_state = 0},
   [544] = {.lex_state = 0},
-  [545] = {.lex_state = 16},
-  [546] = {.lex_state = 16},
+  [545] = {.lex_state = 0},
+  [546] = {.lex_state = 0},
   [547] = {.lex_state = 0},
   [548] = {.lex_state = 0},
   [549] = {.lex_state = 0},
@@ -3223,7 +3223,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [551] = {.lex_state = 0},
   [552] = {.lex_state = 0},
   [553] = {.lex_state = 0},
-  [554] = {.lex_state = 16},
+  [554] = {.lex_state = 0},
   [555] = {.lex_state = 0},
   [556] = {.lex_state = 0},
   [557] = {.lex_state = 0},
@@ -3375,24 +3375,24 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [703] = {.lex_state = 16},
   [704] = {.lex_state = 16},
   [705] = {.lex_state = 16},
-  [706] = {.lex_state = 16},
+  [706] = {.lex_state = 0},
   [707] = {.lex_state = 16},
-  [708] = {.lex_state = 16},
+  [708] = {.lex_state = 0},
   [709] = {.lex_state = 16},
-  [710] = {.lex_state = 16},
+  [710] = {.lex_state = 0},
   [711] = {.lex_state = 16},
   [712] = {.lex_state = 16},
-  [713] = {.lex_state = 16},
-  [714] = {.lex_state = 16},
-  [715] = {.lex_state = 16},
-  [716] = {.lex_state = 16},
+  [713] = {.lex_state = 0},
+  [714] = {.lex_state = 0},
+  [715] = {.lex_state = 0},
+  [716] = {.lex_state = 0},
   [717] = {.lex_state = 16},
   [718] = {.lex_state = 16},
   [719] = {.lex_state = 16},
   [720] = {.lex_state = 16},
   [721] = {.lex_state = 16},
   [722] = {.lex_state = 16},
-  [723] = {.lex_state = 16},
+  [723] = {.lex_state = 0},
   [724] = {.lex_state = 16},
   [725] = {.lex_state = 16},
   [726] = {.lex_state = 16},
@@ -3405,9 +3405,9 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [733] = {.lex_state = 16},
   [734] = {.lex_state = 16},
   [735] = {.lex_state = 16},
-  [736] = {.lex_state = 16},
+  [736] = {.lex_state = 0},
   [737] = {.lex_state = 16},
-  [738] = {.lex_state = 16},
+  [738] = {.lex_state = 0},
   [739] = {.lex_state = 16},
   [740] = {.lex_state = 16},
   [741] = {.lex_state = 16},
@@ -3416,39 +3416,39 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [744] = {.lex_state = 16},
   [745] = {.lex_state = 16},
   [746] = {.lex_state = 16},
-  [747] = {.lex_state = 16},
+  [747] = {.lex_state = 0},
   [748] = {.lex_state = 16},
   [749] = {.lex_state = 16},
   [750] = {.lex_state = 16},
-  [751] = {.lex_state = 0},
-  [752] = {.lex_state = 16},
-  [753] = {.lex_state = 0},
+  [751] = {.lex_state = 16},
+  [752] = {.lex_state = 0},
+  [753] = {.lex_state = 16},
   [754] = {.lex_state = 0},
   [755] = {.lex_state = 0},
-  [756] = {.lex_state = 0},
+  [756] = {.lex_state = 16},
   [757] = {.lex_state = 0},
-  [758] = {.lex_state = 16},
+  [758] = {.lex_state = 0},
   [759] = {.lex_state = 0},
-  [760] = {.lex_state = 16},
+  [760] = {.lex_state = 0},
   [761] = {.lex_state = 16},
-  [762] = {.lex_state = 16},
-  [763] = {.lex_state = 0},
+  [762] = {.lex_state = 0},
+  [763] = {.lex_state = 16},
   [764] = {.lex_state = 16},
   [765] = {.lex_state = 16},
-  [766] = {.lex_state = 16},
+  [766] = {.lex_state = 0},
   [767] = {.lex_state = 0},
-  [768] = {.lex_state = 16},
-  [769] = {.lex_state = 16},
-  [770] = {.lex_state = 16},
-  [771] = {.lex_state = 16},
+  [768] = {.lex_state = 0},
+  [769] = {.lex_state = 0},
+  [770] = {.lex_state = 0},
+  [771] = {.lex_state = 0},
   [772] = {.lex_state = 0},
-  [773] = {.lex_state = 0},
-  [774] = {.lex_state = 0},
-  [775] = {.lex_state = 16},
-  [776] = {.lex_state = 16},
+  [773] = {.lex_state = 16},
+  [774] = {.lex_state = 16},
+  [775] = {.lex_state = 0},
+  [776] = {.lex_state = 0},
   [777] = {.lex_state = 0},
   [778] = {.lex_state = 0},
-  [779] = {.lex_state = 0},
+  [779] = {.lex_state = 16},
   [780] = {.lex_state = 0},
   [781] = {.lex_state = 0},
   [782] = {.lex_state = 0},
@@ -3460,28 +3460,28 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [788] = {.lex_state = 16},
   [789] = {.lex_state = 16},
   [790] = {.lex_state = 16},
-  [791] = {.lex_state = 0},
+  [791] = {.lex_state = 16},
   [792] = {.lex_state = 16},
-  [793] = {.lex_state = 0},
+  [793] = {.lex_state = 16},
   [794] = {.lex_state = 16},
   [795] = {.lex_state = 16},
-  [796] = {.lex_state = 0},
-  [797] = {.lex_state = 0},
-  [798] = {.lex_state = 0},
-  [799] = {.lex_state = 0},
-  [800] = {.lex_state = 0},
-  [801] = {.lex_state = 0},
-  [802] = {.lex_state = 0},
-  [803] = {.lex_state = 0},
+  [796] = {.lex_state = 16},
+  [797] = {.lex_state = 16},
+  [798] = {.lex_state = 16},
+  [799] = {.lex_state = 16},
+  [800] = {.lex_state = 16},
+  [801] = {.lex_state = 16},
+  [802] = {.lex_state = 16},
+  [803] = {.lex_state = 16},
   [804] = {.lex_state = 16},
   [805] = {.lex_state = 16},
-  [806] = {.lex_state = 0},
-  [807] = {.lex_state = 0},
+  [806] = {.lex_state = 16},
+  [807] = {.lex_state = 16},
   [808] = {.lex_state = 16},
-  [809] = {.lex_state = 0},
+  [809] = {.lex_state = 16},
   [810] = {.lex_state = 16},
-  [811] = {.lex_state = 0},
-  [812] = {.lex_state = 0},
+  [811] = {.lex_state = 16},
+  [812] = {.lex_state = 16},
   [813] = {.lex_state = 16},
   [814] = {.lex_state = 16},
   [815] = {.lex_state = 16},
@@ -3490,12 +3490,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [818] = {.lex_state = 16},
   [819] = {.lex_state = 16},
   [820] = {.lex_state = 16},
-  [821] = {.lex_state = 0},
-  [822] = {.lex_state = 16},
+  [821] = {.lex_state = 16},
+  [822] = {.lex_state = 0},
   [823] = {.lex_state = 16},
   [824] = {.lex_state = 16},
   [825] = {.lex_state = 16},
-  [826] = {.lex_state = 16},
+  [826] = {.lex_state = 0},
   [827] = {.lex_state = 16},
   [828] = {.lex_state = 16},
   [829] = {.lex_state = 16},
@@ -3515,7 +3515,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [843] = {.lex_state = 16},
   [844] = {.lex_state = 16},
   [845] = {.lex_state = 16},
-  [846] = {.lex_state = 0},
+  [846] = {.lex_state = 16},
   [847] = {.lex_state = 16},
   [848] = {.lex_state = 16},
   [849] = {.lex_state = 16},
@@ -3529,29 +3529,29 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [857] = {.lex_state = 16},
   [858] = {.lex_state = 16},
   [859] = {.lex_state = 16},
-  [860] = {.lex_state = 16},
+  [860] = {.lex_state = 0},
   [861] = {.lex_state = 16},
-  [862] = {.lex_state = 16},
-  [863] = {.lex_state = 0},
-  [864] = {.lex_state = 0},
-  [865] = {.lex_state = 0},
-  [866] = {.lex_state = 0},
+  [862] = {.lex_state = 0},
+  [863] = {.lex_state = 16},
+  [864] = {.lex_state = 16},
+  [865] = {.lex_state = 16},
+  [866] = {.lex_state = 16},
   [867] = {.lex_state = 16},
   [868] = {.lex_state = 16},
   [869] = {.lex_state = 16},
-  [870] = {.lex_state = 16},
-  [871] = {.lex_state = 16},
+  [870] = {.lex_state = 0},
+  [871] = {.lex_state = 0},
   [872] = {.lex_state = 16},
   [873] = {.lex_state = 0},
   [874] = {.lex_state = 16},
   [875] = {.lex_state = 0},
   [876] = {.lex_state = 16},
-  [877] = {.lex_state = 16},
+  [877] = {.lex_state = 0},
   [878] = {.lex_state = 16},
   [879] = {.lex_state = 16},
   [880] = {.lex_state = 16},
   [881] = {.lex_state = 16},
-  [882] = {.lex_state = 0},
+  [882] = {.lex_state = 16},
   [883] = {.lex_state = 16},
   [884] = {.lex_state = 0},
   [885] = {.lex_state = 16},
@@ -3565,14 +3565,14 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [893] = {.lex_state = 16},
   [894] = {.lex_state = 16},
   [895] = {.lex_state = 16},
-  [896] = {.lex_state = 0},
+  [896] = {.lex_state = 16},
   [897] = {.lex_state = 16},
   [898] = {.lex_state = 16},
   [899] = {.lex_state = 16},
   [900] = {.lex_state = 16},
   [901] = {.lex_state = 16},
   [902] = {.lex_state = 16},
-  [903] = {.lex_state = 0},
+  [903] = {.lex_state = 16},
   [904] = {.lex_state = 16},
   [905] = {.lex_state = 16},
   [906] = {.lex_state = 16},
@@ -3584,7 +3584,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [912] = {.lex_state = 16},
   [913] = {.lex_state = 16},
   [914] = {.lex_state = 16},
-  [915] = {.lex_state = 16},
+  [915] = {.lex_state = 0},
   [916] = {.lex_state = 16},
   [917] = {.lex_state = 16},
   [918] = {.lex_state = 16},
@@ -3595,12 +3595,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [923] = {.lex_state = 16},
   [924] = {.lex_state = 16},
   [925] = {.lex_state = 16},
-  [926] = {.lex_state = 0},
+  [926] = {.lex_state = 16},
   [927] = {.lex_state = 16},
   [928] = {.lex_state = 16},
   [929] = {.lex_state = 16},
   [930] = {.lex_state = 16},
-  [931] = {.lex_state = 16},
+  [931] = {.lex_state = 0},
   [932] = {.lex_state = 16},
   [933] = {.lex_state = 16},
   [934] = {.lex_state = 16},
@@ -3616,13 +3616,13 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [944] = {.lex_state = 16},
   [945] = {.lex_state = 16},
   [946] = {.lex_state = 16},
-  [947] = {.lex_state = 0},
+  [947] = {.lex_state = 16},
   [948] = {.lex_state = 16},
-  [949] = {.lex_state = 0},
-  [950] = {.lex_state = 16},
+  [949] = {.lex_state = 16},
+  [950] = {.lex_state = 0},
   [951] = {.lex_state = 16},
   [952] = {.lex_state = 16},
-  [953] = {.lex_state = 0},
+  [953] = {.lex_state = 16},
   [954] = {.lex_state = 16},
   [955] = {.lex_state = 16},
   [956] = {.lex_state = 16},
@@ -3630,204 +3630,204 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [958] = {.lex_state = 16},
   [959] = {.lex_state = 16},
   [960] = {.lex_state = 16},
-  [961] = {.lex_state = 16},
+  [961] = {.lex_state = 0},
   [962] = {.lex_state = 16},
   [963] = {.lex_state = 16},
   [964] = {.lex_state = 16},
   [965] = {.lex_state = 16},
   [966] = {.lex_state = 16},
-  [967] = {.lex_state = 0},
+  [967] = {.lex_state = 16},
   [968] = {.lex_state = 16},
   [969] = {.lex_state = 16},
   [970] = {.lex_state = 16},
   [971] = {.lex_state = 16},
   [972] = {.lex_state = 16},
-  [973] = {.lex_state = 16},
+  [973] = {.lex_state = 0},
   [974] = {.lex_state = 16},
   [975] = {.lex_state = 16},
-  [976] = {.lex_state = 16},
+  [976] = {.lex_state = 0},
   [977] = {.lex_state = 16},
-  [978] = {.lex_state = 16},
-  [979] = {.lex_state = 0},
+  [978] = {.lex_state = 0},
+  [979] = {.lex_state = 16},
   [980] = {.lex_state = 16},
-  [981] = {.lex_state = 0},
+  [981] = {.lex_state = 16},
   [982] = {.lex_state = 0},
-  [983] = {.lex_state = 0},
+  [983] = {.lex_state = 16},
   [984] = {.lex_state = 16},
   [985] = {.lex_state = 16},
-  [986] = {.lex_state = 0},
+  [986] = {.lex_state = 16},
   [987] = {.lex_state = 16},
   [988] = {.lex_state = 0},
-  [989] = {.lex_state = 16},
+  [989] = {.lex_state = 0},
   [990] = {.lex_state = 16},
-  [991] = {.lex_state = 16},
-  [992] = {.lex_state = 0},
-  [993] = {.lex_state = 0},
+  [991] = {.lex_state = 0},
+  [992] = {.lex_state = 16},
+  [993] = {.lex_state = 16},
   [994] = {.lex_state = 16},
   [995] = {.lex_state = 16},
   [996] = {.lex_state = 16},
   [997] = {.lex_state = 16},
   [998] = {.lex_state = 0},
-  [999] = {.lex_state = 16},
-  [1000] = {.lex_state = 16},
-  [1001] = {.lex_state = 16},
-  [1002] = {.lex_state = 0},
+  [999] = {.lex_state = 0},
+  [1000] = {.lex_state = 0},
+  [1001] = {.lex_state = 0},
+  [1002] = {.lex_state = 16},
   [1003] = {.lex_state = 16},
-  [1004] = {.lex_state = 0},
-  [1005] = {.lex_state = 0},
+  [1004] = {.lex_state = 16},
+  [1005] = {.lex_state = 16},
   [1006] = {.lex_state = 16},
   [1007] = {.lex_state = 16},
-  [1008] = {.lex_state = 0},
+  [1008] = {.lex_state = 16},
   [1009] = {.lex_state = 0},
-  [1010] = {.lex_state = 16},
-  [1011] = {.lex_state = 0},
-  [1012] = {.lex_state = 16},
-  [1013] = {.lex_state = 0},
-  [1014] = {.lex_state = 16},
+  [1010] = {.lex_state = 0},
+  [1011] = {.lex_state = 16},
+  [1012] = {.lex_state = 0},
+  [1013] = {.lex_state = 16},
+  [1014] = {.lex_state = 0},
   [1015] = {.lex_state = 16},
-  [1016] = {.lex_state = 16},
-  [1017] = {.lex_state = 0},
+  [1016] = {.lex_state = 0},
+  [1017] = {.lex_state = 16},
   [1018] = {.lex_state = 16},
-  [1019] = {.lex_state = 16},
-  [1020] = {.lex_state = 16},
-  [1021] = {.lex_state = 0},
+  [1019] = {.lex_state = 0},
+  [1020] = {.lex_state = 0},
+  [1021] = {.lex_state = 16},
   [1022] = {.lex_state = 16},
-  [1023] = {.lex_state = 0},
+  [1023] = {.lex_state = 16},
   [1024] = {.lex_state = 16},
   [1025] = {.lex_state = 16},
-  [1026] = {.lex_state = 0},
-  [1027] = {.lex_state = 16},
+  [1026] = {.lex_state = 16},
+  [1027] = {.lex_state = 0},
   [1028] = {.lex_state = 0},
-  [1029] = {.lex_state = 16},
-  [1030] = {.lex_state = 16},
-  [1031] = {.lex_state = 16},
-  [1032] = {.lex_state = 0},
+  [1029] = {.lex_state = 0},
+  [1030] = {.lex_state = 0},
+  [1031] = {.lex_state = 0},
+  [1032] = {.lex_state = 16},
   [1033] = {.lex_state = 0},
-  [1034] = {.lex_state = 16},
-  [1035] = {.lex_state = 16},
+  [1034] = {.lex_state = 0},
+  [1035] = {.lex_state = 0},
   [1036] = {.lex_state = 16},
   [1037] = {.lex_state = 16},
   [1038] = {.lex_state = 16},
   [1039] = {.lex_state = 16},
   [1040] = {.lex_state = 16},
-  [1041] = {.lex_state = 0},
+  [1041] = {.lex_state = 16},
   [1042] = {.lex_state = 16},
   [1043] = {.lex_state = 16},
   [1044] = {.lex_state = 16},
   [1045] = {.lex_state = 16},
   [1046] = {.lex_state = 16},
   [1047] = {.lex_state = 16},
-  [1048] = {.lex_state = 0},
-  [1049] = {.lex_state = 16},
-  [1050] = {.lex_state = 16},
+  [1048] = {.lex_state = 16},
+  [1049] = {.lex_state = 0},
+  [1050] = {.lex_state = 0},
   [1051] = {.lex_state = 16},
-  [1052] = {.lex_state = 0},
+  [1052] = {.lex_state = 16},
   [1053] = {.lex_state = 16},
-  [1054] = {.lex_state = 16},
+  [1054] = {.lex_state = 0},
   [1055] = {.lex_state = 16},
-  [1056] = {.lex_state = 0},
+  [1056] = {.lex_state = 16},
   [1057] = {.lex_state = 16},
   [1058] = {.lex_state = 16},
   [1059] = {.lex_state = 16},
   [1060] = {.lex_state = 16},
   [1061] = {.lex_state = 16},
-  [1062] = {.lex_state = 16},
+  [1062] = {.lex_state = 0},
   [1063] = {.lex_state = 16},
-  [1064] = {.lex_state = 0},
-  [1065] = {.lex_state = 16},
+  [1064] = {.lex_state = 16},
+  [1065] = {.lex_state = 0},
   [1066] = {.lex_state = 16},
-  [1067] = {.lex_state = 0},
+  [1067] = {.lex_state = 16},
   [1068] = {.lex_state = 16},
-  [1069] = {.lex_state = 0},
+  [1069] = {.lex_state = 16},
   [1070] = {.lex_state = 0},
   [1071] = {.lex_state = 16},
   [1072] = {.lex_state = 16},
-  [1073] = {.lex_state = 0},
-  [1074] = {.lex_state = 16},
-  [1075] = {.lex_state = 16},
+  [1073] = {.lex_state = 16},
+  [1074] = {.lex_state = 0},
+  [1075] = {.lex_state = 0},
   [1076] = {.lex_state = 16},
   [1077] = {.lex_state = 16},
   [1078] = {.lex_state = 16},
-  [1079] = {.lex_state = 16},
+  [1079] = {.lex_state = 0},
   [1080] = {.lex_state = 16},
-  [1081] = {.lex_state = 0},
-  [1082] = {.lex_state = 16},
+  [1081] = {.lex_state = 16},
+  [1082] = {.lex_state = 0},
   [1083] = {.lex_state = 16},
-  [1084] = {.lex_state = 0},
+  [1084] = {.lex_state = 16},
   [1085] = {.lex_state = 16},
   [1086] = {.lex_state = 16},
   [1087] = {.lex_state = 16},
   [1088] = {.lex_state = 0},
   [1089] = {.lex_state = 16},
   [1090] = {.lex_state = 16},
-  [1091] = {.lex_state = 0},
+  [1091] = {.lex_state = 16},
   [1092] = {.lex_state = 16},
-  [1093] = {.lex_state = 16},
-  [1094] = {.lex_state = 16},
+  [1093] = {.lex_state = 0},
+  [1094] = {.lex_state = 0},
   [1095] = {.lex_state = 16},
-  [1096] = {.lex_state = 16},
+  [1096] = {.lex_state = 0},
   [1097] = {.lex_state = 16},
   [1098] = {.lex_state = 16},
   [1099] = {.lex_state = 16},
   [1100] = {.lex_state = 16},
   [1101] = {.lex_state = 16},
   [1102] = {.lex_state = 0},
-  [1103] = {.lex_state = 0},
-  [1104] = {.lex_state = 0},
+  [1103] = {.lex_state = 16},
+  [1104] = {.lex_state = 16},
   [1105] = {.lex_state = 16},
-  [1106] = {.lex_state = 0},
+  [1106] = {.lex_state = 16},
   [1107] = {.lex_state = 16},
-  [1108] = {.lex_state = 0},
-  [1109] = {.lex_state = 0},
+  [1108] = {.lex_state = 16},
+  [1109] = {.lex_state = 16},
   [1110] = {.lex_state = 16},
-  [1111] = {.lex_state = 16},
+  [1111] = {.lex_state = 0},
   [1112] = {.lex_state = 16},
   [1113] = {.lex_state = 16},
-  [1114] = {.lex_state = 16},
-  [1115] = {.lex_state = 0},
+  [1114] = {.lex_state = 0},
+  [1115] = {.lex_state = 16},
   [1116] = {.lex_state = 16},
-  [1117] = {.lex_state = 0},
+  [1117] = {.lex_state = 16},
   [1118] = {.lex_state = 16},
   [1119] = {.lex_state = 16},
   [1120] = {.lex_state = 16},
   [1121] = {.lex_state = 0},
-  [1122] = {.lex_state = 0},
+  [1122] = {.lex_state = 16},
   [1123] = {.lex_state = 16},
-  [1124] = {.lex_state = 16},
+  [1124] = {.lex_state = 0},
   [1125] = {.lex_state = 0},
-  [1126] = {.lex_state = 16},
+  [1126] = {.lex_state = 0},
   [1127] = {.lex_state = 16},
-  [1128] = {.lex_state = 0},
-  [1129] = {.lex_state = 16},
+  [1128] = {.lex_state = 16},
+  [1129] = {.lex_state = 0},
   [1130] = {.lex_state = 16},
   [1131] = {.lex_state = 16},
   [1132] = {.lex_state = 16},
-  [1133] = {.lex_state = 16},
-  [1134] = {.lex_state = 16},
+  [1133] = {.lex_state = 0},
+  [1134] = {.lex_state = 0},
   [1135] = {.lex_state = 16},
   [1136] = {.lex_state = 16},
   [1137] = {.lex_state = 16},
   [1138] = {.lex_state = 16},
   [1139] = {.lex_state = 16},
   [1140] = {.lex_state = 16},
-  [1141] = {.lex_state = 0},
+  [1141] = {.lex_state = 16},
   [1142] = {.lex_state = 16},
-  [1143] = {.lex_state = 16},
+  [1143] = {.lex_state = 0},
   [1144] = {.lex_state = 16},
   [1145] = {.lex_state = 16},
   [1146] = {.lex_state = 16},
-  [1147] = {.lex_state = 16},
+  [1147] = {.lex_state = 0},
   [1148] = {.lex_state = 16},
-  [1149] = {.lex_state = 16},
+  [1149] = {.lex_state = 0},
   [1150] = {.lex_state = 16},
-  [1151] = {.lex_state = 16},
+  [1151] = {.lex_state = 0},
   [1152] = {.lex_state = 16},
-  [1153] = {.lex_state = 0},
-  [1154] = {.lex_state = 0},
-  [1155] = {.lex_state = 16},
+  [1153] = {.lex_state = 16},
+  [1154] = {.lex_state = 16},
+  [1155] = {.lex_state = 0},
   [1156] = {.lex_state = 16},
-  [1157] = {.lex_state = 16},
-  [1158] = {.lex_state = 0},
+  [1157] = {.lex_state = 0},
+  [1158] = {.lex_state = 16},
   [1159] = {.lex_state = 16},
   [1160] = {.lex_state = 16},
   [1161] = {.lex_state = 16},
@@ -3836,41 +3836,41 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1164] = {.lex_state = 16},
   [1165] = {.lex_state = 16},
   [1166] = {.lex_state = 16},
-  [1167] = {.lex_state = 16},
+  [1167] = {.lex_state = 0},
   [1168] = {.lex_state = 16},
   [1169] = {.lex_state = 16},
   [1170] = {.lex_state = 16},
-  [1171] = {.lex_state = 0},
+  [1171] = {.lex_state = 16},
   [1172] = {.lex_state = 16},
-  [1173] = {.lex_state = 0},
+  [1173] = {.lex_state = 16},
   [1174] = {.lex_state = 16},
   [1175] = {.lex_state = 16},
   [1176] = {.lex_state = 16},
   [1177] = {.lex_state = 16},
-  [1178] = {.lex_state = 16},
+  [1178] = {.lex_state = 0},
   [1179] = {.lex_state = 16},
-  [1180] = {.lex_state = 0},
-  [1181] = {.lex_state = 0},
-  [1182] = {.lex_state = 0},
-  [1183] = {.lex_state = 0},
+  [1180] = {.lex_state = 16},
+  [1181] = {.lex_state = 16},
+  [1182] = {.lex_state = 16},
+  [1183] = {.lex_state = 16},
   [1184] = {.lex_state = 0},
   [1185] = {.lex_state = 0},
-  [1186] = {.lex_state = 0},
+  [1186] = {.lex_state = 16},
   [1187] = {.lex_state = 0},
   [1188] = {.lex_state = 0},
   [1189] = {.lex_state = 0},
-  [1190] = {.lex_state = 16},
+  [1190] = {.lex_state = 0},
   [1191] = {.lex_state = 0},
   [1192] = {.lex_state = 0},
-  [1193] = {.lex_state = 0},
+  [1193] = {.lex_state = 16},
   [1194] = {.lex_state = 0},
   [1195] = {.lex_state = 0},
   [1196] = {.lex_state = 0},
   [1197] = {.lex_state = 0},
-  [1198] = {.lex_state = 0},
-  [1199] = {.lex_state = 0},
+  [1198] = {.lex_state = 16},
+  [1199] = {.lex_state = 16},
   [1200] = {.lex_state = 0},
-  [1201] = {.lex_state = 16},
+  [1201] = {.lex_state = 0},
   [1202] = {.lex_state = 0},
   [1203] = {.lex_state = 0},
   [1204] = {.lex_state = 16},
@@ -3879,26 +3879,26 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1207] = {.lex_state = 0},
   [1208] = {.lex_state = 0},
   [1209] = {.lex_state = 0},
-  [1210] = {.lex_state = 0},
-  [1211] = {.lex_state = 0},
-  [1212] = {.lex_state = 16},
+  [1210] = {.lex_state = 16},
+  [1211] = {.lex_state = 16},
+  [1212] = {.lex_state = 0},
   [1213] = {.lex_state = 0},
   [1214] = {.lex_state = 0},
-  [1215] = {.lex_state = 0},
-  [1216] = {.lex_state = 0},
-  [1217] = {.lex_state = 0},
+  [1215] = {.lex_state = 16},
+  [1216] = {.lex_state = 16},
+  [1217] = {.lex_state = 16},
   [1218] = {.lex_state = 0},
   [1219] = {.lex_state = 0},
   [1220] = {.lex_state = 0},
   [1221] = {.lex_state = 0},
-  [1222] = {.lex_state = 16},
+  [1222] = {.lex_state = 0},
   [1223] = {.lex_state = 0},
-  [1224] = {.lex_state = 0},
+  [1224] = {.lex_state = 16},
   [1225] = {.lex_state = 0},
   [1226] = {.lex_state = 0},
   [1227] = {.lex_state = 0},
   [1228] = {.lex_state = 0},
-  [1229] = {.lex_state = 0},
+  [1229] = {.lex_state = 16},
   [1230] = {.lex_state = 0},
   [1231] = {.lex_state = 0},
   [1232] = {.lex_state = 0},
@@ -3906,7 +3906,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1234] = {.lex_state = 0},
   [1235] = {.lex_state = 0},
   [1236] = {.lex_state = 0},
-  [1237] = {.lex_state = 16},
+  [1237] = {.lex_state = 0},
   [1238] = {.lex_state = 0},
   [1239] = {.lex_state = 0},
   [1240] = {.lex_state = 0},
@@ -3921,10 +3921,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1249] = {.lex_state = 0},
   [1250] = {.lex_state = 0},
   [1251] = {.lex_state = 0},
-  [1252] = {.lex_state = 16},
+  [1252] = {.lex_state = 0},
   [1253] = {.lex_state = 0},
   [1254] = {.lex_state = 0},
-  [1255] = {.lex_state = 16},
+  [1255] = {.lex_state = 0},
   [1256] = {.lex_state = 0},
   [1257] = {.lex_state = 0},
   [1258] = {.lex_state = 0},
@@ -3935,7 +3935,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1263] = {.lex_state = 0},
   [1264] = {.lex_state = 0},
   [1265] = {.lex_state = 0},
-  [1266] = {.lex_state = 16},
+  [1266] = {.lex_state = 0},
   [1267] = {.lex_state = 0},
   [1268] = {.lex_state = 0},
   [1269] = {.lex_state = 0},
@@ -3983,7 +3983,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1311] = {.lex_state = 0},
   [1312] = {.lex_state = 0},
   [1313] = {.lex_state = 0},
-  [1314] = {.lex_state = 16},
+  [1314] = {.lex_state = 0},
   [1315] = {.lex_state = 0},
   [1316] = {.lex_state = 0},
   [1317] = {.lex_state = 0},
@@ -4002,9 +4002,9 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1330] = {.lex_state = 0},
   [1331] = {.lex_state = 0},
   [1332] = {.lex_state = 0},
-  [1333] = {.lex_state = 16},
+  [1333] = {.lex_state = 0},
   [1334] = {.lex_state = 0},
-  [1335] = {.lex_state = 16},
+  [1335] = {.lex_state = 0},
   [1336] = {.lex_state = 0},
   [1337] = {.lex_state = 0},
   [1338] = {.lex_state = 0},
@@ -4012,7 +4012,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1340] = {.lex_state = 0},
   [1341] = {.lex_state = 0},
   [1342] = {.lex_state = 0},
-  [1343] = {.lex_state = 16},
+  [1343] = {.lex_state = 0},
   [1344] = {.lex_state = 0},
   [1345] = {.lex_state = 0},
   [1346] = {.lex_state = 0},
@@ -4033,8 +4033,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1361] = {.lex_state = 0},
   [1362] = {.lex_state = 0},
   [1363] = {.lex_state = 0},
-  [1364] = {.lex_state = 0},
-  [1365] = {.lex_state = 0},
+  [1364] = {.lex_state = 16},
+  [1365] = {.lex_state = 16},
   [1366] = {.lex_state = 0},
   [1367] = {.lex_state = 0},
   [1368] = {.lex_state = 0},
@@ -4047,18 +4047,18 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1375] = {.lex_state = 0},
   [1376] = {.lex_state = 0},
   [1377] = {.lex_state = 0},
-  [1378] = {.lex_state = 16},
+  [1378] = {.lex_state = 0},
   [1379] = {.lex_state = 0},
   [1380] = {.lex_state = 0},
   [1381] = {.lex_state = 0},
   [1382] = {.lex_state = 0},
-  [1383] = {.lex_state = 16},
+  [1383] = {.lex_state = 0},
   [1384] = {.lex_state = 0},
   [1385] = {.lex_state = 0},
   [1386] = {.lex_state = 0},
   [1387] = {.lex_state = 0},
-  [1388] = {.lex_state = 16},
-  [1389] = {.lex_state = 16},
+  [1388] = {.lex_state = 0},
+  [1389] = {.lex_state = 0},
   [1390] = {.lex_state = 16},
   [1391] = {.lex_state = 16},
   [1392] = {.lex_state = 16},
@@ -4092,49 +4092,49 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1420] = {.lex_state = 16},
   [1421] = {.lex_state = 16},
   [1422] = {.lex_state = 16},
-  [1423] = {.lex_state = 2},
+  [1423] = {.lex_state = 16},
   [1424] = {.lex_state = 16},
   [1425] = {.lex_state = 16},
   [1426] = {.lex_state = 16},
   [1427] = {.lex_state = 16},
   [1428] = {.lex_state = 16},
-  [1429] = {.lex_state = 2},
+  [1429] = {.lex_state = 16},
   [1430] = {.lex_state = 16},
-  [1431] = {.lex_state = 16},
-  [1432] = {.lex_state = 16},
-  [1433] = {.lex_state = 0},
+  [1431] = {.lex_state = 2},
+  [1432] = {.lex_state = 2},
+  [1433] = {.lex_state = 2},
   [1434] = {.lex_state = 0},
-  [1435] = {.lex_state = 0},
+  [1435] = {.lex_state = 2},
   [1436] = {.lex_state = 0},
   [1437] = {.lex_state = 0},
-  [1438] = {.lex_state = 2},
+  [1438] = {.lex_state = 0},
   [1439] = {.lex_state = 0},
-  [1440] = {.lex_state = 16},
+  [1440] = {.lex_state = 0},
   [1441] = {.lex_state = 0},
   [1442] = {.lex_state = 2},
   [1443] = {.lex_state = 2},
-  [1444] = {.lex_state = 2},
+  [1444] = {.lex_state = 16},
   [1445] = {.lex_state = 16},
   [1446] = {.lex_state = 16},
-  [1447] = {.lex_state = 2},
-  [1448] = {.lex_state = 0},
+  [1447] = {.lex_state = 16},
+  [1448] = {.lex_state = 16},
   [1449] = {.lex_state = 16},
-  [1450] = {.lex_state = 0},
-  [1451] = {.lex_state = 16},
-  [1452] = {.lex_state = 16},
-  [1453] = {.lex_state = 16},
+  [1450] = {.lex_state = 2},
+  [1451] = {.lex_state = 0},
+  [1452] = {.lex_state = 0},
+  [1453] = {.lex_state = 0},
   [1454] = {.lex_state = 16},
-  [1455] = {.lex_state = 0},
+  [1455] = {.lex_state = 16},
   [1456] = {.lex_state = 16},
   [1457] = {.lex_state = 16},
-  [1458] = {.lex_state = 0},
+  [1458] = {.lex_state = 16},
   [1459] = {.lex_state = 16},
   [1460] = {.lex_state = 16},
   [1461] = {.lex_state = 16},
   [1462] = {.lex_state = 16},
   [1463] = {.lex_state = 16},
   [1464] = {.lex_state = 16},
-  [1465] = {.lex_state = 16},
+  [1465] = {.lex_state = 0},
   [1466] = {.lex_state = 16},
   [1467] = {.lex_state = 16},
   [1468] = {.lex_state = 16},
@@ -4143,17 +4143,17 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1471] = {.lex_state = 16},
   [1472] = {.lex_state = 16},
   [1473] = {.lex_state = 16},
-  [1474] = {.lex_state = 2},
+  [1474] = {.lex_state = 16},
   [1475] = {.lex_state = 16},
   [1476] = {.lex_state = 16},
   [1477] = {.lex_state = 16},
   [1478] = {.lex_state = 16},
   [1479] = {.lex_state = 16},
   [1480] = {.lex_state = 16},
-  [1481] = {.lex_state = 2},
+  [1481] = {.lex_state = 16},
   [1482] = {.lex_state = 16},
-  [1483] = {.lex_state = 16},
-  [1484] = {.lex_state = 16},
+  [1483] = {.lex_state = 2},
+  [1484] = {.lex_state = 2},
   [1485] = {.lex_state = 16},
   [1486] = {.lex_state = 16},
   [1487] = {.lex_state = 16},
@@ -4266,7 +4266,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1594] = {.lex_state = 16},
   [1595] = {.lex_state = 16},
   [1596] = {.lex_state = 16},
-  [1597] = {.lex_state = 2},
+  [1597] = {.lex_state = 16},
   [1598] = {.lex_state = 16},
   [1599] = {.lex_state = 16},
   [1600] = {.lex_state = 16},
@@ -4310,10 +4310,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1638] = {.lex_state = 16},
   [1639] = {.lex_state = 16},
   [1640] = {.lex_state = 16},
-  [1641] = {.lex_state = 16},
+  [1641] = {.lex_state = 2},
   [1642] = {.lex_state = 16},
   [1643] = {.lex_state = 16},
-  [1644] = {.lex_state = 2},
+  [1644] = {.lex_state = 16},
   [1645] = {.lex_state = 16},
   [1646] = {.lex_state = 16},
   [1647] = {.lex_state = 16},
@@ -4341,23 +4341,23 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1669] = {.lex_state = 16},
   [1670] = {.lex_state = 16},
   [1671] = {.lex_state = 16},
-  [1672] = {.lex_state = 16},
+  [1672] = {.lex_state = 2},
   [1673] = {.lex_state = 16},
   [1674] = {.lex_state = 16},
   [1675] = {.lex_state = 16},
   [1676] = {.lex_state = 16},
-  [1677] = {.lex_state = 2},
+  [1677] = {.lex_state = 16},
   [1678] = {.lex_state = 16},
   [1679] = {.lex_state = 16},
   [1680] = {.lex_state = 16},
-  [1681] = {.lex_state = 2},
+  [1681] = {.lex_state = 16},
   [1682] = {.lex_state = 16},
   [1683] = {.lex_state = 16},
   [1684] = {.lex_state = 16},
   [1685] = {.lex_state = 16},
   [1686] = {.lex_state = 16},
   [1687] = {.lex_state = 16},
-  [1688] = {.lex_state = 16},
+  [1688] = {.lex_state = 2},
   [1689] = {.lex_state = 16},
   [1690] = {.lex_state = 16},
   [1691] = {.lex_state = 16},
@@ -4370,7 +4370,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1698] = {.lex_state = 16},
   [1699] = {.lex_state = 16},
   [1700] = {.lex_state = 16},
-  [1701] = {.lex_state = 16},
+  [1701] = {.lex_state = 2},
   [1702] = {.lex_state = 16},
   [1703] = {.lex_state = 16},
   [1704] = {.lex_state = 16},
@@ -4385,13 +4385,13 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1713] = {.lex_state = 16},
   [1714] = {.lex_state = 16},
   [1715] = {.lex_state = 16},
-  [1716] = {.lex_state = 16},
+  [1716] = {.lex_state = 2},
   [1717] = {.lex_state = 16},
   [1718] = {.lex_state = 16},
   [1719] = {.lex_state = 16},
-  [1720] = {.lex_state = 16},
+  [1720] = {.lex_state = 2},
   [1721] = {.lex_state = 16},
-  [1722] = {.lex_state = 2},
+  [1722] = {.lex_state = 16},
   [1723] = {.lex_state = 16},
   [1724] = {.lex_state = 16},
   [1725] = {.lex_state = 16},
@@ -4402,12 +4402,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1730] = {.lex_state = 16},
   [1731] = {.lex_state = 16},
   [1732] = {.lex_state = 16},
-  [1733] = {.lex_state = 2},
+  [1733] = {.lex_state = 16},
   [1734] = {.lex_state = 16},
-  [1735] = {.lex_state = 16},
+  [1735] = {.lex_state = 2},
   [1736] = {.lex_state = 16},
   [1737] = {.lex_state = 16},
-  [1738] = {.lex_state = 2},
+  [1738] = {.lex_state = 16},
   [1739] = {.lex_state = 16},
   [1740] = {.lex_state = 16},
   [1741] = {.lex_state = 16},
@@ -4417,7 +4417,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1745] = {.lex_state = 16},
   [1746] = {.lex_state = 16},
   [1747] = {.lex_state = 16},
-  [1748] = {.lex_state = 16},
+  [1748] = {.lex_state = 2},
   [1749] = {.lex_state = 16},
   [1750] = {.lex_state = 16},
   [1751] = {.lex_state = 16},
@@ -4429,7 +4429,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1757] = {.lex_state = 16},
   [1758] = {.lex_state = 16},
   [1759] = {.lex_state = 16},
-  [1760] = {.lex_state = 16},
+  [1760] = {.lex_state = 2},
   [1761] = {.lex_state = 16},
   [1762] = {.lex_state = 16},
   [1763] = {.lex_state = 16},
@@ -4452,14 +4452,14 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1780] = {.lex_state = 16},
   [1781] = {.lex_state = 16},
   [1782] = {.lex_state = 16},
-  [1783] = {.lex_state = 16},
-  [1784] = {.lex_state = 2},
-  [1785] = {.lex_state = 2},
+  [1783] = {.lex_state = 2},
+  [1784] = {.lex_state = 16},
+  [1785] = {.lex_state = 16},
   [1786] = {.lex_state = 16},
   [1787] = {.lex_state = 16},
   [1788] = {.lex_state = 16},
   [1789] = {.lex_state = 16},
-  [1790] = {.lex_state = 2},
+  [1790] = {.lex_state = 16},
   [1791] = {.lex_state = 16},
   [1792] = {.lex_state = 16},
   [1793] = {.lex_state = 16},
@@ -4472,7 +4472,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1800] = {.lex_state = 16},
   [1801] = {.lex_state = 16},
   [1802] = {.lex_state = 16},
-  [1803] = {.lex_state = 16},
+  [1803] = {.lex_state = 2},
   [1804] = {.lex_state = 16},
   [1805] = {.lex_state = 16},
   [1806] = {.lex_state = 16},
@@ -4523,7 +4523,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1851] = {.lex_state = 16},
   [1852] = {.lex_state = 16},
   [1853] = {.lex_state = 16},
-  [1854] = {.lex_state = 2},
+  [1854] = {.lex_state = 16},
   [1855] = {.lex_state = 16},
   [1856] = {.lex_state = 16},
   [1857] = {.lex_state = 16},
@@ -4672,6 +4672,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [2000] = {.lex_state = 16},
   [2001] = {.lex_state = 16},
   [2002] = {.lex_state = 16},
+  [2003] = {.lex_state = 16},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -4762,23 +4763,24 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(1),
   },
   [1] = {
-    [sym_ql] = STATE(1983),
-    [sym_module] = STATE(1220),
-    [sym_moduleMember] = STATE(693),
-    [sym_importDirective] = STATE(1220),
-    [sym_classlessPredicate] = STATE(1220),
-    [sym_datatype] = STATE(1220),
-    [sym_select] = STATE(1220),
-    [sym_dataclass] = STATE(1220),
+    [sym_ql] = STATE(1975),
+    [sym_module] = STATE(1230),
+    [sym_moduleMember] = STATE(699),
+    [sym_importDirective] = STATE(1230),
+    [sym_classlessPredicate] = STATE(1230),
+    [sym_datatype] = STATE(1230),
+    [sym_select] = STATE(1230),
+    [sym_dataclass] = STATE(1230),
     [sym_annotation] = STATE(702),
-    [sym_annotName] = STATE(1388),
-    [sym_moduleExpr] = STATE(1981),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(1759),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1756),
-    [aux_sym_ql_repeat1] = STATE(693),
+    [sym_annotName] = STATE(1399),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1942),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(1668),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1788),
+    [aux_sym_ql_repeat1] = STATE(699),
     [aux_sym_moduleMember_repeat1] = STATE(702),
     [ts_builtin_sym_end] = ACTIONS(7),
     [sym__lower_id] = ACTIONS(9),
@@ -4802,51 +4804,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_predicate] = ACTIONS(33),
   },
   [2] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1968),
-    [sym_expr_aggregate_body] = STATE(1968),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1912),
+    [sym_expr_aggregate_body] = STATE(1912),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(39),
@@ -4891,51 +4894,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [3] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1834),
-    [sym_expr_aggregate_body] = STATE(1834),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1808),
+    [sym_expr_aggregate_body] = STATE(1808),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(69),
@@ -4980,51 +4984,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [4] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1882),
-    [sym_expr_aggregate_body] = STATE(1882),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1957),
+    [sym_expr_aggregate_body] = STATE(1957),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(71),
@@ -5069,51 +5074,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [5] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1887),
-    [sym_expr_aggregate_body] = STATE(1887),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1815),
+    [sym_expr_aggregate_body] = STATE(1815),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(73),
@@ -5158,51 +5164,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [6] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1894),
-    [sym_expr_aggregate_body] = STATE(1894),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1843),
+    [sym_expr_aggregate_body] = STATE(1843),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(75),
@@ -5247,51 +5254,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [7] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1870),
-    [sym_expr_aggregate_body] = STATE(1870),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1938),
+    [sym_expr_aggregate_body] = STATE(1938),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(77),
@@ -5336,51 +5344,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [8] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1840),
-    [sym_expr_aggregate_body] = STATE(1840),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1930),
+    [sym_expr_aggregate_body] = STATE(1930),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(79),
@@ -5425,51 +5434,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [9] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1918),
-    [sym_expr_aggregate_body] = STATE(1918),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1909),
+    [sym_expr_aggregate_body] = STATE(1909),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(81),
@@ -5514,51 +5524,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [10] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1901),
-    [sym_expr_aggregate_body] = STATE(1901),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1855),
+    [sym_expr_aggregate_body] = STATE(1855),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(83),
@@ -5603,51 +5614,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [11] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1937),
-    [sym_expr_aggregate_body] = STATE(1937),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1939),
+    [sym_expr_aggregate_body] = STATE(1939),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(85),
@@ -5692,51 +5704,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [12] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1827),
-    [sym_expr_aggregate_body] = STATE(1827),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1934),
+    [sym_expr_aggregate_body] = STATE(1934),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(87),
@@ -5781,51 +5794,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [13] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1975),
-    [sym_expr_aggregate_body] = STATE(1975),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1993),
+    [sym_expr_aggregate_body] = STATE(1993),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(89),
@@ -5870,51 +5884,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [14] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1933),
-    [sym_expr_aggregate_body] = STATE(1933),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1904),
+    [sym_expr_aggregate_body] = STATE(1904),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(91),
@@ -5959,51 +5974,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [15] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1897),
-    [sym_expr_aggregate_body] = STATE(1897),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1937),
+    [sym_expr_aggregate_body] = STATE(1937),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(93),
@@ -6048,51 +6064,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [16] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1926),
-    [sym_expr_aggregate_body] = STATE(1926),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1955),
+    [sym_expr_aggregate_body] = STATE(1955),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(95),
@@ -6137,51 +6154,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [17] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1917),
-    [sym_expr_aggregate_body] = STATE(1917),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1902),
+    [sym_expr_aggregate_body] = STATE(1902),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(97),
@@ -6226,51 +6244,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [18] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1807),
-    [sym_expr_aggregate_body] = STATE(1807),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1990),
+    [sym_expr_aggregate_body] = STATE(1990),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(99),
@@ -6315,51 +6334,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [19] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1934),
-    [sym_expr_aggregate_body] = STATE(1934),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1963),
+    [sym_expr_aggregate_body] = STATE(1963),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(101),
@@ -6404,51 +6424,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [20] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1859),
-    [sym_expr_aggregate_body] = STATE(1859),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1876),
+    [sym_expr_aggregate_body] = STATE(1876),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(103),
@@ -6493,51 +6514,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [21] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1830),
-    [sym_expr_aggregate_body] = STATE(1830),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1826),
+    [sym_expr_aggregate_body] = STATE(1826),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(105),
@@ -6582,51 +6604,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [22] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_full_aggregate_body] = STATE(1872),
-    [sym_expr_aggregate_body] = STATE(1872),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_varDecl] = STATE(1553),
-    [sym_asExprs] = STATE(1673),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_full_aggregate_body] = STATE(1888),
+    [sym_expr_aggregate_body] = STATE(1888),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_varDecl] = STATE(1534),
+    [sym_asExprs] = STATE(1676),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1487),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1513),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_RPAREN] = ACTIONS(107),
@@ -6671,48 +6694,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(63),
   },
   [23] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1695),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1688),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1609),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1741),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(113),
@@ -6758,48 +6782,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [24] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1696),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1640),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1715),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1699),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(139),
@@ -6845,48 +6870,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [25] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1628),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1703),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1639),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1712),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(145),
@@ -6932,48 +6958,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [26] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1685),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1734),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1684),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1690),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(151),
@@ -7019,48 +7046,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [27] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1638),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1665),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1667),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1677),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(157),
@@ -7106,48 +7134,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [28] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1636),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1676),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1648),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1655),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(163),
@@ -7193,48 +7222,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [29] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1669),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1670),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1697),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1685),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(169),
@@ -7280,47 +7310,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [30] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1709),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1698),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(175),
@@ -7365,57 +7396,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [31] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1652),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1043),
+    [sym_prefix_cast] = STATE(1043),
+    [sym_unary_expr] = STATE(1043),
+    [sym_mul_expr] = STATE(1043),
+    [sym_add_expr] = STATE(1043),
+    [sym_in_expr] = STATE(1043),
+    [sym_comp_term] = STATE(1043),
+    [sym_instance_of] = STATE(1043),
+    [sym_negation] = STATE(1043),
+    [sym_if_term] = STATE(1043),
+    [sym_conjunction] = STATE(1043),
+    [sym_disjunction] = STATE(1043),
+    [sym_implication] = STATE(1043),
+    [sym_quantified] = STATE(1043),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1043),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1548),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(179),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(181),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [sym_underscore] = ACTIONS(181),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -7450,57 +7482,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [32] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1705),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1161),
+    [sym_prefix_cast] = STATE(1161),
+    [sym_unary_expr] = STATE(1161),
+    [sym_mul_expr] = STATE(1161),
+    [sym_add_expr] = STATE(1161),
+    [sym_in_expr] = STATE(1161),
+    [sym_comp_term] = STATE(1161),
+    [sym_instance_of] = STATE(1161),
+    [sym_negation] = STATE(1161),
+    [sym_if_term] = STATE(1161),
+    [sym_conjunction] = STATE(1161),
+    [sym_disjunction] = STATE(1161),
+    [sym_implication] = STATE(1161),
+    [sym_quantified] = STATE(1161),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1161),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1553),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(183),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(185),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [sym_underscore] = ACTIONS(185),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -7535,57 +7568,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [33] = {
-    [sym_special_call] = STATE(1116),
-    [sym_prefix_cast] = STATE(1116),
-    [sym_unary_expr] = STATE(1116),
-    [sym_mul_expr] = STATE(1116),
-    [sym_add_expr] = STATE(1116),
-    [sym_in_expr] = STATE(1116),
-    [sym_comp_term] = STATE(1116),
-    [sym_instance_of] = STATE(1116),
-    [sym_negation] = STATE(1116),
-    [sym_if_term] = STATE(1116),
-    [sym_conjunction] = STATE(1116),
-    [sym_disjunction] = STATE(1116),
-    [sym_implication] = STATE(1116),
-    [sym_quantified] = STATE(1116),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1116),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1561),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1644),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(187),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(189),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
+    [sym_underscore] = ACTIONS(189),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -7620,47 +7654,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [34] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1605),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1651),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(191),
@@ -7705,57 +7740,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [35] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1735),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1042),
+    [sym_prefix_cast] = STATE(1042),
+    [sym_unary_expr] = STATE(1042),
+    [sym_mul_expr] = STATE(1042),
+    [sym_add_expr] = STATE(1042),
+    [sym_in_expr] = STATE(1042),
+    [sym_comp_term] = STATE(1042),
+    [sym_instance_of] = STATE(1042),
+    [sym_negation] = STATE(1042),
+    [sym_if_term] = STATE(1042),
+    [sym_conjunction] = STATE(1042),
+    [sym_disjunction] = STATE(1042),
+    [sym_implication] = STATE(1042),
+    [sym_quantified] = STATE(1042),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1042),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1578),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(195),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(197),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [sym_underscore] = ACTIONS(197),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -7790,47 +7826,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [36] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1649),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1621),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(199),
@@ -7875,57 +7912,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [37] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1660),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1123),
+    [sym_prefix_cast] = STATE(1123),
+    [sym_unary_expr] = STATE(1123),
+    [sym_mul_expr] = STATE(1123),
+    [sym_add_expr] = STATE(1123),
+    [sym_in_expr] = STATE(1123),
+    [sym_comp_term] = STATE(1123),
+    [sym_instance_of] = STATE(1123),
+    [sym_negation] = STATE(1123),
+    [sym_if_term] = STATE(1123),
+    [sym_conjunction] = STATE(1123),
+    [sym_disjunction] = STATE(1123),
+    [sym_implication] = STATE(1123),
+    [sym_quantified] = STATE(1123),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1123),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1532),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(203),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(205),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [sym_underscore] = ACTIONS(205),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -7960,47 +7998,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [38] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1603),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1740),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(207),
@@ -8045,47 +8084,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [39] = {
-    [sym_special_call] = STATE(1120),
-    [sym_prefix_cast] = STATE(1120),
-    [sym_unary_expr] = STATE(1120),
-    [sym_mul_expr] = STATE(1120),
-    [sym_add_expr] = STATE(1120),
-    [sym_in_expr] = STATE(1120),
-    [sym_comp_term] = STATE(1120),
-    [sym_instance_of] = STATE(1120),
-    [sym_negation] = STATE(1120),
-    [sym_if_term] = STATE(1120),
-    [sym_conjunction] = STATE(1120),
-    [sym_disjunction] = STATE(1120),
-    [sym_implication] = STATE(1120),
-    [sym_quantified] = STATE(1120),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1120),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1580),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1103),
+    [sym_prefix_cast] = STATE(1103),
+    [sym_unary_expr] = STATE(1103),
+    [sym_mul_expr] = STATE(1103),
+    [sym_add_expr] = STATE(1103),
+    [sym_in_expr] = STATE(1103),
+    [sym_comp_term] = STATE(1103),
+    [sym_instance_of] = STATE(1103),
+    [sym_negation] = STATE(1103),
+    [sym_if_term] = STATE(1103),
+    [sym_conjunction] = STATE(1103),
+    [sym_disjunction] = STATE(1103),
+    [sym_implication] = STATE(1103),
+    [sym_quantified] = STATE(1103),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1103),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1533),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(211),
@@ -8130,47 +8170,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [40] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1632),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1694),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(215),
@@ -8215,57 +8256,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [41] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1718),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1168),
+    [sym_prefix_cast] = STATE(1168),
+    [sym_unary_expr] = STATE(1168),
+    [sym_mul_expr] = STATE(1168),
+    [sym_add_expr] = STATE(1168),
+    [sym_in_expr] = STATE(1168),
+    [sym_comp_term] = STATE(1168),
+    [sym_instance_of] = STATE(1168),
+    [sym_negation] = STATE(1168),
+    [sym_if_term] = STATE(1168),
+    [sym_conjunction] = STATE(1168),
+    [sym_disjunction] = STATE(1168),
+    [sym_implication] = STATE(1168),
+    [sym_quantified] = STATE(1168),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1168),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1555),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(219),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(221),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [sym_underscore] = ACTIONS(221),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -8300,57 +8342,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [42] = {
-    [sym_special_call] = STATE(1062),
-    [sym_prefix_cast] = STATE(1062),
-    [sym_unary_expr] = STATE(1062),
-    [sym_mul_expr] = STATE(1062),
-    [sym_add_expr] = STATE(1062),
-    [sym_in_expr] = STATE(1062),
-    [sym_comp_term] = STATE(1062),
-    [sym_instance_of] = STATE(1062),
-    [sym_negation] = STATE(1062),
-    [sym_if_term] = STATE(1062),
-    [sym_conjunction] = STATE(1062),
-    [sym_disjunction] = STATE(1062),
-    [sym_implication] = STATE(1062),
-    [sym_quantified] = STATE(1062),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1062),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1558),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1597),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(223),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(225),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
+    [sym_underscore] = ACTIONS(225),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -8385,47 +8428,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [43] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1651),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1710),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(227),
@@ -8470,47 +8514,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [44] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1601),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1734),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(231),
@@ -8555,57 +8600,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [45] = {
-    [sym_special_call] = STATE(1127),
-    [sym_prefix_cast] = STATE(1127),
-    [sym_unary_expr] = STATE(1127),
-    [sym_mul_expr] = STATE(1127),
-    [sym_add_expr] = STATE(1127),
-    [sym_in_expr] = STATE(1127),
-    [sym_comp_term] = STATE(1127),
-    [sym_instance_of] = STATE(1127),
-    [sym_negation] = STATE(1127),
-    [sym_if_term] = STATE(1127),
-    [sym_conjunction] = STATE(1127),
-    [sym_disjunction] = STATE(1127),
-    [sym_implication] = STATE(1127),
-    [sym_quantified] = STATE(1127),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1127),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1577),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1705),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(235),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(237),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
+    [sym_underscore] = ACTIONS(237),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -8640,47 +8686,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [46] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1641),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1601),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(239),
@@ -8725,47 +8772,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [47] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1742),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1743),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(243),
@@ -8810,57 +8858,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [48] = {
-    [sym_special_call] = STATE(1090),
-    [sym_prefix_cast] = STATE(1090),
-    [sym_unary_expr] = STATE(1090),
-    [sym_mul_expr] = STATE(1090),
-    [sym_add_expr] = STATE(1090),
-    [sym_in_expr] = STATE(1090),
-    [sym_comp_term] = STATE(1090),
-    [sym_instance_of] = STATE(1090),
-    [sym_negation] = STATE(1090),
-    [sym_if_term] = STATE(1090),
-    [sym_conjunction] = STATE(1090),
-    [sym_disjunction] = STATE(1090),
-    [sym_implication] = STATE(1090),
-    [sym_quantified] = STATE(1090),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1090),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1557),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1640),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(247),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(249),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
+    [sym_underscore] = ACTIONS(249),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -8895,47 +8944,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [49] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1741),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1728),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(251),
@@ -8980,47 +9030,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [50] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1686),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1666),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(255),
@@ -9065,57 +9116,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [51] = {
-    [sym_special_call] = STATE(1168),
-    [sym_prefix_cast] = STATE(1168),
-    [sym_unary_expr] = STATE(1168),
-    [sym_mul_expr] = STATE(1168),
-    [sym_add_expr] = STATE(1168),
-    [sym_in_expr] = STATE(1168),
-    [sym_comp_term] = STATE(1168),
-    [sym_instance_of] = STATE(1168),
-    [sym_negation] = STATE(1168),
-    [sym_if_term] = STATE(1168),
-    [sym_conjunction] = STATE(1168),
-    [sym_disjunction] = STATE(1168),
-    [sym_implication] = STATE(1168),
-    [sym_quantified] = STATE(1168),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1168),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1589),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1661),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(259),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(261),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
+    [sym_underscore] = ACTIONS(261),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -9150,57 +9202,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [52] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1728),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1063),
+    [sym_prefix_cast] = STATE(1063),
+    [sym_unary_expr] = STATE(1063),
+    [sym_mul_expr] = STATE(1063),
+    [sym_add_expr] = STATE(1063),
+    [sym_in_expr] = STATE(1063),
+    [sym_comp_term] = STATE(1063),
+    [sym_instance_of] = STATE(1063),
+    [sym_negation] = STATE(1063),
+    [sym_if_term] = STATE(1063),
+    [sym_conjunction] = STATE(1063),
+    [sym_disjunction] = STATE(1063),
+    [sym_implication] = STATE(1063),
+    [sym_quantified] = STATE(1063),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1063),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_varDecl] = STATE(1566),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1514),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(263),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(265),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [sym_underscore] = ACTIONS(265),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -9235,57 +9288,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [53] = {
-    [sym_special_call] = STATE(1087),
-    [sym_prefix_cast] = STATE(1087),
-    [sym_unary_expr] = STATE(1087),
-    [sym_mul_expr] = STATE(1087),
-    [sym_add_expr] = STATE(1087),
-    [sym_in_expr] = STATE(1087),
-    [sym_comp_term] = STATE(1087),
-    [sym_instance_of] = STATE(1087),
-    [sym_negation] = STATE(1087),
-    [sym_if_term] = STATE(1087),
-    [sym_conjunction] = STATE(1087),
-    [sym_disjunction] = STATE(1087),
-    [sym_implication] = STATE(1087),
-    [sym_quantified] = STATE(1087),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1087),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_varDecl] = STATE(1567),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1652),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1496),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(267),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(269),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
+    [sym_underscore] = ACTIONS(269),
     [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
@@ -9320,47 +9374,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [54] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1611),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1628),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(271),
@@ -9405,47 +9460,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [55] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1658),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1604),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(275),
@@ -9490,47 +9546,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [56] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1599),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1719),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_RPAREN] = ACTIONS(279),
@@ -9575,57 +9632,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [57] = {
-    [sym_special_call] = STATE(375),
-    [sym_prefix_cast] = STATE(375),
-    [sym_unary_expr] = STATE(375),
-    [sym_mul_expr] = STATE(375),
-    [sym_add_expr] = STATE(375),
-    [sym_in_expr] = STATE(375),
-    [sym_comp_term] = STATE(375),
-    [sym_instance_of] = STATE(375),
-    [sym_negation] = STATE(375),
-    [sym_if_term] = STATE(375),
-    [sym_conjunction] = STATE(375),
-    [sym_disjunction] = STATE(375),
-    [sym_implication] = STATE(375),
-    [sym_quantified] = STATE(375),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(375),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_asExprs] = STATE(1102),
-    [sym_asExpr] = STATE(992),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1811),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -9646,61 +9704,62 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
   [58] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1877),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1871),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -9743,48 +9802,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [59] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1965),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1936),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -9827,57 +9887,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [60] = {
-    [sym_special_call] = STATE(838),
-    [sym_prefix_cast] = STATE(838),
-    [sym_unary_expr] = STATE(838),
-    [sym_mul_expr] = STATE(838),
-    [sym_add_expr] = STATE(838),
-    [sym_in_expr] = STATE(838),
-    [sym_comp_term] = STATE(838),
-    [sym_instance_of] = STATE(838),
-    [sym_negation] = STATE(838),
-    [sym_if_term] = STATE(838),
-    [sym_conjunction] = STATE(838),
-    [sym_disjunction] = STATE(838),
-    [sym_implication] = STATE(838),
-    [sym_quantified] = STATE(838),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(838),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1941),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_COMMA] = ACTIONS(307),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(315),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -9898,7 +9959,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -9911,57 +9972,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [61] = {
-    [sym_special_call] = STATE(384),
-    [sym_prefix_cast] = STATE(384),
-    [sym_unary_expr] = STATE(384),
-    [sym_mul_expr] = STATE(384),
-    [sym_add_expr] = STATE(384),
-    [sym_in_expr] = STATE(384),
-    [sym_comp_term] = STATE(384),
-    [sym_instance_of] = STATE(384),
-    [sym_negation] = STATE(384),
-    [sym_if_term] = STATE(384),
-    [sym_conjunction] = STATE(384),
-    [sym_disjunction] = STATE(384),
-    [sym_implication] = STATE(384),
-    [sym_quantified] = STATE(384),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(384),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_asExprs] = STATE(1108),
-    [sym_asExpr] = STATE(1017),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1944),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -9982,70 +10044,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
   [62] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1817),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(823),
+    [sym_prefix_cast] = STATE(823),
+    [sym_unary_expr] = STATE(823),
+    [sym_mul_expr] = STATE(823),
+    [sym_add_expr] = STATE(823),
+    [sym_in_expr] = STATE(823),
+    [sym_comp_term] = STATE(823),
+    [sym_instance_of] = STATE(823),
+    [sym_negation] = STATE(823),
+    [sym_if_term] = STATE(823),
+    [sym_conjunction] = STATE(823),
+    [sym_disjunction] = STATE(823),
+    [sym_implication] = STATE(823),
+    [sym_quantified] = STATE(823),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(823),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_COMMA] = ACTIONS(283),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(291),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -10066,7 +10129,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -10079,57 +10142,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [63] = {
-    [sym_special_call] = STATE(856),
-    [sym_prefix_cast] = STATE(856),
-    [sym_unary_expr] = STATE(856),
-    [sym_mul_expr] = STATE(856),
-    [sym_add_expr] = STATE(856),
-    [sym_in_expr] = STATE(856),
-    [sym_comp_term] = STATE(856),
-    [sym_instance_of] = STATE(856),
-    [sym_negation] = STATE(856),
-    [sym_if_term] = STATE(856),
-    [sym_conjunction] = STATE(856),
-    [sym_disjunction] = STATE(856),
-    [sym_implication] = STATE(856),
-    [sym_quantified] = STATE(856),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(856),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_COMMA] = ACTIONS(343),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+    [sym_special_call] = STATE(386),
+    [sym_prefix_cast] = STATE(386),
+    [sym_unary_expr] = STATE(386),
+    [sym_mul_expr] = STATE(386),
+    [sym_add_expr] = STATE(386),
+    [sym_in_expr] = STATE(386),
+    [sym_comp_term] = STATE(386),
+    [sym_instance_of] = STATE(386),
+    [sym_negation] = STATE(386),
+    [sym_if_term] = STATE(386),
+    [sym_conjunction] = STATE(386),
+    [sym_disjunction] = STATE(386),
+    [sym_implication] = STATE(386),
+    [sym_quantified] = STATE(386),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(386),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_asExprs] = STATE(1093),
+    [sym_asExpr] = STATE(961),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(345),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -10150,61 +10214,62 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
   [64] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1816),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1819),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -10247,52 +10312,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [65] = {
-    [sym_special_call] = STATE(925),
-    [sym_prefix_cast] = STATE(925),
-    [sym_unary_expr] = STATE(925),
-    [sym_mul_expr] = STATE(925),
-    [sym_add_expr] = STATE(925),
-    [sym_in_expr] = STATE(925),
-    [sym_comp_term] = STATE(925),
-    [sym_instance_of] = STATE(925),
-    [sym_negation] = STATE(925),
-    [sym_if_term] = STATE(925),
-    [sym_conjunction] = STATE(925),
-    [sym_disjunction] = STATE(925),
-    [sym_implication] = STATE(925),
-    [sym_quantified] = STATE(925),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(925),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1004),
+    [sym_prefix_cast] = STATE(1004),
+    [sym_unary_expr] = STATE(1004),
+    [sym_mul_expr] = STATE(1004),
+    [sym_add_expr] = STATE(1004),
+    [sym_in_expr] = STATE(1004),
+    [sym_comp_term] = STATE(1004),
+    [sym_instance_of] = STATE(1004),
+    [sym_negation] = STATE(1004),
+    [sym_if_term] = STATE(1004),
+    [sym_conjunction] = STATE(1004),
+    [sym_disjunction] = STATE(1004),
+    [sym_implication] = STATE(1004),
+    [sym_quantified] = STATE(1004),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1004),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(347),
+    [anon_sym_RPAREN] = ACTIONS(319),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(349),
+    [anon_sym_PIPE] = ACTIONS(321),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -10331,52 +10397,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [66] = {
-    [sym_special_call] = STATE(1014),
-    [sym_prefix_cast] = STATE(1014),
-    [sym_unary_expr] = STATE(1014),
-    [sym_mul_expr] = STATE(1014),
-    [sym_add_expr] = STATE(1014),
-    [sym_in_expr] = STATE(1014),
-    [sym_comp_term] = STATE(1014),
-    [sym_instance_of] = STATE(1014),
-    [sym_negation] = STATE(1014),
-    [sym_if_term] = STATE(1014),
-    [sym_conjunction] = STATE(1014),
-    [sym_disjunction] = STATE(1014),
-    [sym_implication] = STATE(1014),
-    [sym_quantified] = STATE(1014),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1014),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1947),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(351),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(353),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -10415,52 +10482,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [67] = {
-    [sym_special_call] = STATE(961),
-    [sym_prefix_cast] = STATE(961),
-    [sym_unary_expr] = STATE(961),
-    [sym_mul_expr] = STATE(961),
-    [sym_add_expr] = STATE(961),
-    [sym_in_expr] = STATE(961),
-    [sym_comp_term] = STATE(961),
-    [sym_instance_of] = STATE(961),
-    [sym_negation] = STATE(961),
-    [sym_if_term] = STATE(961),
-    [sym_conjunction] = STATE(961),
-    [sym_disjunction] = STATE(961),
-    [sym_implication] = STATE(961),
-    [sym_quantified] = STATE(961),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(961),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1985),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(355),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(357),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -10499,57 +10567,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [68] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_asExprs] = STATE(1672),
-    [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+    [sym_special_call] = STATE(386),
+    [sym_prefix_cast] = STATE(386),
+    [sym_unary_expr] = STATE(386),
+    [sym_mul_expr] = STATE(386),
+    [sym_add_expr] = STATE(386),
+    [sym_in_expr] = STATE(386),
+    [sym_comp_term] = STATE(386),
+    [sym_instance_of] = STATE(386),
+    [sym_negation] = STATE(386),
+    [sym_if_term] = STATE(386),
+    [sym_conjunction] = STATE(386),
+    [sym_disjunction] = STATE(386),
+    [sym_implication] = STATE(386),
+    [sym_quantified] = STATE(386),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(386),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_asExprs] = STATE(1151),
+    [sym_asExpr] = STATE(961),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -10570,70 +10639,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
   [69] = {
-    [sym_special_call] = STATE(384),
-    [sym_prefix_cast] = STATE(384),
-    [sym_unary_expr] = STATE(384),
-    [sym_mul_expr] = STATE(384),
-    [sym_add_expr] = STATE(384),
-    [sym_in_expr] = STATE(384),
-    [sym_comp_term] = STATE(384),
-    [sym_instance_of] = STATE(384),
-    [sym_negation] = STATE(384),
-    [sym_if_term] = STATE(384),
-    [sym_conjunction] = STATE(384),
-    [sym_disjunction] = STATE(384),
-    [sym_implication] = STATE(384),
-    [sym_quantified] = STATE(384),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(384),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_asExprs] = STATE(1073),
-    [sym_asExpr] = STATE(1017),
-    [sym_literalId] = STATE(1593),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_asExprs] = STATE(1662),
+    [sym_asExpr] = STATE(1565),
+    [sym_literalId] = STATE(1575),
     [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -10654,70 +10724,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
   [70] = {
-    [sym_special_call] = STATE(837),
-    [sym_prefix_cast] = STATE(837),
-    [sym_unary_expr] = STATE(837),
-    [sym_mul_expr] = STATE(837),
-    [sym_add_expr] = STATE(837),
-    [sym_in_expr] = STATE(837),
-    [sym_comp_term] = STATE(837),
-    [sym_instance_of] = STATE(837),
-    [sym_negation] = STATE(837),
-    [sym_if_term] = STATE(837),
-    [sym_conjunction] = STATE(837),
-    [sym_disjunction] = STATE(837),
-    [sym_implication] = STATE(837),
-    [sym_quantified] = STATE(837),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(837),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1008),
+    [sym_prefix_cast] = STATE(1008),
+    [sym_unary_expr] = STATE(1008),
+    [sym_mul_expr] = STATE(1008),
+    [sym_add_expr] = STATE(1008),
+    [sym_in_expr] = STATE(1008),
+    [sym_comp_term] = STATE(1008),
+    [sym_instance_of] = STATE(1008),
+    [sym_negation] = STATE(1008),
+    [sym_if_term] = STATE(1008),
+    [sym_conjunction] = STATE(1008),
+    [sym_disjunction] = STATE(1008),
+    [sym_implication] = STATE(1008),
+    [sym_quantified] = STATE(1008),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1008),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_COMMA] = ACTIONS(359),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(323),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(325),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(361),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -10738,7 +10809,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -10751,57 +10822,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [71] = {
-    [sym_special_call] = STATE(375),
-    [sym_prefix_cast] = STATE(375),
-    [sym_unary_expr] = STATE(375),
-    [sym_mul_expr] = STATE(375),
-    [sym_add_expr] = STATE(375),
-    [sym_in_expr] = STATE(375),
-    [sym_comp_term] = STATE(375),
-    [sym_instance_of] = STATE(375),
-    [sym_negation] = STATE(375),
-    [sym_if_term] = STATE(375),
-    [sym_conjunction] = STATE(375),
-    [sym_disjunction] = STATE(375),
-    [sym_implication] = STATE(375),
-    [sym_quantified] = STATE(375),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(375),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_asExprs] = STATE(1067),
-    [sym_asExpr] = STATE(992),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_special_call] = STATE(386),
+    [sym_prefix_cast] = STATE(386),
+    [sym_unary_expr] = STATE(386),
+    [sym_mul_expr] = STATE(386),
+    [sym_add_expr] = STATE(386),
+    [sym_in_expr] = STATE(386),
+    [sym_comp_term] = STATE(386),
+    [sym_instance_of] = STATE(386),
+    [sym_negation] = STATE(386),
+    [sym_if_term] = STATE(386),
+    [sym_conjunction] = STATE(386),
+    [sym_disjunction] = STATE(386),
+    [sym_implication] = STATE(386),
+    [sym_quantified] = STATE(386),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(386),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_asExprs] = STATE(1049),
+    [sym_asExpr] = STATE(961),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -10822,70 +10894,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
   [72] = {
-    [sym_special_call] = STATE(852),
-    [sym_prefix_cast] = STATE(852),
-    [sym_unary_expr] = STATE(852),
-    [sym_mul_expr] = STATE(852),
-    [sym_add_expr] = STATE(852),
-    [sym_in_expr] = STATE(852),
-    [sym_comp_term] = STATE(852),
-    [sym_instance_of] = STATE(852),
-    [sym_negation] = STATE(852),
-    [sym_if_term] = STATE(852),
-    [sym_conjunction] = STATE(852),
-    [sym_disjunction] = STATE(852),
-    [sym_implication] = STATE(852),
-    [sym_quantified] = STATE(852),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(852),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1988),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_COMMA] = ACTIONS(363),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(365),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -10906,7 +10979,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -10919,52 +10992,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [73] = {
-    [sym_special_call] = STATE(985),
-    [sym_prefix_cast] = STATE(985),
-    [sym_unary_expr] = STATE(985),
-    [sym_mul_expr] = STATE(985),
-    [sym_add_expr] = STATE(985),
-    [sym_in_expr] = STATE(985),
-    [sym_comp_term] = STATE(985),
-    [sym_instance_of] = STATE(985),
-    [sym_negation] = STATE(985),
-    [sym_if_term] = STATE(985),
-    [sym_conjunction] = STATE(985),
-    [sym_disjunction] = STATE(985),
-    [sym_implication] = STATE(985),
-    [sym_quantified] = STATE(985),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(985),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1991),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(367),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(369),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -11003,57 +11077,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [74] = {
-    [sym_special_call] = STATE(844),
-    [sym_prefix_cast] = STATE(844),
-    [sym_unary_expr] = STATE(844),
-    [sym_mul_expr] = STATE(844),
-    [sym_add_expr] = STATE(844),
-    [sym_in_expr] = STATE(844),
-    [sym_comp_term] = STATE(844),
-    [sym_instance_of] = STATE(844),
-    [sym_negation] = STATE(844),
-    [sym_if_term] = STATE(844),
-    [sym_conjunction] = STATE(844),
-    [sym_disjunction] = STATE(844),
-    [sym_implication] = STATE(844),
-    [sym_quantified] = STATE(844),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(844),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1992),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_COMMA] = ACTIONS(371),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(373),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -11074,7 +11149,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -11087,52 +11162,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [75] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1848),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1015),
+    [sym_prefix_cast] = STATE(1015),
+    [sym_unary_expr] = STATE(1015),
+    [sym_mul_expr] = STATE(1015),
+    [sym_add_expr] = STATE(1015),
+    [sym_in_expr] = STATE(1015),
+    [sym_comp_term] = STATE(1015),
+    [sym_instance_of] = STATE(1015),
+    [sym_negation] = STATE(1015),
+    [sym_if_term] = STATE(1015),
+    [sym_conjunction] = STATE(1015),
+    [sym_disjunction] = STATE(1015),
+    [sym_implication] = STATE(1015),
+    [sym_quantified] = STATE(1015),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1015),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(327),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(329),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -11171,57 +11247,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [76] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_asExprs] = STATE(1698),
-    [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1995),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -11242,61 +11319,62 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
   [77] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1850),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1996),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -11339,52 +11417,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [78] = {
-    [sym_special_call] = STATE(1020),
-    [sym_prefix_cast] = STATE(1020),
-    [sym_unary_expr] = STATE(1020),
-    [sym_mul_expr] = STATE(1020),
-    [sym_add_expr] = STATE(1020),
-    [sym_in_expr] = STATE(1020),
-    [sym_comp_term] = STATE(1020),
-    [sym_instance_of] = STATE(1020),
-    [sym_negation] = STATE(1020),
-    [sym_if_term] = STATE(1020),
-    [sym_conjunction] = STATE(1020),
-    [sym_disjunction] = STATE(1020),
-    [sym_implication] = STATE(1020),
-    [sym_quantified] = STATE(1020),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1020),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(993),
+    [sym_prefix_cast] = STATE(993),
+    [sym_unary_expr] = STATE(993),
+    [sym_mul_expr] = STATE(993),
+    [sym_add_expr] = STATE(993),
+    [sym_in_expr] = STATE(993),
+    [sym_comp_term] = STATE(993),
+    [sym_instance_of] = STATE(993),
+    [sym_negation] = STATE(993),
+    [sym_if_term] = STATE(993),
+    [sym_conjunction] = STATE(993),
+    [sym_disjunction] = STATE(993),
+    [sym_implication] = STATE(993),
+    [sym_quantified] = STATE(993),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(993),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(375),
+    [anon_sym_RPAREN] = ACTIONS(331),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(377),
+    [anon_sym_PIPE] = ACTIONS(333),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -11423,57 +11502,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [79] = {
-    [sym_special_call] = STATE(384),
-    [sym_prefix_cast] = STATE(384),
-    [sym_unary_expr] = STATE(384),
-    [sym_mul_expr] = STATE(384),
-    [sym_add_expr] = STATE(384),
-    [sym_in_expr] = STATE(384),
-    [sym_comp_term] = STATE(384),
-    [sym_instance_of] = STATE(384),
-    [sym_negation] = STATE(384),
-    [sym_if_term] = STATE(384),
-    [sym_conjunction] = STATE(384),
-    [sym_disjunction] = STATE(384),
-    [sym_implication] = STATE(384),
-    [sym_quantified] = STATE(384),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(384),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_asExprs] = STATE(1121),
-    [sym_asExpr] = STATE(1017),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1997),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -11494,70 +11574,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
   [80] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1920),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(831),
+    [sym_prefix_cast] = STATE(831),
+    [sym_unary_expr] = STATE(831),
+    [sym_mul_expr] = STATE(831),
+    [sym_add_expr] = STATE(831),
+    [sym_in_expr] = STATE(831),
+    [sym_comp_term] = STATE(831),
+    [sym_instance_of] = STATE(831),
+    [sym_negation] = STATE(831),
+    [sym_if_term] = STATE(831),
+    [sym_conjunction] = STATE(831),
+    [sym_disjunction] = STATE(831),
+    [sym_implication] = STATE(831),
+    [sym_quantified] = STATE(831),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(831),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_COMMA] = ACTIONS(335),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(337),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -11578,7 +11659,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -11591,48 +11672,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [81] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1923),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1965),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -11675,48 +11757,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [82] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1864),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1961),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -11759,52 +11842,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [83] = {
-    [sym_special_call] = STATE(994),
-    [sym_prefix_cast] = STATE(994),
-    [sym_unary_expr] = STATE(994),
-    [sym_mul_expr] = STATE(994),
-    [sym_add_expr] = STATE(994),
-    [sym_in_expr] = STATE(994),
-    [sym_comp_term] = STATE(994),
-    [sym_instance_of] = STATE(994),
-    [sym_negation] = STATE(994),
-    [sym_if_term] = STATE(994),
-    [sym_conjunction] = STATE(994),
-    [sym_disjunction] = STATE(994),
-    [sym_implication] = STATE(994),
-    [sym_quantified] = STATE(994),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(994),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1959),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(379),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(381),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -11843,57 +11927,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [84] = {
-    [sym_special_call] = STATE(384),
-    [sym_prefix_cast] = STATE(384),
-    [sym_unary_expr] = STATE(384),
-    [sym_mul_expr] = STATE(384),
-    [sym_add_expr] = STATE(384),
-    [sym_in_expr] = STATE(384),
-    [sym_comp_term] = STATE(384),
-    [sym_instance_of] = STATE(384),
-    [sym_negation] = STATE(384),
-    [sym_if_term] = STATE(384),
-    [sym_conjunction] = STATE(384),
-    [sym_disjunction] = STATE(384),
-    [sym_implication] = STATE(384),
-    [sym_quantified] = STATE(384),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(384),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_asExprs] = STATE(1109),
-    [sym_asExpr] = STATE(1017),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1954),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -11914,65 +11999,66 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
   [85] = {
-    [sym_special_call] = STATE(991),
-    [sym_prefix_cast] = STATE(991),
-    [sym_unary_expr] = STATE(991),
-    [sym_mul_expr] = STATE(991),
-    [sym_add_expr] = STATE(991),
-    [sym_in_expr] = STATE(991),
-    [sym_comp_term] = STATE(991),
-    [sym_instance_of] = STATE(991),
-    [sym_negation] = STATE(991),
-    [sym_if_term] = STATE(991),
-    [sym_conjunction] = STATE(991),
-    [sym_disjunction] = STATE(991),
-    [sym_implication] = STATE(991),
-    [sym_quantified] = STATE(991),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(991),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1953),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(383),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(385),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -12011,57 +12097,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [86] = {
-    [sym_special_call] = STATE(963),
-    [sym_prefix_cast] = STATE(963),
-    [sym_unary_expr] = STATE(963),
-    [sym_mul_expr] = STATE(963),
-    [sym_add_expr] = STATE(963),
-    [sym_in_expr] = STATE(963),
-    [sym_comp_term] = STATE(963),
-    [sym_instance_of] = STATE(963),
-    [sym_negation] = STATE(963),
-    [sym_if_term] = STATE(963),
-    [sym_conjunction] = STATE(963),
-    [sym_disjunction] = STATE(963),
-    [sym_implication] = STATE(963),
-    [sym_quantified] = STATE(963),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(963),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(387),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(389),
-    [sym_specialId] = ACTIONS(121),
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_asExprs] = STATE(1658),
+    [sym_asExpr] = STATE(1565),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -12082,70 +12169,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
   [87] = {
-    [sym_special_call] = STATE(960),
-    [sym_prefix_cast] = STATE(960),
-    [sym_unary_expr] = STATE(960),
-    [sym_mul_expr] = STATE(960),
-    [sym_add_expr] = STATE(960),
-    [sym_in_expr] = STATE(960),
-    [sym_comp_term] = STATE(960),
-    [sym_instance_of] = STATE(960),
-    [sym_negation] = STATE(960),
-    [sym_if_term] = STATE(960),
-    [sym_conjunction] = STATE(960),
-    [sym_disjunction] = STATE(960),
-    [sym_implication] = STATE(960),
-    [sym_quantified] = STATE(960),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(960),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(391),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(393),
-    [sym_specialId] = ACTIONS(121),
+    [sym_special_call] = STATE(407),
+    [sym_prefix_cast] = STATE(407),
+    [sym_unary_expr] = STATE(407),
+    [sym_mul_expr] = STATE(407),
+    [sym_add_expr] = STATE(407),
+    [sym_in_expr] = STATE(407),
+    [sym_comp_term] = STATE(407),
+    [sym_instance_of] = STATE(407),
+    [sym_negation] = STATE(407),
+    [sym_if_term] = STATE(407),
+    [sym_conjunction] = STATE(407),
+    [sym_disjunction] = STATE(407),
+    [sym_implication] = STATE(407),
+    [sym_quantified] = STATE(407),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(407),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_asExprs] = STATE(1125),
+    [sym_asExpr] = STATE(915),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -12166,70 +12254,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
   [88] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1939),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+    [sym_special_call] = STATE(407),
+    [sym_prefix_cast] = STATE(407),
+    [sym_unary_expr] = STATE(407),
+    [sym_mul_expr] = STATE(407),
+    [sym_add_expr] = STATE(407),
+    [sym_in_expr] = STATE(407),
+    [sym_comp_term] = STATE(407),
+    [sym_instance_of] = STATE(407),
+    [sym_negation] = STATE(407),
+    [sym_if_term] = STATE(407),
+    [sym_conjunction] = STATE(407),
+    [sym_disjunction] = STATE(407),
+    [sym_implication] = STATE(407),
+    [sym_quantified] = STATE(407),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(407),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_asExprs] = STATE(1157),
+    [sym_asExpr] = STATE(915),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -12250,65 +12339,66 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
   [89] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1818),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1032),
+    [sym_prefix_cast] = STATE(1032),
+    [sym_unary_expr] = STATE(1032),
+    [sym_mul_expr] = STATE(1032),
+    [sym_add_expr] = STATE(1032),
+    [sym_in_expr] = STATE(1032),
+    [sym_comp_term] = STATE(1032),
+    [sym_instance_of] = STATE(1032),
+    [sym_negation] = STATE(1032),
+    [sym_if_term] = STATE(1032),
+    [sym_conjunction] = STATE(1032),
+    [sym_disjunction] = STATE(1032),
+    [sym_implication] = STATE(1032),
+    [sym_quantified] = STATE(1032),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1032),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(363),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(365),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -12347,52 +12437,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [90] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1930),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(997),
+    [sym_prefix_cast] = STATE(997),
+    [sym_unary_expr] = STATE(997),
+    [sym_mul_expr] = STATE(997),
+    [sym_add_expr] = STATE(997),
+    [sym_in_expr] = STATE(997),
+    [sym_comp_term] = STATE(997),
+    [sym_instance_of] = STATE(997),
+    [sym_negation] = STATE(997),
+    [sym_if_term] = STATE(997),
+    [sym_conjunction] = STATE(997),
+    [sym_disjunction] = STATE(997),
+    [sym_implication] = STATE(997),
+    [sym_quantified] = STATE(997),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(997),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(367),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(369),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -12431,48 +12522,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [91] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1924),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1949),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -12515,57 +12607,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [92] = {
-    [sym_special_call] = STATE(375),
-    [sym_prefix_cast] = STATE(375),
-    [sym_unary_expr] = STATE(375),
-    [sym_mul_expr] = STATE(375),
-    [sym_add_expr] = STATE(375),
-    [sym_in_expr] = STATE(375),
-    [sym_comp_term] = STATE(375),
-    [sym_instance_of] = STATE(375),
-    [sym_negation] = STATE(375),
-    [sym_if_term] = STATE(375),
-    [sym_conjunction] = STATE(375),
-    [sym_disjunction] = STATE(375),
-    [sym_implication] = STATE(375),
-    [sym_quantified] = STATE(375),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(375),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_asExprs] = STATE(1115),
-    [sym_asExpr] = STATE(992),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_special_call] = STATE(407),
+    [sym_prefix_cast] = STATE(407),
+    [sym_unary_expr] = STATE(407),
+    [sym_mul_expr] = STATE(407),
+    [sym_add_expr] = STATE(407),
+    [sym_in_expr] = STATE(407),
+    [sym_comp_term] = STATE(407),
+    [sym_instance_of] = STATE(407),
+    [sym_negation] = STATE(407),
+    [sym_if_term] = STATE(407),
+    [sym_conjunction] = STATE(407),
+    [sym_disjunction] = STATE(407),
+    [sym_implication] = STATE(407),
+    [sym_quantified] = STATE(407),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(407),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_asExprs] = STATE(1133),
+    [sym_asExpr] = STATE(915),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -12586,65 +12679,66 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
   [93] = {
-    [sym_special_call] = STATE(941),
-    [sym_prefix_cast] = STATE(941),
-    [sym_unary_expr] = STATE(941),
-    [sym_mul_expr] = STATE(941),
-    [sym_add_expr] = STATE(941),
-    [sym_in_expr] = STATE(941),
-    [sym_comp_term] = STATE(941),
-    [sym_instance_of] = STATE(941),
-    [sym_negation] = STATE(941),
-    [sym_if_term] = STATE(941),
-    [sym_conjunction] = STATE(941),
-    [sym_disjunction] = STATE(941),
-    [sym_implication] = STATE(941),
-    [sym_quantified] = STATE(941),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(941),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1982),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(395),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(397),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -12683,52 +12777,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [94] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1912),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1039),
+    [sym_prefix_cast] = STATE(1039),
+    [sym_unary_expr] = STATE(1039),
+    [sym_mul_expr] = STATE(1039),
+    [sym_add_expr] = STATE(1039),
+    [sym_in_expr] = STATE(1039),
+    [sym_comp_term] = STATE(1039),
+    [sym_instance_of] = STATE(1039),
+    [sym_negation] = STATE(1039),
+    [sym_if_term] = STATE(1039),
+    [sym_conjunction] = STATE(1039),
+    [sym_disjunction] = STATE(1039),
+    [sym_implication] = STATE(1039),
+    [sym_quantified] = STATE(1039),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1039),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(371),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(373),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -12767,48 +12862,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [95] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1911),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1932),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -12851,52 +12947,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [96] = {
-    [sym_special_call] = STATE(1015),
-    [sym_prefix_cast] = STATE(1015),
-    [sym_unary_expr] = STATE(1015),
-    [sym_mul_expr] = STATE(1015),
-    [sym_add_expr] = STATE(1015),
-    [sym_in_expr] = STATE(1015),
-    [sym_comp_term] = STATE(1015),
-    [sym_instance_of] = STATE(1015),
-    [sym_negation] = STATE(1015),
-    [sym_if_term] = STATE(1015),
-    [sym_conjunction] = STATE(1015),
-    [sym_disjunction] = STATE(1015),
-    [sym_implication] = STATE(1015),
-    [sym_quantified] = STATE(1015),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1015),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(1037),
+    [sym_prefix_cast] = STATE(1037),
+    [sym_unary_expr] = STATE(1037),
+    [sym_mul_expr] = STATE(1037),
+    [sym_add_expr] = STATE(1037),
+    [sym_in_expr] = STATE(1037),
+    [sym_comp_term] = STATE(1037),
+    [sym_instance_of] = STATE(1037),
+    [sym_negation] = STATE(1037),
+    [sym_if_term] = STATE(1037),
+    [sym_conjunction] = STATE(1037),
+    [sym_disjunction] = STATE(1037),
+    [sym_implication] = STATE(1037),
+    [sym_quantified] = STATE(1037),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1037),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(399),
+    [anon_sym_RPAREN] = ACTIONS(375),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(401),
+    [anon_sym_PIPE] = ACTIONS(377),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -12935,52 +13032,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [97] = {
-    [sym_special_call] = STATE(1035),
-    [sym_prefix_cast] = STATE(1035),
-    [sym_unary_expr] = STATE(1035),
-    [sym_mul_expr] = STATE(1035),
-    [sym_add_expr] = STATE(1035),
-    [sym_in_expr] = STATE(1035),
-    [sym_comp_term] = STATE(1035),
-    [sym_instance_of] = STATE(1035),
-    [sym_negation] = STATE(1035),
-    [sym_if_term] = STATE(1035),
-    [sym_conjunction] = STATE(1035),
-    [sym_disjunction] = STATE(1035),
-    [sym_implication] = STATE(1035),
-    [sym_quantified] = STATE(1035),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1035),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1915),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(403),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(405),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -13019,48 +13117,134 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [98] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1841),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_special_call] = STATE(407),
+    [sym_prefix_cast] = STATE(407),
+    [sym_unary_expr] = STATE(407),
+    [sym_mul_expr] = STATE(407),
+    [sym_add_expr] = STATE(407),
+    [sym_in_expr] = STATE(407),
+    [sym_comp_term] = STATE(407),
+    [sym_instance_of] = STATE(407),
+    [sym_negation] = STATE(407),
+    [sym_if_term] = STATE(407),
+    [sym_conjunction] = STATE(407),
+    [sym_disjunction] = STATE(407),
+    [sym_implication] = STATE(407),
+    [sym_quantified] = STATE(407),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(407),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_asExprs] = STATE(1096),
+    [sym_asExpr] = STATE(915),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(349),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
+  },
+  [99] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1911),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -13102,53 +13286,139 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [99] = {
-    [sym_special_call] = STATE(997),
-    [sym_prefix_cast] = STATE(997),
-    [sym_unary_expr] = STATE(997),
-    [sym_mul_expr] = STATE(997),
-    [sym_add_expr] = STATE(997),
-    [sym_in_expr] = STATE(997),
-    [sym_comp_term] = STATE(997),
-    [sym_instance_of] = STATE(997),
-    [sym_negation] = STATE(997),
-    [sym_if_term] = STATE(997),
-    [sym_conjunction] = STATE(997),
-    [sym_disjunction] = STATE(997),
-    [sym_implication] = STATE(997),
-    [sym_quantified] = STATE(997),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(997),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [100] = {
+    [sym_special_call] = STATE(386),
+    [sym_prefix_cast] = STATE(386),
+    [sym_unary_expr] = STATE(386),
+    [sym_mul_expr] = STATE(386),
+    [sym_add_expr] = STATE(386),
+    [sym_in_expr] = STATE(386),
+    [sym_comp_term] = STATE(386),
+    [sym_instance_of] = STATE(386),
+    [sym_negation] = STATE(386),
+    [sym_if_term] = STATE(386),
+    [sym_conjunction] = STATE(386),
+    [sym_disjunction] = STATE(386),
+    [sym_implication] = STATE(386),
+    [sym_quantified] = STATE(386),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(386),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_asExprs] = STATE(1121),
+    [sym_asExpr] = STATE(961),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(305),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
+  },
+  [101] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1910),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(407),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(409),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -13186,53 +13456,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [100] = {
-    [sym_special_call] = STATE(937),
-    [sym_prefix_cast] = STATE(937),
-    [sym_unary_expr] = STATE(937),
-    [sym_mul_expr] = STATE(937),
-    [sym_add_expr] = STATE(937),
-    [sym_in_expr] = STATE(937),
-    [sym_comp_term] = STATE(937),
-    [sym_instance_of] = STATE(937),
-    [sym_negation] = STATE(937),
-    [sym_if_term] = STATE(937),
-    [sym_conjunction] = STATE(937),
-    [sym_disjunction] = STATE(937),
-    [sym_implication] = STATE(937),
-    [sym_quantified] = STATE(937),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(937),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [102] = {
+    [sym_special_call] = STATE(1011),
+    [sym_prefix_cast] = STATE(1011),
+    [sym_unary_expr] = STATE(1011),
+    [sym_mul_expr] = STATE(1011),
+    [sym_add_expr] = STATE(1011),
+    [sym_in_expr] = STATE(1011),
+    [sym_comp_term] = STATE(1011),
+    [sym_instance_of] = STATE(1011),
+    [sym_negation] = STATE(1011),
+    [sym_if_term] = STATE(1011),
+    [sym_conjunction] = STATE(1011),
+    [sym_disjunction] = STATE(1011),
+    [sym_implication] = STATE(1011),
+    [sym_quantified] = STATE(1011),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1011),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(411),
+    [anon_sym_RPAREN] = ACTIONS(379),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(413),
+    [anon_sym_PIPE] = ACTIONS(381),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -13270,58 +13541,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [101] = {
-    [sym_special_call] = STATE(1027),
-    [sym_prefix_cast] = STATE(1027),
-    [sym_unary_expr] = STATE(1027),
-    [sym_mul_expr] = STATE(1027),
-    [sym_add_expr] = STATE(1027),
-    [sym_in_expr] = STATE(1027),
-    [sym_comp_term] = STATE(1027),
-    [sym_instance_of] = STATE(1027),
-    [sym_negation] = STATE(1027),
-    [sym_if_term] = STATE(1027),
-    [sym_conjunction] = STATE(1027),
-    [sym_disjunction] = STATE(1027),
-    [sym_implication] = STATE(1027),
-    [sym_quantified] = STATE(1027),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1027),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [103] = {
+    [sym_special_call] = STATE(827),
+    [sym_prefix_cast] = STATE(827),
+    [sym_unary_expr] = STATE(827),
+    [sym_mul_expr] = STATE(827),
+    [sym_add_expr] = STATE(827),
+    [sym_in_expr] = STATE(827),
+    [sym_comp_term] = STATE(827),
+    [sym_instance_of] = STATE(827),
+    [sym_negation] = STATE(827),
+    [sym_if_term] = STATE(827),
+    [sym_conjunction] = STATE(827),
+    [sym_disjunction] = STATE(827),
+    [sym_implication] = STATE(827),
+    [sym_quantified] = STATE(827),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(827),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(415),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(417),
+    [anon_sym_COMMA] = ACTIONS(383),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(385),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -13342,7 +13614,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -13354,58 +13626,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [102] = {
-    [sym_special_call] = STATE(375),
-    [sym_prefix_cast] = STATE(375),
-    [sym_unary_expr] = STATE(375),
-    [sym_mul_expr] = STATE(375),
-    [sym_add_expr] = STATE(375),
-    [sym_in_expr] = STATE(375),
-    [sym_comp_term] = STATE(375),
-    [sym_instance_of] = STATE(375),
-    [sym_negation] = STATE(375),
-    [sym_if_term] = STATE(375),
-    [sym_conjunction] = STATE(375),
-    [sym_disjunction] = STATE(375),
-    [sym_implication] = STATE(375),
-    [sym_quantified] = STATE(375),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(375),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_asExprs] = STATE(1128),
-    [sym_asExpr] = STATE(992),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
+  [104] = {
+    [sym_special_call] = STATE(828),
+    [sym_prefix_cast] = STATE(828),
+    [sym_unary_expr] = STATE(828),
+    [sym_mul_expr] = STATE(828),
+    [sym_add_expr] = STATE(828),
+    [sym_in_expr] = STATE(828),
+    [sym_comp_term] = STATE(828),
+    [sym_instance_of] = STATE(828),
+    [sym_negation] = STATE(828),
+    [sym_if_term] = STATE(828),
+    [sym_conjunction] = STATE(828),
+    [sym_disjunction] = STATE(828),
+    [sym_implication] = STATE(828),
+    [sym_quantified] = STATE(828),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(828),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_COMMA] = ACTIONS(387),
     [anon_sym_LPAREN] = ACTIONS(285),
     [anon_sym_not] = ACTIONS(287),
     [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(389),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -13426,61 +13699,147 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [103] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_asExprs] = STATE(1732),
+  [105] = {
+    [sym_special_call] = STATE(977),
+    [sym_prefix_cast] = STATE(977),
+    [sym_unary_expr] = STATE(977),
+    [sym_mul_expr] = STATE(977),
+    [sym_add_expr] = STATE(977),
+    [sym_in_expr] = STATE(977),
+    [sym_comp_term] = STATE(977),
+    [sym_instance_of] = STATE(977),
+    [sym_negation] = STATE(977),
+    [sym_if_term] = STATE(977),
+    [sym_conjunction] = STATE(977),
+    [sym_disjunction] = STATE(977),
+    [sym_implication] = STATE(977),
+    [sym_quantified] = STATE(977),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(977),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(391),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(393),
+    [sym_specialId] = ACTIONS(121),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
+  },
+  [106] = {
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_asExprs] = STATE(1630),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_not] = ACTIONS(41),
@@ -13522,49 +13881,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(65),
     [sym_true] = ACTIONS(63),
   },
-  [104] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1904),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [107] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1905),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -13606,53 +13966,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [105] = {
-    [sym_special_call] = STATE(995),
-    [sym_prefix_cast] = STATE(995),
-    [sym_unary_expr] = STATE(995),
-    [sym_mul_expr] = STATE(995),
-    [sym_add_expr] = STATE(995),
-    [sym_in_expr] = STATE(995),
-    [sym_comp_term] = STATE(995),
-    [sym_instance_of] = STATE(995),
-    [sym_negation] = STATE(995),
-    [sym_if_term] = STATE(995),
-    [sym_conjunction] = STATE(995),
-    [sym_disjunction] = STATE(995),
-    [sym_implication] = STATE(995),
-    [sym_quantified] = STATE(995),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(995),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [108] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1903),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(419),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(421),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -13690,58 +14051,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [106] = {
-    [sym_special_call] = STATE(984),
-    [sym_prefix_cast] = STATE(984),
-    [sym_unary_expr] = STATE(984),
-    [sym_mul_expr] = STATE(984),
-    [sym_add_expr] = STATE(984),
-    [sym_in_expr] = STATE(984),
-    [sym_comp_term] = STATE(984),
-    [sym_instance_of] = STATE(984),
-    [sym_negation] = STATE(984),
-    [sym_if_term] = STATE(984),
-    [sym_conjunction] = STATE(984),
-    [sym_disjunction] = STATE(984),
-    [sym_implication] = STATE(984),
-    [sym_quantified] = STATE(984),
-    [sym_quantifier] = STATE(1962),
-    [sym__call_arg] = STATE(1772),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(984),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [109] = {
+    [sym_special_call] = STATE(838),
+    [sym_prefix_cast] = STATE(838),
+    [sym_unary_expr] = STATE(838),
+    [sym_mul_expr] = STATE(838),
+    [sym_add_expr] = STATE(838),
+    [sym_in_expr] = STATE(838),
+    [sym_comp_term] = STATE(838),
+    [sym_instance_of] = STATE(838),
+    [sym_negation] = STATE(838),
+    [sym_if_term] = STATE(838),
+    [sym_conjunction] = STATE(838),
+    [sym_disjunction] = STATE(838),
+    [sym_implication] = STATE(838),
+    [sym_quantified] = STATE(838),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(838),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_COMMA] = ACTIONS(395),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [sym_underscore] = ACTIONS(423),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(397),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -13762,7 +14124,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -13774,58 +14136,229 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [107] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1929),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [110] = {
+    [sym_special_call] = STATE(386),
+    [sym_prefix_cast] = STATE(386),
+    [sym_unary_expr] = STATE(386),
+    [sym_mul_expr] = STATE(386),
+    [sym_add_expr] = STATE(386),
+    [sym_in_expr] = STATE(386),
+    [sym_comp_term] = STATE(386),
+    [sym_instance_of] = STATE(386),
+    [sym_negation] = STATE(386),
+    [sym_if_term] = STATE(386),
+    [sym_conjunction] = STATE(386),
+    [sym_disjunction] = STATE(386),
+    [sym_implication] = STATE(386),
+    [sym_quantified] = STATE(386),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(386),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_asExprs] = STATE(1149),
+    [sym_asExpr] = STATE(961),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(305),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
+  },
+  [111] = {
+    [sym_special_call] = STATE(386),
+    [sym_prefix_cast] = STATE(386),
+    [sym_unary_expr] = STATE(386),
+    [sym_mul_expr] = STATE(386),
+    [sym_add_expr] = STATE(386),
+    [sym_in_expr] = STATE(386),
+    [sym_comp_term] = STATE(386),
+    [sym_instance_of] = STATE(386),
+    [sym_negation] = STATE(386),
+    [sym_if_term] = STATE(386),
+    [sym_conjunction] = STATE(386),
+    [sym_disjunction] = STATE(386),
+    [sym_implication] = STATE(386),
+    [sym_quantified] = STATE(386),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(386),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_asExprs] = STATE(1155),
+    [sym_asExpr] = STATE(961),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(305),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
+  },
+  [112] = {
+    [sym_special_call] = STATE(836),
+    [sym_prefix_cast] = STATE(836),
+    [sym_unary_expr] = STATE(836),
+    [sym_mul_expr] = STATE(836),
+    [sym_add_expr] = STATE(836),
+    [sym_in_expr] = STATE(836),
+    [sym_comp_term] = STATE(836),
+    [sym_instance_of] = STATE(836),
+    [sym_negation] = STATE(836),
+    [sym_if_term] = STATE(836),
+    [sym_conjunction] = STATE(836),
+    [sym_disjunction] = STATE(836),
+    [sym_implication] = STATE(836),
+    [sym_quantified] = STATE(836),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(836),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_COMMA] = ACTIONS(399),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(401),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -13846,7 +14379,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -13858,53 +14391,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [108] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1885),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [113] = {
+    [sym_special_call] = STATE(981),
+    [sym_prefix_cast] = STATE(981),
+    [sym_unary_expr] = STATE(981),
+    [sym_mul_expr] = STATE(981),
+    [sym_add_expr] = STATE(981),
+    [sym_in_expr] = STATE(981),
+    [sym_comp_term] = STATE(981),
+    [sym_instance_of] = STATE(981),
+    [sym_negation] = STATE(981),
+    [sym_if_term] = STATE(981),
+    [sym_conjunction] = STATE(981),
+    [sym_disjunction] = STATE(981),
+    [sym_implication] = STATE(981),
+    [sym_quantified] = STATE(981),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(981),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(403),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(405),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -13942,53 +14476,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [109] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1883),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [114] = {
+    [sym_special_call] = STATE(1003),
+    [sym_prefix_cast] = STATE(1003),
+    [sym_unary_expr] = STATE(1003),
+    [sym_mul_expr] = STATE(1003),
+    [sym_add_expr] = STATE(1003),
+    [sym_in_expr] = STATE(1003),
+    [sym_comp_term] = STATE(1003),
+    [sym_instance_of] = STATE(1003),
+    [sym_negation] = STATE(1003),
+    [sym_if_term] = STATE(1003),
+    [sym_conjunction] = STATE(1003),
+    [sym_disjunction] = STATE(1003),
+    [sym_implication] = STATE(1003),
+    [sym_quantified] = STATE(1003),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1003),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(407),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(409),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -14026,49 +14561,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [110] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1893),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [115] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1898),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -14110,49 +14646,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [111] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_asExprs] = STATE(1730),
+  [116] = {
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_asExprs] = STATE(1689),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_not] = ACTIONS(41),
@@ -14194,133 +14731,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(65),
     [sym_true] = ACTIONS(63),
   },
-  [112] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1803),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
-  },
-  [113] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_asExprs] = STATE(1725),
+  [117] = {
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_asExprs] = STATE(1687),
     [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_not] = ACTIONS(41),
@@ -14362,58 +14816,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(65),
     [sym_true] = ACTIONS(63),
   },
-  [114] = {
-    [sym_special_call] = STATE(375),
-    [sym_prefix_cast] = STATE(375),
-    [sym_unary_expr] = STATE(375),
-    [sym_mul_expr] = STATE(375),
-    [sym_add_expr] = STATE(375),
-    [sym_in_expr] = STATE(375),
-    [sym_comp_term] = STATE(375),
-    [sym_instance_of] = STATE(375),
-    [sym_negation] = STATE(375),
-    [sym_if_term] = STATE(375),
-    [sym_conjunction] = STATE(375),
-    [sym_disjunction] = STATE(375),
-    [sym_implication] = STATE(375),
-    [sym_quantified] = STATE(375),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(375),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_asExprs] = STATE(1171),
-    [sym_asExpr] = STATE(992),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+  [118] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1892),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -14434,65 +14889,66 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [115] = {
-    [sym_special_call] = STATE(1029),
-    [sym_prefix_cast] = STATE(1029),
-    [sym_unary_expr] = STATE(1029),
-    [sym_mul_expr] = STATE(1029),
-    [sym_add_expr] = STATE(1029),
-    [sym_in_expr] = STATE(1029),
-    [sym_comp_term] = STATE(1029),
-    [sym_instance_of] = STATE(1029),
-    [sym_negation] = STATE(1029),
-    [sym_if_term] = STATE(1029),
-    [sym_conjunction] = STATE(1029),
-    [sym_disjunction] = STATE(1029),
-    [sym_implication] = STATE(1029),
-    [sym_quantified] = STATE(1029),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1029),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [119] = {
+    [sym_special_call] = STATE(992),
+    [sym_prefix_cast] = STATE(992),
+    [sym_unary_expr] = STATE(992),
+    [sym_mul_expr] = STATE(992),
+    [sym_add_expr] = STATE(992),
+    [sym_in_expr] = STATE(992),
+    [sym_comp_term] = STATE(992),
+    [sym_instance_of] = STATE(992),
+    [sym_negation] = STATE(992),
+    [sym_if_term] = STATE(992),
+    [sym_conjunction] = STATE(992),
+    [sym_disjunction] = STATE(992),
+    [sym_implication] = STATE(992),
+    [sym_quantified] = STATE(992),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(992),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(425),
+    [anon_sym_RPAREN] = ACTIONS(411),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(427),
+    [anon_sym_PIPE] = ACTIONS(413),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -14530,49 +14986,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [116] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1960),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [120] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1981),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -14614,58 +15071,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [117] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1900),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [121] = {
+    [sym_special_call] = STATE(407),
+    [sym_prefix_cast] = STATE(407),
+    [sym_unary_expr] = STATE(407),
+    [sym_mul_expr] = STATE(407),
+    [sym_add_expr] = STATE(407),
+    [sym_in_expr] = STATE(407),
+    [sym_comp_term] = STATE(407),
+    [sym_instance_of] = STATE(407),
+    [sym_negation] = STATE(407),
+    [sym_if_term] = STATE(407),
+    [sym_conjunction] = STATE(407),
+    [sym_disjunction] = STATE(407),
+    [sym_implication] = STATE(407),
+    [sym_quantified] = STATE(407),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(407),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_asExprs] = STATE(1129),
+    [sym_asExpr] = STATE(915),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -14686,65 +15144,66 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [118] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1811),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [122] = {
+    [sym_special_call] = STATE(983),
+    [sym_prefix_cast] = STATE(983),
+    [sym_unary_expr] = STATE(983),
+    [sym_mul_expr] = STATE(983),
+    [sym_add_expr] = STATE(983),
+    [sym_in_expr] = STATE(983),
+    [sym_comp_term] = STATE(983),
+    [sym_instance_of] = STATE(983),
+    [sym_negation] = STATE(983),
+    [sym_if_term] = STATE(983),
+    [sym_conjunction] = STATE(983),
+    [sym_disjunction] = STATE(983),
+    [sym_implication] = STATE(983),
+    [sym_quantified] = STATE(983),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(983),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(415),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(417),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -14782,53 +15241,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [119] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1970),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [123] = {
+    [sym_special_call] = STATE(980),
+    [sym_prefix_cast] = STATE(980),
+    [sym_unary_expr] = STATE(980),
+    [sym_mul_expr] = STATE(980),
+    [sym_add_expr] = STATE(980),
+    [sym_in_expr] = STATE(980),
+    [sym_comp_term] = STATE(980),
+    [sym_instance_of] = STATE(980),
+    [sym_negation] = STATE(980),
+    [sym_if_term] = STATE(980),
+    [sym_conjunction] = STATE(980),
+    [sym_disjunction] = STATE(980),
+    [sym_implication] = STATE(980),
+    [sym_quantified] = STATE(980),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(980),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(419),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(421),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -14866,58 +15326,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [120] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_asExprs] = STATE(1699),
-    [sym_asExpr] = STATE(1565),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [124] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1804),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -14938,70 +15399,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [121] = {
-    [sym_special_call] = STATE(375),
-    [sym_prefix_cast] = STATE(375),
-    [sym_unary_expr] = STATE(375),
-    [sym_mul_expr] = STATE(375),
-    [sym_add_expr] = STATE(375),
-    [sym_in_expr] = STATE(375),
-    [sym_comp_term] = STATE(375),
-    [sym_instance_of] = STATE(375),
-    [sym_negation] = STATE(375),
-    [sym_if_term] = STATE(375),
-    [sym_conjunction] = STATE(375),
-    [sym_disjunction] = STATE(375),
-    [sym_implication] = STATE(375),
-    [sym_quantified] = STATE(375),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(375),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_asExprs] = STATE(1122),
-    [sym_asExpr] = STATE(992),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+  [125] = {
+    [sym_special_call] = STATE(994),
+    [sym_prefix_cast] = STATE(994),
+    [sym_unary_expr] = STATE(994),
+    [sym_mul_expr] = STATE(994),
+    [sym_add_expr] = STATE(994),
+    [sym_in_expr] = STATE(994),
+    [sym_comp_term] = STATE(994),
+    [sym_instance_of] = STATE(994),
+    [sym_negation] = STATE(994),
+    [sym_if_term] = STATE(994),
+    [sym_conjunction] = STATE(994),
+    [sym_disjunction] = STATE(994),
+    [sym_implication] = STATE(994),
+    [sym_quantified] = STATE(994),
+    [sym_quantifier] = STATE(1900),
+    [sym__call_arg] = STATE(1775),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(994),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [sym_underscore] = ACTIONS(423),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -15022,70 +15484,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [122] = {
-    [sym_special_call] = STATE(384),
-    [sym_prefix_cast] = STATE(384),
-    [sym_unary_expr] = STATE(384),
-    [sym_mul_expr] = STATE(384),
-    [sym_add_expr] = STATE(384),
-    [sym_in_expr] = STATE(384),
-    [sym_comp_term] = STATE(384),
-    [sym_instance_of] = STATE(384),
-    [sym_negation] = STATE(384),
-    [sym_if_term] = STATE(384),
-    [sym_conjunction] = STATE(384),
-    [sym_disjunction] = STATE(384),
-    [sym_implication] = STATE(384),
-    [sym_quantified] = STATE(384),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(384),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_asExprs] = STATE(1052),
-    [sym_asExpr] = STATE(1017),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [126] = {
+    [sym_special_call] = STATE(1017),
+    [sym_prefix_cast] = STATE(1017),
+    [sym_unary_expr] = STATE(1017),
+    [sym_mul_expr] = STATE(1017),
+    [sym_add_expr] = STATE(1017),
+    [sym_in_expr] = STATE(1017),
+    [sym_comp_term] = STATE(1017),
+    [sym_instance_of] = STATE(1017),
+    [sym_negation] = STATE(1017),
+    [sym_if_term] = STATE(1017),
+    [sym_conjunction] = STATE(1017),
+    [sym_disjunction] = STATE(1017),
+    [sym_implication] = STATE(1017),
+    [sym_quantified] = STATE(1017),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1017),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(425),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(427),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -15106,65 +15569,66 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [123] = {
-    [sym_special_call] = STATE(1006),
-    [sym_prefix_cast] = STATE(1006),
-    [sym_unary_expr] = STATE(1006),
-    [sym_mul_expr] = STATE(1006),
-    [sym_add_expr] = STATE(1006),
-    [sym_in_expr] = STATE(1006),
-    [sym_comp_term] = STATE(1006),
-    [sym_instance_of] = STATE(1006),
-    [sym_negation] = STATE(1006),
-    [sym_if_term] = STATE(1006),
-    [sym_conjunction] = STATE(1006),
-    [sym_disjunction] = STATE(1006),
-    [sym_implication] = STATE(1006),
-    [sym_quantified] = STATE(1006),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1006),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [127] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1810),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(429),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(431),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -15202,53 +15666,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [124] = {
-    [sym_special_call] = STATE(951),
-    [sym_prefix_cast] = STATE(951),
-    [sym_unary_expr] = STATE(951),
-    [sym_mul_expr] = STATE(951),
-    [sym_add_expr] = STATE(951),
-    [sym_in_expr] = STATE(951),
-    [sym_comp_term] = STATE(951),
-    [sym_instance_of] = STATE(951),
-    [sym_negation] = STATE(951),
-    [sym_if_term] = STATE(951),
-    [sym_conjunction] = STATE(951),
-    [sym_disjunction] = STATE(951),
-    [sym_implication] = STATE(951),
-    [sym_quantified] = STATE(951),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(951),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [128] = {
+    [sym_special_call] = STATE(936),
+    [sym_prefix_cast] = STATE(936),
+    [sym_unary_expr] = STATE(936),
+    [sym_mul_expr] = STATE(936),
+    [sym_add_expr] = STATE(936),
+    [sym_in_expr] = STATE(936),
+    [sym_comp_term] = STATE(936),
+    [sym_instance_of] = STATE(936),
+    [sym_negation] = STATE(936),
+    [sym_if_term] = STATE(936),
+    [sym_conjunction] = STATE(936),
+    [sym_disjunction] = STATE(936),
+    [sym_implication] = STATE(936),
+    [sym_quantified] = STATE(936),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(936),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(433),
+    [anon_sym_RPAREN] = ACTIONS(429),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(435),
+    [anon_sym_PIPE] = ACTIONS(431),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -15286,58 +15751,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [125] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1853),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [129] = {
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_asExprs] = STATE(1616),
+    [sym_asExpr] = STATE(1565),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -15358,61 +15824,62 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [126] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1980),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [130] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1816),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -15454,53 +15921,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [127] = {
-    [sym_special_call] = STATE(924),
-    [sym_prefix_cast] = STATE(924),
-    [sym_unary_expr] = STATE(924),
-    [sym_mul_expr] = STATE(924),
-    [sym_add_expr] = STATE(924),
-    [sym_in_expr] = STATE(924),
-    [sym_comp_term] = STATE(924),
-    [sym_instance_of] = STATE(924),
-    [sym_negation] = STATE(924),
-    [sym_if_term] = STATE(924),
-    [sym_conjunction] = STATE(924),
-    [sym_disjunction] = STATE(924),
-    [sym_implication] = STATE(924),
-    [sym_quantified] = STATE(924),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(924),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [131] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1818),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(437),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(439),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -15538,58 +16006,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [128] = {
-    [sym_special_call] = STATE(819),
-    [sym_prefix_cast] = STATE(819),
-    [sym_unary_expr] = STATE(819),
-    [sym_mul_expr] = STATE(819),
-    [sym_add_expr] = STATE(819),
-    [sym_in_expr] = STATE(819),
-    [sym_comp_term] = STATE(819),
-    [sym_instance_of] = STATE(819),
-    [sym_negation] = STATE(819),
-    [sym_if_term] = STATE(819),
-    [sym_conjunction] = STATE(819),
-    [sym_disjunction] = STATE(819),
-    [sym_implication] = STATE(819),
-    [sym_quantified] = STATE(819),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(819),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [132] = {
+    [sym_special_call] = STATE(820),
+    [sym_prefix_cast] = STATE(820),
+    [sym_unary_expr] = STATE(820),
+    [sym_mul_expr] = STATE(820),
+    [sym_add_expr] = STATE(820),
+    [sym_in_expr] = STATE(820),
+    [sym_comp_term] = STATE(820),
+    [sym_instance_of] = STATE(820),
+    [sym_negation] = STATE(820),
+    [sym_if_term] = STATE(820),
+    [sym_conjunction] = STATE(820),
+    [sym_disjunction] = STATE(820),
+    [sym_implication] = STATE(820),
+    [sym_quantified] = STATE(820),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(820),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_COMMA] = ACTIONS(441),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_COMMA] = ACTIONS(433),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(443),
+    [anon_sym_RBRACK] = ACTIONS(435),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -15610,7 +16079,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -15622,49 +16091,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [129] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1994),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [133] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1882),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -15706,58 +16176,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [130] = {
-    [sym_special_call] = STATE(841),
-    [sym_prefix_cast] = STATE(841),
-    [sym_unary_expr] = STATE(841),
-    [sym_mul_expr] = STATE(841),
-    [sym_add_expr] = STATE(841),
-    [sym_in_expr] = STATE(841),
-    [sym_comp_term] = STATE(841),
-    [sym_instance_of] = STATE(841),
-    [sym_negation] = STATE(841),
-    [sym_if_term] = STATE(841),
-    [sym_conjunction] = STATE(841),
-    [sym_disjunction] = STATE(841),
-    [sym_implication] = STATE(841),
-    [sym_quantified] = STATE(841),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(841),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [134] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1878),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_COMMA] = ACTIONS(445),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(447),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -15778,7 +16249,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -15790,53 +16261,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [131] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1953),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [135] = {
+    [sym_special_call] = STATE(932),
+    [sym_prefix_cast] = STATE(932),
+    [sym_unary_expr] = STATE(932),
+    [sym_mul_expr] = STATE(932),
+    [sym_add_expr] = STATE(932),
+    [sym_in_expr] = STATE(932),
+    [sym_comp_term] = STATE(932),
+    [sym_instance_of] = STATE(932),
+    [sym_negation] = STATE(932),
+    [sym_if_term] = STATE(932),
+    [sym_conjunction] = STATE(932),
+    [sym_disjunction] = STATE(932),
+    [sym_implication] = STATE(932),
+    [sym_quantified] = STATE(932),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(932),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(437),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(439),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -15874,49 +16346,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [132] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1804),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [136] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1830),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -15958,53 +16431,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [133] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1806),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [137] = {
+    [sym_special_call] = STATE(955),
+    [sym_prefix_cast] = STATE(955),
+    [sym_unary_expr] = STATE(955),
+    [sym_mul_expr] = STATE(955),
+    [sym_add_expr] = STATE(955),
+    [sym_in_expr] = STATE(955),
+    [sym_comp_term] = STATE(955),
+    [sym_instance_of] = STATE(955),
+    [sym_negation] = STATE(955),
+    [sym_if_term] = STATE(955),
+    [sym_conjunction] = STATE(955),
+    [sym_disjunction] = STATE(955),
+    [sym_implication] = STATE(955),
+    [sym_quantified] = STATE(955),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(955),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(441),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(443),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16042,53 +16516,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [134] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1822),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [138] = {
+    [sym_special_call] = STATE(937),
+    [sym_prefix_cast] = STATE(937),
+    [sym_unary_expr] = STATE(937),
+    [sym_mul_expr] = STATE(937),
+    [sym_add_expr] = STATE(937),
+    [sym_in_expr] = STATE(937),
+    [sym_comp_term] = STATE(937),
+    [sym_instance_of] = STATE(937),
+    [sym_negation] = STATE(937),
+    [sym_if_term] = STATE(937),
+    [sym_conjunction] = STATE(937),
+    [sym_disjunction] = STATE(937),
+    [sym_implication] = STATE(937),
+    [sym_quantified] = STATE(937),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(937),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(445),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(447),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16126,53 +16601,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [135] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1869),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [139] = {
+    [sym_special_call] = STATE(1026),
+    [sym_prefix_cast] = STATE(1026),
+    [sym_unary_expr] = STATE(1026),
+    [sym_mul_expr] = STATE(1026),
+    [sym_add_expr] = STATE(1026),
+    [sym_in_expr] = STATE(1026),
+    [sym_comp_term] = STATE(1026),
+    [sym_instance_of] = STATE(1026),
+    [sym_negation] = STATE(1026),
+    [sym_if_term] = STATE(1026),
+    [sym_conjunction] = STATE(1026),
+    [sym_disjunction] = STATE(1026),
+    [sym_implication] = STATE(1026),
+    [sym_quantified] = STATE(1026),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1026),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(449),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(451),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16210,53 +16686,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [136] = {
-    [sym_special_call] = STATE(1016),
-    [sym_prefix_cast] = STATE(1016),
-    [sym_unary_expr] = STATE(1016),
-    [sym_mul_expr] = STATE(1016),
-    [sym_add_expr] = STATE(1016),
-    [sym_in_expr] = STATE(1016),
-    [sym_comp_term] = STATE(1016),
-    [sym_instance_of] = STATE(1016),
-    [sym_negation] = STATE(1016),
-    [sym_if_term] = STATE(1016),
-    [sym_conjunction] = STATE(1016),
-    [sym_disjunction] = STATE(1016),
-    [sym_implication] = STATE(1016),
-    [sym_quantified] = STATE(1016),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1016),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [140] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1873),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(449),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(451),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16294,53 +16771,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [137] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1991),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [141] = {
+    [sym_special_call] = STATE(953),
+    [sym_prefix_cast] = STATE(953),
+    [sym_unary_expr] = STATE(953),
+    [sym_mul_expr] = STATE(953),
+    [sym_add_expr] = STATE(953),
+    [sym_in_expr] = STATE(953),
+    [sym_comp_term] = STATE(953),
+    [sym_instance_of] = STATE(953),
+    [sym_negation] = STATE(953),
+    [sym_if_term] = STATE(953),
+    [sym_conjunction] = STATE(953),
+    [sym_disjunction] = STATE(953),
+    [sym_implication] = STATE(953),
+    [sym_quantified] = STATE(953),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(953),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(453),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(455),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16378,53 +16856,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [138] = {
-    [sym_special_call] = STATE(1030),
-    [sym_prefix_cast] = STATE(1030),
-    [sym_unary_expr] = STATE(1030),
-    [sym_mul_expr] = STATE(1030),
-    [sym_add_expr] = STATE(1030),
-    [sym_in_expr] = STATE(1030),
-    [sym_comp_term] = STATE(1030),
-    [sym_instance_of] = STATE(1030),
-    [sym_negation] = STATE(1030),
-    [sym_if_term] = STATE(1030),
-    [sym_conjunction] = STATE(1030),
-    [sym_disjunction] = STATE(1030),
-    [sym_implication] = STATE(1030),
-    [sym_quantified] = STATE(1030),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1030),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [142] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1935),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(453),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(455),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16462,53 +16941,139 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [139] = {
-    [sym_special_call] = STATE(1034),
-    [sym_prefix_cast] = STATE(1034),
-    [sym_unary_expr] = STATE(1034),
-    [sym_mul_expr] = STATE(1034),
-    [sym_add_expr] = STATE(1034),
-    [sym_in_expr] = STATE(1034),
-    [sym_comp_term] = STATE(1034),
-    [sym_instance_of] = STATE(1034),
-    [sym_negation] = STATE(1034),
-    [sym_if_term] = STATE(1034),
-    [sym_conjunction] = STATE(1034),
-    [sym_disjunction] = STATE(1034),
-    [sym_implication] = STATE(1034),
-    [sym_quantified] = STATE(1034),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1034),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [143] = {
+    [sym_special_call] = STATE(407),
+    [sym_prefix_cast] = STATE(407),
+    [sym_unary_expr] = STATE(407),
+    [sym_mul_expr] = STATE(407),
+    [sym_add_expr] = STATE(407),
+    [sym_in_expr] = STATE(407),
+    [sym_comp_term] = STATE(407),
+    [sym_instance_of] = STATE(407),
+    [sym_negation] = STATE(407),
+    [sym_if_term] = STATE(407),
+    [sym_conjunction] = STATE(407),
+    [sym_disjunction] = STATE(407),
+    [sym_implication] = STATE(407),
+    [sym_quantified] = STATE(407),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(407),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_asExprs] = STATE(1134),
+    [sym_asExpr] = STATE(915),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(349),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
+  },
+  [144] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1865),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(457),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(459),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16546,53 +17111,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [140] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1873),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [145] = {
+    [sym_special_call] = STATE(1021),
+    [sym_prefix_cast] = STATE(1021),
+    [sym_unary_expr] = STATE(1021),
+    [sym_mul_expr] = STATE(1021),
+    [sym_add_expr] = STATE(1021),
+    [sym_in_expr] = STATE(1021),
+    [sym_comp_term] = STATE(1021),
+    [sym_instance_of] = STATE(1021),
+    [sym_negation] = STATE(1021),
+    [sym_if_term] = STATE(1021),
+    [sym_conjunction] = STATE(1021),
+    [sym_disjunction] = STATE(1021),
+    [sym_implication] = STATE(1021),
+    [sym_quantified] = STATE(1021),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1021),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(457),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(459),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16630,49 +17196,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [141] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1874),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [146] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1943),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -16714,53 +17281,54 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [142] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1971),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [147] = {
+    [sym_special_call] = STATE(1023),
+    [sym_prefix_cast] = STATE(1023),
+    [sym_unary_expr] = STATE(1023),
+    [sym_mul_expr] = STATE(1023),
+    [sym_add_expr] = STATE(1023),
+    [sym_in_expr] = STATE(1023),
+    [sym_comp_term] = STATE(1023),
+    [sym_instance_of] = STATE(1023),
+    [sym_negation] = STATE(1023),
+    [sym_if_term] = STATE(1023),
+    [sym_conjunction] = STATE(1023),
+    [sym_disjunction] = STATE(1023),
+    [sym_implication] = STATE(1023),
+    [sym_quantified] = STATE(1023),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1023),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_RPAREN] = ACTIONS(461),
     [anon_sym_not] = ACTIONS(115),
     [anon_sym_if] = ACTIONS(117),
+    [anon_sym_PIPE] = ACTIONS(463),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -16798,58 +17366,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [143] = {
-    [sym_special_call] = STATE(384),
-    [sym_prefix_cast] = STATE(384),
-    [sym_unary_expr] = STATE(384),
-    [sym_mul_expr] = STATE(384),
-    [sym_add_expr] = STATE(384),
-    [sym_in_expr] = STATE(384),
-    [sym_comp_term] = STATE(384),
-    [sym_instance_of] = STATE(384),
-    [sym_negation] = STATE(384),
-    [sym_if_term] = STATE(384),
-    [sym_conjunction] = STATE(384),
-    [sym_disjunction] = STATE(384),
-    [sym_implication] = STATE(384),
-    [sym_quantified] = STATE(384),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(384),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_asExprs] = STATE(1064),
-    [sym_asExpr] = STATE(1017),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [148] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExprs] = STATE(1933),
+    [sym_asExpr] = STATE(1613),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -16870,70 +17439,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [144] = {
-    [sym_special_call] = STATE(952),
-    [sym_prefix_cast] = STATE(952),
-    [sym_unary_expr] = STATE(952),
-    [sym_mul_expr] = STATE(952),
-    [sym_add_expr] = STATE(952),
-    [sym_in_expr] = STATE(952),
-    [sym_comp_term] = STATE(952),
-    [sym_instance_of] = STATE(952),
-    [sym_negation] = STATE(952),
-    [sym_if_term] = STATE(952),
-    [sym_conjunction] = STATE(952),
-    [sym_disjunction] = STATE(952),
-    [sym_implication] = STATE(952),
-    [sym_quantified] = STATE(952),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(952),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [149] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_RPAREN] = ACTIONS(461),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [anon_sym_PIPE] = ACTIONS(463),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(465),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -16954,7 +17523,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -16966,58 +17535,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [145] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1888),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [150] = {
+    [sym_special_call] = STATE(368),
+    [sym_prefix_cast] = STATE(368),
+    [sym_unary_expr] = STATE(368),
+    [sym_mul_expr] = STATE(368),
+    [sym_add_expr] = STATE(368),
+    [sym_in_expr] = STATE(368),
+    [sym_comp_term] = STATE(368),
+    [sym_instance_of] = STATE(368),
+    [sym_negation] = STATE(368),
+    [sym_if_term] = STATE(368),
+    [sym_conjunction] = STATE(368),
+    [sym_disjunction] = STATE(368),
+    [sym_implication] = STATE(368),
+    [sym_quantified] = STATE(368),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(368),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_orderBy] = STATE(1185),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17038,70 +17607,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [146] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1891),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [151] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(491),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17122,7 +17691,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -17134,58 +17703,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [147] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1978),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [152] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(493),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17206,7 +17775,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -17218,58 +17787,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [148] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExprs] = STATE(1977),
-    [sym_asExpr] = STATE(1606),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [153] = {
+    [sym_special_call] = STATE(407),
+    [sym_prefix_cast] = STATE(407),
+    [sym_unary_expr] = STATE(407),
+    [sym_mul_expr] = STATE(407),
+    [sym_add_expr] = STATE(407),
+    [sym_in_expr] = STATE(407),
+    [sym_comp_term] = STATE(407),
+    [sym_instance_of] = STATE(407),
+    [sym_negation] = STATE(407),
+    [sym_if_term] = STATE(407),
+    [sym_conjunction] = STATE(407),
+    [sym_disjunction] = STATE(407),
+    [sym_implication] = STATE(407),
+    [sym_quantified] = STATE(407),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(407),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_asExpr] = STATE(1062),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17290,69 +17859,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [149] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [154] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(465),
+    [anon_sym_RBRACK] = ACTIONS(495),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17373,7 +17943,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -17385,57 +17955,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [150] = {
-    [sym_special_call] = STATE(370),
-    [sym_prefix_cast] = STATE(370),
-    [sym_unary_expr] = STATE(370),
-    [sym_mul_expr] = STATE(370),
-    [sym_add_expr] = STATE(370),
-    [sym_in_expr] = STATE(370),
-    [sym_comp_term] = STATE(370),
-    [sym_instance_of] = STATE(370),
-    [sym_negation] = STATE(370),
-    [sym_if_term] = STATE(370),
-    [sym_conjunction] = STATE(370),
-    [sym_disjunction] = STATE(370),
-    [sym_implication] = STATE(370),
-    [sym_quantified] = STATE(370),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(370),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_orderBy] = STATE(1214),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [155] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(497),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17456,69 +18027,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [151] = {
-    [sym_special_call] = STATE(817),
-    [sym_prefix_cast] = STATE(817),
-    [sym_unary_expr] = STATE(817),
-    [sym_mul_expr] = STATE(817),
-    [sym_add_expr] = STATE(817),
-    [sym_in_expr] = STATE(817),
-    [sym_comp_term] = STATE(817),
-    [sym_instance_of] = STATE(817),
-    [sym_negation] = STATE(817),
-    [sym_if_term] = STATE(817),
-    [sym_conjunction] = STATE(817),
-    [sym_disjunction] = STATE(817),
-    [sym_implication] = STATE(817),
-    [sym_quantified] = STATE(817),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(817),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_orderBy] = STATE(1634),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [156] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(499),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17539,69 +18111,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [152] = {
-    [sym_special_call] = STATE(820),
-    [sym_prefix_cast] = STATE(820),
-    [sym_unary_expr] = STATE(820),
-    [sym_mul_expr] = STATE(820),
-    [sym_add_expr] = STATE(820),
-    [sym_in_expr] = STATE(820),
-    [sym_comp_term] = STATE(820),
-    [sym_instance_of] = STATE(820),
-    [sym_negation] = STATE(820),
-    [sym_if_term] = STATE(820),
-    [sym_conjunction] = STATE(820),
-    [sym_disjunction] = STATE(820),
-    [sym_implication] = STATE(820),
-    [sym_quantified] = STATE(820),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(820),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_asExpr] = STATE(1637),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [157] = {
+    [sym_special_call] = STATE(368),
+    [sym_prefix_cast] = STATE(368),
+    [sym_unary_expr] = STATE(368),
+    [sym_mul_expr] = STATE(368),
+    [sym_add_expr] = STATE(368),
+    [sym_in_expr] = STATE(368),
+    [sym_comp_term] = STATE(368),
+    [sym_instance_of] = STATE(368),
+    [sym_negation] = STATE(368),
+    [sym_if_term] = STATE(368),
+    [sym_conjunction] = STATE(368),
+    [sym_disjunction] = STATE(368),
+    [sym_implication] = STATE(368),
+    [sym_quantified] = STATE(368),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(368),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_orderBy] = STATE(1143),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17622,69 +18195,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [153] = {
-    [sym_special_call] = STATE(368),
-    [sym_prefix_cast] = STATE(368),
-    [sym_unary_expr] = STATE(368),
-    [sym_mul_expr] = STATE(368),
-    [sym_add_expr] = STATE(368),
-    [sym_in_expr] = STATE(368),
-    [sym_comp_term] = STATE(368),
-    [sym_instance_of] = STATE(368),
-    [sym_negation] = STATE(368),
-    [sym_if_term] = STATE(368),
-    [sym_conjunction] = STATE(368),
-    [sym_disjunction] = STATE(368),
-    [sym_implication] = STATE(368),
-    [sym_quantified] = STATE(368),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(368),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_orderBy] = STATE(1056),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [158] = {
+    [sym_special_call] = STATE(371),
+    [sym_prefix_cast] = STATE(371),
+    [sym_unary_expr] = STATE(371),
+    [sym_mul_expr] = STATE(371),
+    [sym_add_expr] = STATE(371),
+    [sym_in_expr] = STATE(371),
+    [sym_comp_term] = STATE(371),
+    [sym_instance_of] = STATE(371),
+    [sym_negation] = STATE(371),
+    [sym_if_term] = STATE(371),
+    [sym_conjunction] = STATE(371),
+    [sym_disjunction] = STATE(371),
+    [sym_implication] = STATE(371),
+    [sym_quantified] = STATE(371),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(371),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_orderBy] = STATE(1206),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17705,69 +18279,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [154] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [159] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(539),
+    [anon_sym_RBRACK] = ACTIONS(525),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17788,7 +18363,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -17800,57 +18375,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [155] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [160] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(541),
+    [anon_sym_RBRACK] = ACTIONS(527),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17871,7 +18447,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -17883,57 +18459,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [156] = {
-    [sym_special_call] = STATE(375),
-    [sym_prefix_cast] = STATE(375),
-    [sym_unary_expr] = STATE(375),
-    [sym_mul_expr] = STATE(375),
-    [sym_add_expr] = STATE(375),
-    [sym_in_expr] = STATE(375),
-    [sym_comp_term] = STATE(375),
-    [sym_instance_of] = STATE(375),
-    [sym_negation] = STATE(375),
-    [sym_if_term] = STATE(375),
-    [sym_conjunction] = STATE(375),
-    [sym_disjunction] = STATE(375),
-    [sym_implication] = STATE(375),
-    [sym_quantified] = STATE(375),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(375),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_asExpr] = STATE(1173),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
+  [161] = {
+    [sym_special_call] = STATE(816),
+    [sym_prefix_cast] = STATE(816),
+    [sym_unary_expr] = STATE(816),
+    [sym_mul_expr] = STATE(816),
+    [sym_add_expr] = STATE(816),
+    [sym_in_expr] = STATE(816),
+    [sym_comp_term] = STATE(816),
+    [sym_instance_of] = STATE(816),
+    [sym_negation] = STATE(816),
+    [sym_if_term] = STATE(816),
+    [sym_conjunction] = STATE(816),
+    [sym_disjunction] = STATE(816),
+    [sym_implication] = STATE(816),
+    [sym_quantified] = STATE(816),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(816),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_orderBy] = STATE(1784),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
     [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -17954,69 +18531,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [157] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [162] = {
+    [sym_special_call] = STATE(371),
+    [sym_prefix_cast] = STATE(371),
+    [sym_unary_expr] = STATE(371),
+    [sym_mul_expr] = STATE(371),
+    [sym_add_expr] = STATE(371),
+    [sym_in_expr] = STATE(371),
+    [sym_comp_term] = STATE(371),
+    [sym_instance_of] = STATE(371),
+    [sym_negation] = STATE(371),
+    [sym_if_term] = STATE(371),
+    [sym_conjunction] = STATE(371),
+    [sym_disjunction] = STATE(371),
+    [sym_implication] = STATE(371),
+    [sym_quantified] = STATE(371),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(371),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_orderBy] = STATE(1082),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(543),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18037,69 +18615,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [158] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [163] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(545),
+    [anon_sym_RBRACK] = ACTIONS(553),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18120,7 +18699,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -18132,57 +18711,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [159] = {
-    [sym_special_call] = STATE(368),
-    [sym_prefix_cast] = STATE(368),
-    [sym_unary_expr] = STATE(368),
-    [sym_mul_expr] = STATE(368),
-    [sym_add_expr] = STATE(368),
-    [sym_in_expr] = STATE(368),
-    [sym_comp_term] = STATE(368),
-    [sym_instance_of] = STATE(368),
-    [sym_negation] = STATE(368),
-    [sym_if_term] = STATE(368),
-    [sym_conjunction] = STATE(368),
-    [sym_disjunction] = STATE(368),
-    [sym_implication] = STATE(368),
-    [sym_quantified] = STATE(368),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(368),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_orderBy] = STATE(1191),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [164] = {
+    [sym_special_call] = STATE(386),
+    [sym_prefix_cast] = STATE(386),
+    [sym_unary_expr] = STATE(386),
+    [sym_mul_expr] = STATE(386),
+    [sym_add_expr] = STATE(386),
+    [sym_in_expr] = STATE(386),
+    [sym_comp_term] = STATE(386),
+    [sym_instance_of] = STATE(386),
+    [sym_negation] = STATE(386),
+    [sym_if_term] = STATE(386),
+    [sym_conjunction] = STATE(386),
+    [sym_disjunction] = STATE(386),
+    [sym_implication] = STATE(386),
+    [sym_quantified] = STATE(386),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(386),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_asExpr] = STATE(1065),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18203,69 +18783,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [160] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [165] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(547),
+    [anon_sym_RBRACK] = ACTIONS(555),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18286,7 +18867,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -18298,57 +18879,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [161] = {
-    [sym_special_call] = STATE(874),
-    [sym_prefix_cast] = STATE(874),
-    [sym_unary_expr] = STATE(874),
-    [sym_mul_expr] = STATE(874),
-    [sym_add_expr] = STATE(874),
-    [sym_in_expr] = STATE(874),
-    [sym_comp_term] = STATE(874),
-    [sym_instance_of] = STATE(874),
-    [sym_negation] = STATE(874),
-    [sym_if_term] = STATE(874),
-    [sym_conjunction] = STATE(874),
-    [sym_disjunction] = STATE(874),
-    [sym_implication] = STATE(874),
-    [sym_quantified] = STATE(874),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(874),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_asExpr] = STATE(1637),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [166] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(557),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18369,7 +18951,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -18381,57 +18963,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [162] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [167] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(549),
+    [anon_sym_RBRACK] = ACTIONS(559),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18452,7 +19035,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -18464,57 +19047,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [163] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [168] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(551),
+    [anon_sym_RBRACK] = ACTIONS(561),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18535,7 +19119,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -18547,57 +19131,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [164] = {
-    [sym_special_call] = STATE(817),
-    [sym_prefix_cast] = STATE(817),
-    [sym_unary_expr] = STATE(817),
-    [sym_mul_expr] = STATE(817),
-    [sym_add_expr] = STATE(817),
-    [sym_in_expr] = STATE(817),
-    [sym_comp_term] = STATE(817),
-    [sym_instance_of] = STATE(817),
-    [sym_negation] = STATE(817),
-    [sym_if_term] = STATE(817),
-    [sym_conjunction] = STATE(817),
-    [sym_disjunction] = STATE(817),
-    [sym_implication] = STATE(817),
-    [sym_quantified] = STATE(817),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(817),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_orderBy] = STATE(1767),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [169] = {
+    [sym_special_call] = STATE(816),
+    [sym_prefix_cast] = STATE(816),
+    [sym_unary_expr] = STATE(816),
+    [sym_mul_expr] = STATE(816),
+    [sym_add_expr] = STATE(816),
+    [sym_in_expr] = STATE(816),
+    [sym_comp_term] = STATE(816),
+    [sym_instance_of] = STATE(816),
+    [sym_negation] = STATE(816),
+    [sym_if_term] = STATE(816),
+    [sym_conjunction] = STATE(816),
+    [sym_disjunction] = STATE(816),
+    [sym_implication] = STATE(816),
+    [sym_quantified] = STATE(816),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(816),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_orderBy] = STATE(1670),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18618,69 +19203,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [165] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [170] = {
+    [sym_special_call] = STATE(872),
+    [sym_prefix_cast] = STATE(872),
+    [sym_unary_expr] = STATE(872),
+    [sym_mul_expr] = STATE(872),
+    [sym_add_expr] = STATE(872),
+    [sym_in_expr] = STATE(872),
+    [sym_comp_term] = STATE(872),
+    [sym_instance_of] = STATE(872),
+    [sym_negation] = STATE(872),
+    [sym_if_term] = STATE(872),
+    [sym_conjunction] = STATE(872),
+    [sym_disjunction] = STATE(872),
+    [sym_implication] = STATE(872),
+    [sym_quantified] = STATE(872),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(872),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_asExpr] = STATE(1681),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(553),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18701,7 +19287,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -18713,57 +19299,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [166] = {
-    [sym_special_call] = STATE(370),
-    [sym_prefix_cast] = STATE(370),
-    [sym_unary_expr] = STATE(370),
-    [sym_mul_expr] = STATE(370),
-    [sym_add_expr] = STATE(370),
-    [sym_in_expr] = STATE(370),
-    [sym_comp_term] = STATE(370),
-    [sym_instance_of] = STATE(370),
-    [sym_negation] = STATE(370),
-    [sym_if_term] = STATE(370),
-    [sym_conjunction] = STATE(370),
-    [sym_disjunction] = STATE(370),
-    [sym_implication] = STATE(370),
-    [sym_quantified] = STATE(370),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(370),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_orderBy] = STATE(1153),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [171] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_RBRACK] = ACTIONS(563),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18784,69 +19371,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [167] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [172] = {
+    [sym_special_call] = STATE(824),
+    [sym_prefix_cast] = STATE(824),
+    [sym_unary_expr] = STATE(824),
+    [sym_mul_expr] = STATE(824),
+    [sym_add_expr] = STATE(824),
+    [sym_in_expr] = STATE(824),
+    [sym_comp_term] = STATE(824),
+    [sym_instance_of] = STATE(824),
+    [sym_negation] = STATE(824),
+    [sym_if_term] = STATE(824),
+    [sym_conjunction] = STATE(824),
+    [sym_disjunction] = STATE(824),
+    [sym_implication] = STATE(824),
+    [sym_quantified] = STATE(824),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(824),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_asExpr] = STATE(1681),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(555),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18867,69 +19455,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [168] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [173] = {
+    [sym_special_call] = STATE(806),
+    [sym_prefix_cast] = STATE(806),
+    [sym_unary_expr] = STATE(806),
+    [sym_mul_expr] = STATE(806),
+    [sym_add_expr] = STATE(806),
+    [sym_in_expr] = STATE(806),
+    [sym_comp_term] = STATE(806),
+    [sym_instance_of] = STATE(806),
+    [sym_negation] = STATE(806),
+    [sym_if_term] = STATE(806),
+    [sym_conjunction] = STATE(806),
+    [sym_disjunction] = STATE(806),
+    [sym_implication] = STATE(806),
+    [sym_quantified] = STATE(806),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(806),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(557),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -18950,7 +19538,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -18962,57 +19550,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [169] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [174] = {
+    [sym_special_call] = STATE(841),
+    [sym_prefix_cast] = STATE(841),
+    [sym_unary_expr] = STATE(841),
+    [sym_mul_expr] = STATE(841),
+    [sym_add_expr] = STATE(841),
+    [sym_in_expr] = STATE(841),
+    [sym_comp_term] = STATE(841),
+    [sym_instance_of] = STATE(841),
+    [sym_negation] = STATE(841),
+    [sym_if_term] = STATE(841),
+    [sym_conjunction] = STATE(841),
+    [sym_disjunction] = STATE(841),
+    [sym_implication] = STATE(841),
+    [sym_quantified] = STATE(841),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(841),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(559),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -19033,69 +19621,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [170] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [175] = {
+    [sym_special_call] = STATE(797),
+    [sym_prefix_cast] = STATE(797),
+    [sym_unary_expr] = STATE(797),
+    [sym_mul_expr] = STATE(797),
+    [sym_add_expr] = STATE(797),
+    [sym_in_expr] = STATE(797),
+    [sym_comp_term] = STATE(797),
+    [sym_instance_of] = STATE(797),
+    [sym_negation] = STATE(797),
+    [sym_if_term] = STATE(797),
+    [sym_conjunction] = STATE(797),
+    [sym_disjunction] = STATE(797),
+    [sym_implication] = STATE(797),
+    [sym_quantified] = STATE(797),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(797),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(561),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -19116,7 +19704,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -19128,57 +19716,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [171] = {
-    [sym_special_call] = STATE(384),
-    [sym_prefix_cast] = STATE(384),
-    [sym_unary_expr] = STATE(384),
-    [sym_mul_expr] = STATE(384),
-    [sym_add_expr] = STATE(384),
-    [sym_in_expr] = STATE(384),
-    [sym_comp_term] = STATE(384),
-    [sym_instance_of] = STATE(384),
-    [sym_negation] = STATE(384),
-    [sym_if_term] = STATE(384),
-    [sym_conjunction] = STATE(384),
-    [sym_disjunction] = STATE(384),
-    [sym_implication] = STATE(384),
-    [sym_quantified] = STATE(384),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(384),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_asExpr] = STATE(1158),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [176] = {
+    [sym_special_call] = STATE(1140),
+    [sym_prefix_cast] = STATE(1140),
+    [sym_unary_expr] = STATE(1140),
+    [sym_mul_expr] = STATE(1140),
+    [sym_add_expr] = STATE(1140),
+    [sym_in_expr] = STATE(1140),
+    [sym_comp_term] = STATE(1140),
+    [sym_instance_of] = STATE(1140),
+    [sym_negation] = STATE(1140),
+    [sym_if_term] = STATE(1140),
+    [sym_conjunction] = STATE(1140),
+    [sym_disjunction] = STATE(1140),
+    [sym_implication] = STATE(1140),
+    [sym_quantified] = STATE(1140),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1140),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -19199,69 +19787,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [172] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [177] = {
+    [sym_special_call] = STATE(1136),
+    [sym_prefix_cast] = STATE(1136),
+    [sym_unary_expr] = STATE(1136),
+    [sym_mul_expr] = STATE(1136),
+    [sym_add_expr] = STATE(1136),
+    [sym_in_expr] = STATE(1136),
+    [sym_comp_term] = STATE(1136),
+    [sym_instance_of] = STATE(1136),
+    [sym_negation] = STATE(1136),
+    [sym_if_term] = STATE(1136),
+    [sym_conjunction] = STATE(1136),
+    [sym_disjunction] = STATE(1136),
+    [sym_implication] = STATE(1136),
+    [sym_quantified] = STATE(1136),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1136),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
     [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_RBRACK] = ACTIONS(563),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -19282,7 +19870,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -19294,56 +19882,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [173] = {
-    [sym_special_call] = STATE(417),
-    [sym_prefix_cast] = STATE(417),
-    [sym_unary_expr] = STATE(417),
-    [sym_mul_expr] = STATE(417),
-    [sym_add_expr] = STATE(417),
-    [sym_in_expr] = STATE(417),
-    [sym_comp_term] = STATE(417),
-    [sym_instance_of] = STATE(417),
-    [sym_negation] = STATE(417),
-    [sym_if_term] = STATE(417),
-    [sym_conjunction] = STATE(417),
-    [sym_disjunction] = STATE(417),
-    [sym_implication] = STATE(417),
-    [sym_quantified] = STATE(417),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(417),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [178] = {
+    [sym_special_call] = STATE(398),
+    [sym_prefix_cast] = STATE(398),
+    [sym_unary_expr] = STATE(398),
+    [sym_mul_expr] = STATE(398),
+    [sym_add_expr] = STATE(398),
+    [sym_in_expr] = STATE(398),
+    [sym_comp_term] = STATE(398),
+    [sym_instance_of] = STATE(398),
+    [sym_negation] = STATE(398),
+    [sym_if_term] = STATE(398),
+    [sym_conjunction] = STATE(398),
+    [sym_disjunction] = STATE(398),
+    [sym_implication] = STATE(398),
+    [sym_quantified] = STATE(398),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(398),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -19364,68 +19953,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [174] = {
-    [sym_special_call] = STATE(839),
-    [sym_prefix_cast] = STATE(839),
-    [sym_unary_expr] = STATE(839),
-    [sym_mul_expr] = STATE(839),
-    [sym_add_expr] = STATE(839),
-    [sym_in_expr] = STATE(839),
-    [sym_comp_term] = STATE(839),
-    [sym_instance_of] = STATE(839),
-    [sym_negation] = STATE(839),
-    [sym_if_term] = STATE(839),
-    [sym_conjunction] = STATE(839),
-    [sym_disjunction] = STATE(839),
-    [sym_implication] = STATE(839),
-    [sym_quantified] = STATE(839),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(839),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [179] = {
+    [sym_special_call] = STATE(984),
+    [sym_prefix_cast] = STATE(984),
+    [sym_unary_expr] = STATE(984),
+    [sym_mul_expr] = STATE(984),
+    [sym_add_expr] = STATE(984),
+    [sym_in_expr] = STATE(984),
+    [sym_comp_term] = STATE(984),
+    [sym_instance_of] = STATE(984),
+    [sym_negation] = STATE(984),
+    [sym_if_term] = STATE(984),
+    [sym_conjunction] = STATE(984),
+    [sym_disjunction] = STATE(984),
+    [sym_implication] = STATE(984),
+    [sym_quantified] = STATE(984),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(984),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -19446,63 +20036,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [175] = {
-    [sym_special_call] = STATE(1063),
-    [sym_prefix_cast] = STATE(1063),
-    [sym_unary_expr] = STATE(1063),
-    [sym_mul_expr] = STATE(1063),
-    [sym_add_expr] = STATE(1063),
-    [sym_in_expr] = STATE(1063),
-    [sym_comp_term] = STATE(1063),
-    [sym_instance_of] = STATE(1063),
-    [sym_negation] = STATE(1063),
-    [sym_if_term] = STATE(1063),
-    [sym_conjunction] = STATE(1063),
-    [sym_disjunction] = STATE(1063),
-    [sym_implication] = STATE(1063),
-    [sym_quantified] = STATE(1063),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1063),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [180] = {
+    [sym_special_call] = STATE(1166),
+    [sym_prefix_cast] = STATE(1166),
+    [sym_unary_expr] = STATE(1166),
+    [sym_mul_expr] = STATE(1166),
+    [sym_add_expr] = STATE(1166),
+    [sym_in_expr] = STATE(1166),
+    [sym_comp_term] = STATE(1166),
+    [sym_instance_of] = STATE(1166),
+    [sym_negation] = STATE(1166),
+    [sym_if_term] = STATE(1166),
+    [sym_conjunction] = STATE(1166),
+    [sym_disjunction] = STATE(1166),
+    [sym_implication] = STATE(1166),
+    [sym_quantified] = STATE(1166),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1166),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -19528,7 +20119,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -19540,51 +20131,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [176] = {
-    [sym_special_call] = STATE(792),
-    [sym_prefix_cast] = STATE(792),
-    [sym_unary_expr] = STATE(792),
-    [sym_mul_expr] = STATE(792),
-    [sym_add_expr] = STATE(792),
-    [sym_in_expr] = STATE(792),
-    [sym_comp_term] = STATE(792),
-    [sym_instance_of] = STATE(792),
-    [sym_negation] = STATE(792),
-    [sym_if_term] = STATE(792),
-    [sym_conjunction] = STATE(792),
-    [sym_disjunction] = STATE(792),
-    [sym_implication] = STATE(792),
-    [sym_quantified] = STATE(792),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(792),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [181] = {
+    [sym_special_call] = STATE(1097),
+    [sym_prefix_cast] = STATE(1097),
+    [sym_unary_expr] = STATE(1097),
+    [sym_mul_expr] = STATE(1097),
+    [sym_add_expr] = STATE(1097),
+    [sym_in_expr] = STATE(1097),
+    [sym_comp_term] = STATE(1097),
+    [sym_instance_of] = STATE(1097),
+    [sym_negation] = STATE(1097),
+    [sym_if_term] = STATE(1097),
+    [sym_conjunction] = STATE(1097),
+    [sym_disjunction] = STATE(1097),
+    [sym_implication] = STATE(1097),
+    [sym_quantified] = STATE(1097),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1097),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -19610,7 +20202,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -19622,47 +20214,131 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [177] = {
-    [sym_special_call] = STATE(1003),
-    [sym_prefix_cast] = STATE(1003),
-    [sym_unary_expr] = STATE(1003),
-    [sym_mul_expr] = STATE(1003),
-    [sym_add_expr] = STATE(1003),
-    [sym_in_expr] = STATE(1003),
-    [sym_comp_term] = STATE(1003),
-    [sym_instance_of] = STATE(1003),
-    [sym_negation] = STATE(1003),
-    [sym_if_term] = STATE(1003),
-    [sym_conjunction] = STATE(1003),
-    [sym_disjunction] = STATE(1003),
-    [sym_implication] = STATE(1003),
-    [sym_quantified] = STATE(1003),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1003),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [182] = {
+    [sym_special_call] = STATE(857),
+    [sym_prefix_cast] = STATE(857),
+    [sym_unary_expr] = STATE(857),
+    [sym_mul_expr] = STATE(857),
+    [sym_add_expr] = STATE(857),
+    [sym_in_expr] = STATE(857),
+    [sym_comp_term] = STATE(857),
+    [sym_instance_of] = STATE(857),
+    [sym_negation] = STATE(857),
+    [sym_if_term] = STATE(857),
+    [sym_conjunction] = STATE(857),
+    [sym_disjunction] = STATE(857),
+    [sym_implication] = STATE(857),
+    [sym_quantified] = STATE(857),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(857),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(539),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
+  },
+  [183] = {
+    [sym_special_call] = STATE(1058),
+    [sym_prefix_cast] = STATE(1058),
+    [sym_unary_expr] = STATE(1058),
+    [sym_mul_expr] = STATE(1058),
+    [sym_add_expr] = STATE(1058),
+    [sym_in_expr] = STATE(1058),
+    [sym_comp_term] = STATE(1058),
+    [sym_instance_of] = STATE(1058),
+    [sym_negation] = STATE(1058),
+    [sym_if_term] = STATE(1058),
+    [sym_conjunction] = STATE(1058),
+    [sym_disjunction] = STATE(1058),
+    [sym_implication] = STATE(1058),
+    [sym_quantified] = STATE(1058),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1058),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -19704,56 +20380,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [178] = {
-    [sym_special_call] = STATE(414),
-    [sym_prefix_cast] = STATE(414),
-    [sym_unary_expr] = STATE(414),
-    [sym_mul_expr] = STATE(414),
-    [sym_add_expr] = STATE(414),
-    [sym_in_expr] = STATE(414),
-    [sym_comp_term] = STATE(414),
-    [sym_instance_of] = STATE(414),
-    [sym_negation] = STATE(414),
-    [sym_if_term] = STATE(414),
-    [sym_conjunction] = STATE(414),
-    [sym_disjunction] = STATE(414),
-    [sym_implication] = STATE(414),
-    [sym_quantified] = STATE(414),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(414),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+  [184] = {
+    [sym_special_call] = STATE(387),
+    [sym_prefix_cast] = STATE(387),
+    [sym_unary_expr] = STATE(387),
+    [sym_mul_expr] = STATE(387),
+    [sym_add_expr] = STATE(387),
+    [sym_in_expr] = STATE(387),
+    [sym_comp_term] = STATE(387),
+    [sym_instance_of] = STATE(387),
+    [sym_negation] = STATE(387),
+    [sym_if_term] = STATE(387),
+    [sym_conjunction] = STATE(387),
+    [sym_disjunction] = STATE(387),
+    [sym_implication] = STATE(387),
+    [sym_quantified] = STATE(387),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(387),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -19774,63 +20451,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [179] = {
-    [sym_special_call] = STATE(1072),
-    [sym_prefix_cast] = STATE(1072),
-    [sym_unary_expr] = STATE(1072),
-    [sym_mul_expr] = STATE(1072),
-    [sym_add_expr] = STATE(1072),
-    [sym_in_expr] = STATE(1072),
-    [sym_comp_term] = STATE(1072),
-    [sym_instance_of] = STATE(1072),
-    [sym_negation] = STATE(1072),
-    [sym_if_term] = STATE(1072),
-    [sym_conjunction] = STATE(1072),
-    [sym_disjunction] = STATE(1072),
-    [sym_implication] = STATE(1072),
-    [sym_quantified] = STATE(1072),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1072),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [185] = {
+    [sym_special_call] = STATE(1122),
+    [sym_prefix_cast] = STATE(1122),
+    [sym_unary_expr] = STATE(1122),
+    [sym_mul_expr] = STATE(1122),
+    [sym_add_expr] = STATE(1122),
+    [sym_in_expr] = STATE(1122),
+    [sym_comp_term] = STATE(1122),
+    [sym_instance_of] = STATE(1122),
+    [sym_negation] = STATE(1122),
+    [sym_if_term] = STATE(1122),
+    [sym_conjunction] = STATE(1122),
+    [sym_disjunction] = STATE(1122),
+    [sym_implication] = STATE(1122),
+    [sym_quantified] = STATE(1122),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1122),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -19856,7 +20534,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -19868,47 +20546,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [180] = {
-    [sym_special_call] = STATE(1086),
-    [sym_prefix_cast] = STATE(1086),
-    [sym_unary_expr] = STATE(1086),
-    [sym_mul_expr] = STATE(1086),
-    [sym_add_expr] = STATE(1086),
-    [sym_in_expr] = STATE(1086),
-    [sym_comp_term] = STATE(1086),
-    [sym_instance_of] = STATE(1086),
-    [sym_negation] = STATE(1086),
-    [sym_if_term] = STATE(1086),
-    [sym_conjunction] = STATE(1086),
-    [sym_disjunction] = STATE(1086),
-    [sym_implication] = STATE(1086),
-    [sym_quantified] = STATE(1086),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1086),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [186] = {
+    [sym_special_call] = STATE(1041),
+    [sym_prefix_cast] = STATE(1041),
+    [sym_unary_expr] = STATE(1041),
+    [sym_mul_expr] = STATE(1041),
+    [sym_add_expr] = STATE(1041),
+    [sym_in_expr] = STATE(1041),
+    [sym_comp_term] = STATE(1041),
+    [sym_instance_of] = STATE(1041),
+    [sym_negation] = STATE(1041),
+    [sym_if_term] = STATE(1041),
+    [sym_conjunction] = STATE(1041),
+    [sym_disjunction] = STATE(1041),
+    [sym_implication] = STATE(1041),
+    [sym_quantified] = STATE(1041),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1041),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1763),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1769),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -19938,7 +20617,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -19950,51 +20629,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [181] = {
-    [sym_special_call] = STATE(1165),
-    [sym_prefix_cast] = STATE(1165),
-    [sym_unary_expr] = STATE(1165),
-    [sym_mul_expr] = STATE(1165),
-    [sym_add_expr] = STATE(1165),
-    [sym_in_expr] = STATE(1165),
-    [sym_comp_term] = STATE(1165),
-    [sym_instance_of] = STATE(1165),
-    [sym_negation] = STATE(1165),
-    [sym_if_term] = STATE(1165),
-    [sym_conjunction] = STATE(1165),
-    [sym_disjunction] = STATE(1165),
-    [sym_implication] = STATE(1165),
-    [sym_quantified] = STATE(1165),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1165),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [187] = {
+    [sym_special_call] = STATE(1118),
+    [sym_prefix_cast] = STATE(1118),
+    [sym_unary_expr] = STATE(1118),
+    [sym_mul_expr] = STATE(1118),
+    [sym_add_expr] = STATE(1118),
+    [sym_in_expr] = STATE(1118),
+    [sym_comp_term] = STATE(1118),
+    [sym_instance_of] = STATE(1118),
+    [sym_negation] = STATE(1118),
+    [sym_if_term] = STATE(1118),
+    [sym_conjunction] = STATE(1118),
+    [sym_disjunction] = STATE(1118),
+    [sym_implication] = STATE(1118),
+    [sym_quantified] = STATE(1118),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1118),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -20020,7 +20700,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -20032,51 +20712,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [182] = {
-    [sym_special_call] = STATE(1092),
-    [sym_prefix_cast] = STATE(1092),
-    [sym_unary_expr] = STATE(1092),
-    [sym_mul_expr] = STATE(1092),
-    [sym_add_expr] = STATE(1092),
-    [sym_in_expr] = STATE(1092),
-    [sym_comp_term] = STATE(1092),
-    [sym_instance_of] = STATE(1092),
-    [sym_negation] = STATE(1092),
-    [sym_if_term] = STATE(1092),
-    [sym_conjunction] = STATE(1092),
-    [sym_disjunction] = STATE(1092),
-    [sym_implication] = STATE(1092),
-    [sym_quantified] = STATE(1092),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1092),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [188] = {
+    [sym_special_call] = STATE(1117),
+    [sym_prefix_cast] = STATE(1117),
+    [sym_unary_expr] = STATE(1117),
+    [sym_mul_expr] = STATE(1117),
+    [sym_add_expr] = STATE(1117),
+    [sym_in_expr] = STATE(1117),
+    [sym_comp_term] = STATE(1117),
+    [sym_instance_of] = STATE(1117),
+    [sym_negation] = STATE(1117),
+    [sym_if_term] = STATE(1117),
+    [sym_conjunction] = STATE(1117),
+    [sym_disjunction] = STATE(1117),
+    [sym_implication] = STATE(1117),
+    [sym_quantified] = STATE(1117),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1117),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -20102,7 +20783,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -20114,47 +20795,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [183] = {
-    [sym_special_call] = STATE(1044),
-    [sym_prefix_cast] = STATE(1044),
-    [sym_unary_expr] = STATE(1044),
-    [sym_mul_expr] = STATE(1044),
-    [sym_add_expr] = STATE(1044),
-    [sym_in_expr] = STATE(1044),
-    [sym_comp_term] = STATE(1044),
-    [sym_instance_of] = STATE(1044),
-    [sym_negation] = STATE(1044),
-    [sym_if_term] = STATE(1044),
-    [sym_conjunction] = STATE(1044),
-    [sym_disjunction] = STATE(1044),
-    [sym_implication] = STATE(1044),
-    [sym_quantified] = STATE(1044),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1044),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [189] = {
+    [sym_special_call] = STATE(1164),
+    [sym_prefix_cast] = STATE(1164),
+    [sym_unary_expr] = STATE(1164),
+    [sym_mul_expr] = STATE(1164),
+    [sym_add_expr] = STATE(1164),
+    [sym_in_expr] = STATE(1164),
+    [sym_comp_term] = STATE(1164),
+    [sym_instance_of] = STATE(1164),
+    [sym_negation] = STATE(1164),
+    [sym_if_term] = STATE(1164),
+    [sym_conjunction] = STATE(1164),
+    [sym_disjunction] = STATE(1164),
+    [sym_implication] = STATE(1164),
+    [sym_quantified] = STATE(1164),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1164),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -20196,56 +20878,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [184] = {
-    [sym_special_call] = STATE(391),
-    [sym_prefix_cast] = STATE(391),
-    [sym_unary_expr] = STATE(391),
-    [sym_mul_expr] = STATE(391),
-    [sym_add_expr] = STATE(391),
-    [sym_in_expr] = STATE(391),
-    [sym_comp_term] = STATE(391),
-    [sym_instance_of] = STATE(391),
-    [sym_negation] = STATE(391),
-    [sym_if_term] = STATE(391),
-    [sym_conjunction] = STATE(391),
-    [sym_disjunction] = STATE(391),
-    [sym_implication] = STATE(391),
-    [sym_quantified] = STATE(391),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(391),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [190] = {
+    [sym_special_call] = STATE(1002),
+    [sym_prefix_cast] = STATE(1002),
+    [sym_unary_expr] = STATE(1002),
+    [sym_mul_expr] = STATE(1002),
+    [sym_add_expr] = STATE(1002),
+    [sym_in_expr] = STATE(1002),
+    [sym_comp_term] = STATE(1002),
+    [sym_instance_of] = STATE(1002),
+    [sym_negation] = STATE(1002),
+    [sym_if_term] = STATE(1002),
+    [sym_conjunction] = STATE(1002),
+    [sym_disjunction] = STATE(1002),
+    [sym_implication] = STATE(1002),
+    [sym_quantified] = STATE(1002),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1002),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -20266,59 +20949,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [185] = {
-    [sym_special_call] = STATE(999),
-    [sym_prefix_cast] = STATE(999),
-    [sym_unary_expr] = STATE(999),
-    [sym_mul_expr] = STATE(999),
-    [sym_add_expr] = STATE(999),
-    [sym_in_expr] = STATE(999),
-    [sym_comp_term] = STATE(999),
-    [sym_instance_of] = STATE(999),
-    [sym_negation] = STATE(999),
-    [sym_if_term] = STATE(999),
-    [sym_conjunction] = STATE(999),
-    [sym_disjunction] = STATE(999),
-    [sym_implication] = STATE(999),
-    [sym_quantified] = STATE(999),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(999),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [191] = {
+    [sym_special_call] = STATE(1005),
+    [sym_prefix_cast] = STATE(1005),
+    [sym_unary_expr] = STATE(1005),
+    [sym_mul_expr] = STATE(1005),
+    [sym_add_expr] = STATE(1005),
+    [sym_in_expr] = STATE(1005),
+    [sym_comp_term] = STATE(1005),
+    [sym_instance_of] = STATE(1005),
+    [sym_negation] = STATE(1005),
+    [sym_if_term] = STATE(1005),
+    [sym_conjunction] = STATE(1005),
+    [sym_disjunction] = STATE(1005),
+    [sym_implication] = STATE(1005),
+    [sym_quantified] = STATE(1005),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1005),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -20360,51 +21044,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [186] = {
-    [sym_special_call] = STATE(1167),
-    [sym_prefix_cast] = STATE(1167),
-    [sym_unary_expr] = STATE(1167),
-    [sym_mul_expr] = STATE(1167),
-    [sym_add_expr] = STATE(1167),
-    [sym_in_expr] = STATE(1167),
-    [sym_comp_term] = STATE(1167),
-    [sym_instance_of] = STATE(1167),
-    [sym_negation] = STATE(1167),
-    [sym_if_term] = STATE(1167),
-    [sym_conjunction] = STATE(1167),
-    [sym_disjunction] = STATE(1167),
-    [sym_implication] = STATE(1167),
-    [sym_quantified] = STATE(1167),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1167),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [192] = {
+    [sym_special_call] = STATE(1107),
+    [sym_prefix_cast] = STATE(1107),
+    [sym_unary_expr] = STATE(1107),
+    [sym_mul_expr] = STATE(1107),
+    [sym_add_expr] = STATE(1107),
+    [sym_in_expr] = STATE(1107),
+    [sym_comp_term] = STATE(1107),
+    [sym_instance_of] = STATE(1107),
+    [sym_negation] = STATE(1107),
+    [sym_if_term] = STATE(1107),
+    [sym_conjunction] = STATE(1107),
+    [sym_disjunction] = STATE(1107),
+    [sym_implication] = STATE(1107),
+    [sym_quantified] = STATE(1107),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1107),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -20430,7 +21115,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -20442,7 +21127,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [187] = {
+  [193] = {
     [sym_special_call] = STATE(1100),
     [sym_prefix_cast] = STATE(1100),
     [sym_unary_expr] = STATE(1100),
@@ -20457,32 +21142,33 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_disjunction] = STATE(1100),
     [sym_implication] = STATE(1100),
     [sym_quantified] = STATE(1100),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
     [sym__exprOrTerm] = STATE(1100),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1769),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -20512,7 +21198,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -20524,56 +21210,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [188] = {
-    [sym_special_call] = STATE(387),
-    [sym_prefix_cast] = STATE(387),
-    [sym_unary_expr] = STATE(387),
-    [sym_mul_expr] = STATE(387),
-    [sym_add_expr] = STATE(387),
-    [sym_in_expr] = STATE(387),
-    [sym_comp_term] = STATE(387),
-    [sym_instance_of] = STATE(387),
-    [sym_negation] = STATE(387),
-    [sym_if_term] = STATE(387),
-    [sym_conjunction] = STATE(387),
-    [sym_disjunction] = STATE(387),
-    [sym_implication] = STATE(387),
-    [sym_quantified] = STATE(387),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(387),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [194] = {
+    [sym_special_call] = STATE(1013),
+    [sym_prefix_cast] = STATE(1013),
+    [sym_unary_expr] = STATE(1013),
+    [sym_mul_expr] = STATE(1013),
+    [sym_add_expr] = STATE(1013),
+    [sym_in_expr] = STATE(1013),
+    [sym_comp_term] = STATE(1013),
+    [sym_instance_of] = STATE(1013),
+    [sym_negation] = STATE(1013),
+    [sym_if_term] = STATE(1013),
+    [sym_conjunction] = STATE(1013),
+    [sym_disjunction] = STATE(1013),
+    [sym_implication] = STATE(1013),
+    [sym_quantified] = STATE(1013),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1013),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -20594,68 +21281,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [189] = {
-    [sym_special_call] = STATE(416),
-    [sym_prefix_cast] = STATE(416),
-    [sym_unary_expr] = STATE(416),
-    [sym_mul_expr] = STATE(416),
-    [sym_add_expr] = STATE(416),
-    [sym_in_expr] = STATE(416),
-    [sym_comp_term] = STATE(416),
-    [sym_instance_of] = STATE(416),
-    [sym_negation] = STATE(416),
-    [sym_if_term] = STATE(416),
-    [sym_conjunction] = STATE(416),
-    [sym_disjunction] = STATE(416),
-    [sym_implication] = STATE(416),
-    [sym_quantified] = STATE(416),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(416),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
+  [195] = {
+    [sym_special_call] = STATE(413),
+    [sym_prefix_cast] = STATE(413),
+    [sym_unary_expr] = STATE(413),
+    [sym_mul_expr] = STATE(413),
+    [sym_add_expr] = STATE(413),
+    [sym_in_expr] = STATE(413),
+    [sym_comp_term] = STATE(413),
+    [sym_instance_of] = STATE(413),
+    [sym_negation] = STATE(413),
+    [sym_if_term] = STATE(413),
+    [sym_conjunction] = STATE(413),
+    [sym_disjunction] = STATE(413),
+    [sym_implication] = STATE(413),
+    [sym_quantified] = STATE(413),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(413),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
     [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -20676,63 +21364,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [190] = {
-    [sym_special_call] = STATE(871),
-    [sym_prefix_cast] = STATE(871),
-    [sym_unary_expr] = STATE(871),
-    [sym_mul_expr] = STATE(871),
-    [sym_add_expr] = STATE(871),
-    [sym_in_expr] = STATE(871),
-    [sym_comp_term] = STATE(871),
-    [sym_instance_of] = STATE(871),
-    [sym_negation] = STATE(871),
-    [sym_if_term] = STATE(871),
-    [sym_conjunction] = STATE(871),
-    [sym_disjunction] = STATE(871),
-    [sym_implication] = STATE(871),
-    [sym_quantified] = STATE(871),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(871),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [196] = {
+    [sym_special_call] = STATE(1072),
+    [sym_prefix_cast] = STATE(1072),
+    [sym_unary_expr] = STATE(1072),
+    [sym_mul_expr] = STATE(1072),
+    [sym_add_expr] = STATE(1072),
+    [sym_in_expr] = STATE(1072),
+    [sym_comp_term] = STATE(1072),
+    [sym_instance_of] = STATE(1072),
+    [sym_negation] = STATE(1072),
+    [sym_if_term] = STATE(1072),
+    [sym_conjunction] = STATE(1072),
+    [sym_disjunction] = STATE(1072),
+    [sym_implication] = STATE(1072),
+    [sym_quantified] = STATE(1072),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1072),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -20758,7 +21447,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -20770,47 +21459,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [191] = {
-    [sym_special_call] = STATE(1066),
-    [sym_prefix_cast] = STATE(1066),
-    [sym_unary_expr] = STATE(1066),
-    [sym_mul_expr] = STATE(1066),
-    [sym_add_expr] = STATE(1066),
-    [sym_in_expr] = STATE(1066),
-    [sym_comp_term] = STATE(1066),
-    [sym_instance_of] = STATE(1066),
-    [sym_negation] = STATE(1066),
-    [sym_if_term] = STATE(1066),
-    [sym_conjunction] = STATE(1066),
-    [sym_disjunction] = STATE(1066),
-    [sym_implication] = STATE(1066),
-    [sym_quantified] = STATE(1066),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1066),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [197] = {
+    [sym_special_call] = STATE(1087),
+    [sym_prefix_cast] = STATE(1087),
+    [sym_unary_expr] = STATE(1087),
+    [sym_mul_expr] = STATE(1087),
+    [sym_add_expr] = STATE(1087),
+    [sym_in_expr] = STATE(1087),
+    [sym_comp_term] = STATE(1087),
+    [sym_instance_of] = STATE(1087),
+    [sym_negation] = STATE(1087),
+    [sym_if_term] = STATE(1087),
+    [sym_conjunction] = STATE(1087),
+    [sym_disjunction] = STATE(1087),
+    [sym_implication] = STATE(1087),
+    [sym_quantified] = STATE(1087),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1087),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -20852,47 +21542,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [192] = {
-    [sym_special_call] = STATE(1010),
-    [sym_prefix_cast] = STATE(1010),
-    [sym_unary_expr] = STATE(1010),
-    [sym_mul_expr] = STATE(1010),
-    [sym_add_expr] = STATE(1010),
-    [sym_in_expr] = STATE(1010),
-    [sym_comp_term] = STATE(1010),
-    [sym_instance_of] = STATE(1010),
-    [sym_negation] = STATE(1010),
-    [sym_if_term] = STATE(1010),
-    [sym_conjunction] = STATE(1010),
-    [sym_disjunction] = STATE(1010),
-    [sym_implication] = STATE(1010),
-    [sym_quantified] = STATE(1010),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1010),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [198] = {
+    [sym_special_call] = STATE(1084),
+    [sym_prefix_cast] = STATE(1084),
+    [sym_unary_expr] = STATE(1084),
+    [sym_mul_expr] = STATE(1084),
+    [sym_add_expr] = STATE(1084),
+    [sym_in_expr] = STATE(1084),
+    [sym_comp_term] = STATE(1084),
+    [sym_instance_of] = STATE(1084),
+    [sym_negation] = STATE(1084),
+    [sym_if_term] = STATE(1084),
+    [sym_conjunction] = STATE(1084),
+    [sym_disjunction] = STATE(1084),
+    [sym_implication] = STATE(1084),
+    [sym_quantified] = STATE(1084),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1084),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -20934,47 +21625,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [193] = {
-    [sym_special_call] = STATE(1178),
-    [sym_prefix_cast] = STATE(1178),
-    [sym_unary_expr] = STATE(1178),
-    [sym_mul_expr] = STATE(1178),
-    [sym_add_expr] = STATE(1178),
-    [sym_in_expr] = STATE(1178),
-    [sym_comp_term] = STATE(1178),
-    [sym_instance_of] = STATE(1178),
-    [sym_negation] = STATE(1178),
-    [sym_if_term] = STATE(1178),
-    [sym_conjunction] = STATE(1178),
-    [sym_disjunction] = STATE(1178),
-    [sym_implication] = STATE(1178),
-    [sym_quantified] = STATE(1178),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1178),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [199] = {
+    [sym_special_call] = STATE(1122),
+    [sym_prefix_cast] = STATE(1122),
+    [sym_unary_expr] = STATE(1122),
+    [sym_mul_expr] = STATE(1122),
+    [sym_add_expr] = STATE(1122),
+    [sym_in_expr] = STATE(1122),
+    [sym_comp_term] = STATE(1122),
+    [sym_instance_of] = STATE(1122),
+    [sym_negation] = STATE(1122),
+    [sym_if_term] = STATE(1122),
+    [sym_conjunction] = STATE(1122),
+    [sym_disjunction] = STATE(1122),
+    [sym_implication] = STATE(1122),
+    [sym_quantified] = STATE(1122),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1122),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1753),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -21004,7 +21696,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -21016,51 +21708,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [194] = {
-    [sym_special_call] = STATE(928),
-    [sym_prefix_cast] = STATE(928),
-    [sym_unary_expr] = STATE(928),
-    [sym_mul_expr] = STATE(928),
-    [sym_add_expr] = STATE(928),
-    [sym_in_expr] = STATE(928),
-    [sym_comp_term] = STATE(928),
-    [sym_instance_of] = STATE(928),
-    [sym_negation] = STATE(928),
-    [sym_if_term] = STATE(928),
-    [sym_conjunction] = STATE(928),
-    [sym_disjunction] = STATE(928),
-    [sym_implication] = STATE(928),
-    [sym_quantified] = STATE(928),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(928),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [200] = {
+    [sym_special_call] = STATE(868),
+    [sym_prefix_cast] = STATE(868),
+    [sym_unary_expr] = STATE(868),
+    [sym_mul_expr] = STATE(868),
+    [sym_add_expr] = STATE(868),
+    [sym_in_expr] = STATE(868),
+    [sym_comp_term] = STATE(868),
+    [sym_instance_of] = STATE(868),
+    [sym_negation] = STATE(868),
+    [sym_if_term] = STATE(868),
+    [sym_conjunction] = STATE(868),
+    [sym_disjunction] = STATE(868),
+    [sym_implication] = STATE(868),
+    [sym_quantified] = STATE(868),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(868),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -21086,7 +21779,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -21098,51 +21791,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [195] = {
-    [sym_special_call] = STATE(1176),
-    [sym_prefix_cast] = STATE(1176),
-    [sym_unary_expr] = STATE(1176),
-    [sym_mul_expr] = STATE(1176),
-    [sym_add_expr] = STATE(1176),
-    [sym_in_expr] = STATE(1176),
-    [sym_comp_term] = STATE(1176),
-    [sym_instance_of] = STATE(1176),
-    [sym_negation] = STATE(1176),
-    [sym_if_term] = STATE(1176),
-    [sym_conjunction] = STATE(1176),
-    [sym_disjunction] = STATE(1176),
-    [sym_implication] = STATE(1176),
-    [sym_quantified] = STATE(1176),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1176),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [201] = {
+    [sym_special_call] = STATE(1061),
+    [sym_prefix_cast] = STATE(1061),
+    [sym_unary_expr] = STATE(1061),
+    [sym_mul_expr] = STATE(1061),
+    [sym_add_expr] = STATE(1061),
+    [sym_in_expr] = STATE(1061),
+    [sym_comp_term] = STATE(1061),
+    [sym_instance_of] = STATE(1061),
+    [sym_negation] = STATE(1061),
+    [sym_if_term] = STATE(1061),
+    [sym_conjunction] = STATE(1061),
+    [sym_disjunction] = STATE(1061),
+    [sym_implication] = STATE(1061),
+    [sym_quantified] = STATE(1061),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1061),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -21168,7 +21862,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -21180,51 +21874,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [196] = {
-    [sym_special_call] = STATE(1161),
-    [sym_prefix_cast] = STATE(1161),
-    [sym_unary_expr] = STATE(1161),
-    [sym_mul_expr] = STATE(1161),
-    [sym_add_expr] = STATE(1161),
-    [sym_in_expr] = STATE(1161),
-    [sym_comp_term] = STATE(1161),
-    [sym_instance_of] = STATE(1161),
-    [sym_negation] = STATE(1161),
-    [sym_if_term] = STATE(1161),
-    [sym_conjunction] = STATE(1161),
-    [sym_disjunction] = STATE(1161),
-    [sym_implication] = STATE(1161),
-    [sym_quantified] = STATE(1161),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1161),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [202] = {
+    [sym_special_call] = STATE(1060),
+    [sym_prefix_cast] = STATE(1060),
+    [sym_unary_expr] = STATE(1060),
+    [sym_mul_expr] = STATE(1060),
+    [sym_add_expr] = STATE(1060),
+    [sym_in_expr] = STATE(1060),
+    [sym_comp_term] = STATE(1060),
+    [sym_instance_of] = STATE(1060),
+    [sym_negation] = STATE(1060),
+    [sym_if_term] = STATE(1060),
+    [sym_conjunction] = STATE(1060),
+    [sym_disjunction] = STATE(1060),
+    [sym_implication] = STATE(1060),
+    [sym_quantified] = STATE(1060),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1060),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -21250,7 +21945,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -21262,47 +21957,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [197] = {
-    [sym_special_call] = STATE(1086),
-    [sym_prefix_cast] = STATE(1086),
-    [sym_unary_expr] = STATE(1086),
-    [sym_mul_expr] = STATE(1086),
-    [sym_add_expr] = STATE(1086),
-    [sym_in_expr] = STATE(1086),
-    [sym_comp_term] = STATE(1086),
-    [sym_instance_of] = STATE(1086),
-    [sym_negation] = STATE(1086),
-    [sym_if_term] = STATE(1086),
-    [sym_conjunction] = STATE(1086),
-    [sym_disjunction] = STATE(1086),
-    [sym_implication] = STATE(1086),
-    [sym_quantified] = STATE(1086),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1086),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [203] = {
+    [sym_special_call] = STATE(1025),
+    [sym_prefix_cast] = STATE(1025),
+    [sym_unary_expr] = STATE(1025),
+    [sym_mul_expr] = STATE(1025),
+    [sym_add_expr] = STATE(1025),
+    [sym_in_expr] = STATE(1025),
+    [sym_comp_term] = STATE(1025),
+    [sym_instance_of] = STATE(1025),
+    [sym_negation] = STATE(1025),
+    [sym_if_term] = STATE(1025),
+    [sym_conjunction] = STATE(1025),
+    [sym_disjunction] = STATE(1025),
+    [sym_implication] = STATE(1025),
+    [sym_quantified] = STATE(1025),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1025),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -21344,47 +22040,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [198] = {
-    [sym_special_call] = STATE(1174),
-    [sym_prefix_cast] = STATE(1174),
-    [sym_unary_expr] = STATE(1174),
-    [sym_mul_expr] = STATE(1174),
-    [sym_add_expr] = STATE(1174),
-    [sym_in_expr] = STATE(1174),
-    [sym_comp_term] = STATE(1174),
-    [sym_instance_of] = STATE(1174),
-    [sym_negation] = STATE(1174),
-    [sym_if_term] = STATE(1174),
-    [sym_conjunction] = STATE(1174),
-    [sym_disjunction] = STATE(1174),
-    [sym_implication] = STATE(1174),
-    [sym_quantified] = STATE(1174),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1174),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [204] = {
+    [sym_special_call] = STATE(1036),
+    [sym_prefix_cast] = STATE(1036),
+    [sym_unary_expr] = STATE(1036),
+    [sym_mul_expr] = STATE(1036),
+    [sym_add_expr] = STATE(1036),
+    [sym_in_expr] = STATE(1036),
+    [sym_comp_term] = STATE(1036),
+    [sym_instance_of] = STATE(1036),
+    [sym_negation] = STATE(1036),
+    [sym_if_term] = STATE(1036),
+    [sym_conjunction] = STATE(1036),
+    [sym_disjunction] = STATE(1036),
+    [sym_implication] = STATE(1036),
+    [sym_quantified] = STATE(1036),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1036),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -21426,56 +22123,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [199] = {
-    [sym_special_call] = STATE(388),
-    [sym_prefix_cast] = STATE(388),
-    [sym_unary_expr] = STATE(388),
-    [sym_mul_expr] = STATE(388),
-    [sym_add_expr] = STATE(388),
-    [sym_in_expr] = STATE(388),
-    [sym_comp_term] = STATE(388),
-    [sym_instance_of] = STATE(388),
-    [sym_negation] = STATE(388),
-    [sym_if_term] = STATE(388),
-    [sym_conjunction] = STATE(388),
-    [sym_disjunction] = STATE(388),
-    [sym_implication] = STATE(388),
-    [sym_quantified] = STATE(388),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(388),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [205] = {
+    [sym_special_call] = STATE(1044),
+    [sym_prefix_cast] = STATE(1044),
+    [sym_unary_expr] = STATE(1044),
+    [sym_mul_expr] = STATE(1044),
+    [sym_add_expr] = STATE(1044),
+    [sym_in_expr] = STATE(1044),
+    [sym_comp_term] = STATE(1044),
+    [sym_instance_of] = STATE(1044),
+    [sym_negation] = STATE(1044),
+    [sym_if_term] = STATE(1044),
+    [sym_conjunction] = STATE(1044),
+    [sym_disjunction] = STATE(1044),
+    [sym_implication] = STATE(1044),
+    [sym_quantified] = STATE(1044),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1044),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -21496,59 +22194,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [200] = {
-    [sym_special_call] = STATE(1179),
-    [sym_prefix_cast] = STATE(1179),
-    [sym_unary_expr] = STATE(1179),
-    [sym_mul_expr] = STATE(1179),
-    [sym_add_expr] = STATE(1179),
-    [sym_in_expr] = STATE(1179),
-    [sym_comp_term] = STATE(1179),
-    [sym_instance_of] = STATE(1179),
-    [sym_negation] = STATE(1179),
-    [sym_if_term] = STATE(1179),
-    [sym_conjunction] = STATE(1179),
-    [sym_disjunction] = STATE(1179),
-    [sym_implication] = STATE(1179),
-    [sym_quantified] = STATE(1179),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1179),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [206] = {
+    [sym_special_call] = STATE(1057),
+    [sym_prefix_cast] = STATE(1057),
+    [sym_unary_expr] = STATE(1057),
+    [sym_mul_expr] = STATE(1057),
+    [sym_add_expr] = STATE(1057),
+    [sym_in_expr] = STATE(1057),
+    [sym_comp_term] = STATE(1057),
+    [sym_instance_of] = STATE(1057),
+    [sym_negation] = STATE(1057),
+    [sym_if_term] = STATE(1057),
+    [sym_conjunction] = STATE(1057),
+    [sym_disjunction] = STATE(1057),
+    [sym_implication] = STATE(1057),
+    [sym_quantified] = STATE(1057),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1057),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -21590,138 +22289,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [201] = {
-    [sym_special_call] = STATE(398),
-    [sym_prefix_cast] = STATE(398),
-    [sym_unary_expr] = STATE(398),
-    [sym_mul_expr] = STATE(398),
-    [sym_add_expr] = STATE(398),
-    [sym_in_expr] = STATE(398),
-    [sym_comp_term] = STATE(398),
-    [sym_instance_of] = STATE(398),
-    [sym_negation] = STATE(398),
-    [sym_if_term] = STATE(398),
-    [sym_conjunction] = STATE(398),
-    [sym_disjunction] = STATE(398),
-    [sym_implication] = STATE(398),
-    [sym_quantified] = STATE(398),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(398),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
-  },
-  [202] = {
-    [sym_special_call] = STATE(392),
-    [sym_prefix_cast] = STATE(392),
-    [sym_unary_expr] = STATE(392),
-    [sym_mul_expr] = STATE(392),
-    [sym_add_expr] = STATE(392),
-    [sym_in_expr] = STATE(392),
-    [sym_comp_term] = STATE(392),
-    [sym_instance_of] = STATE(392),
-    [sym_negation] = STATE(392),
-    [sym_if_term] = STATE(392),
-    [sym_conjunction] = STATE(392),
-    [sym_disjunction] = STATE(392),
-    [sym_implication] = STATE(392),
-    [sym_quantified] = STATE(392),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(392),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [207] = {
+    [sym_special_call] = STATE(1040),
+    [sym_prefix_cast] = STATE(1040),
+    [sym_unary_expr] = STATE(1040),
+    [sym_mul_expr] = STATE(1040),
+    [sym_add_expr] = STATE(1040),
+    [sym_in_expr] = STATE(1040),
+    [sym_comp_term] = STATE(1040),
+    [sym_instance_of] = STATE(1040),
+    [sym_negation] = STATE(1040),
+    [sym_if_term] = STATE(1040),
+    [sym_conjunction] = STATE(1040),
+    [sym_disjunction] = STATE(1040),
+    [sym_implication] = STATE(1040),
+    [sym_quantified] = STATE(1040),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1040),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -21742,59 +22360,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [203] = {
-    [sym_special_call] = STATE(945),
-    [sym_prefix_cast] = STATE(945),
-    [sym_unary_expr] = STATE(945),
-    [sym_mul_expr] = STATE(945),
-    [sym_add_expr] = STATE(945),
-    [sym_in_expr] = STATE(945),
-    [sym_comp_term] = STATE(945),
-    [sym_instance_of] = STATE(945),
-    [sym_negation] = STATE(945),
-    [sym_if_term] = STATE(945),
-    [sym_conjunction] = STATE(945),
-    [sym_disjunction] = STATE(945),
-    [sym_implication] = STATE(945),
-    [sym_quantified] = STATE(945),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(945),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [208] = {
+    [sym_special_call] = STATE(1101),
+    [sym_prefix_cast] = STATE(1101),
+    [sym_unary_expr] = STATE(1101),
+    [sym_mul_expr] = STATE(1101),
+    [sym_add_expr] = STATE(1101),
+    [sym_in_expr] = STATE(1101),
+    [sym_comp_term] = STATE(1101),
+    [sym_instance_of] = STATE(1101),
+    [sym_negation] = STATE(1101),
+    [sym_if_term] = STATE(1101),
+    [sym_conjunction] = STATE(1101),
+    [sym_disjunction] = STATE(1101),
+    [sym_implication] = STATE(1101),
+    [sym_quantified] = STATE(1101),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1101),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -21836,51 +22455,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [204] = {
-    [sym_special_call] = STATE(1147),
-    [sym_prefix_cast] = STATE(1147),
-    [sym_unary_expr] = STATE(1147),
-    [sym_mul_expr] = STATE(1147),
-    [sym_add_expr] = STATE(1147),
-    [sym_in_expr] = STATE(1147),
-    [sym_comp_term] = STATE(1147),
-    [sym_instance_of] = STATE(1147),
-    [sym_negation] = STATE(1147),
-    [sym_if_term] = STATE(1147),
-    [sym_conjunction] = STATE(1147),
-    [sym_disjunction] = STATE(1147),
-    [sym_implication] = STATE(1147),
-    [sym_quantified] = STATE(1147),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1147),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [209] = {
+    [sym_special_call] = STATE(798),
+    [sym_prefix_cast] = STATE(798),
+    [sym_unary_expr] = STATE(798),
+    [sym_mul_expr] = STATE(798),
+    [sym_add_expr] = STATE(798),
+    [sym_in_expr] = STATE(798),
+    [sym_comp_term] = STATE(798),
+    [sym_instance_of] = STATE(798),
+    [sym_negation] = STATE(798),
+    [sym_if_term] = STATE(798),
+    [sym_conjunction] = STATE(798),
+    [sym_disjunction] = STATE(798),
+    [sym_implication] = STATE(798),
+    [sym_quantified] = STATE(798),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(798),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -21906,7 +22526,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -21918,51 +22538,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [205] = {
-    [sym_special_call] = STATE(869),
-    [sym_prefix_cast] = STATE(869),
-    [sym_unary_expr] = STATE(869),
-    [sym_mul_expr] = STATE(869),
-    [sym_add_expr] = STATE(869),
-    [sym_in_expr] = STATE(869),
-    [sym_comp_term] = STATE(869),
-    [sym_instance_of] = STATE(869),
-    [sym_negation] = STATE(869),
-    [sym_if_term] = STATE(869),
-    [sym_conjunction] = STATE(869),
-    [sym_disjunction] = STATE(869),
-    [sym_implication] = STATE(869),
-    [sym_quantified] = STATE(869),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(869),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [210] = {
+    [sym_special_call] = STATE(804),
+    [sym_prefix_cast] = STATE(804),
+    [sym_unary_expr] = STATE(804),
+    [sym_mul_expr] = STATE(804),
+    [sym_add_expr] = STATE(804),
+    [sym_in_expr] = STATE(804),
+    [sym_comp_term] = STATE(804),
+    [sym_instance_of] = STATE(804),
+    [sym_negation] = STATE(804),
+    [sym_if_term] = STATE(804),
+    [sym_conjunction] = STATE(804),
+    [sym_disjunction] = STATE(804),
+    [sym_implication] = STATE(804),
+    [sym_quantified] = STATE(804),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(804),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -21988,7 +22609,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -22000,51 +22621,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [206] = {
-    [sym_special_call] = STATE(1068),
-    [sym_prefix_cast] = STATE(1068),
-    [sym_unary_expr] = STATE(1068),
-    [sym_mul_expr] = STATE(1068),
-    [sym_add_expr] = STATE(1068),
-    [sym_in_expr] = STATE(1068),
-    [sym_comp_term] = STATE(1068),
-    [sym_instance_of] = STATE(1068),
-    [sym_negation] = STATE(1068),
-    [sym_if_term] = STATE(1068),
-    [sym_conjunction] = STATE(1068),
-    [sym_disjunction] = STATE(1068),
-    [sym_implication] = STATE(1068),
-    [sym_quantified] = STATE(1068),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1068),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [211] = {
+    [sym_special_call] = STATE(805),
+    [sym_prefix_cast] = STATE(805),
+    [sym_unary_expr] = STATE(805),
+    [sym_mul_expr] = STATE(805),
+    [sym_add_expr] = STATE(805),
+    [sym_in_expr] = STATE(805),
+    [sym_comp_term] = STATE(805),
+    [sym_instance_of] = STATE(805),
+    [sym_negation] = STATE(805),
+    [sym_if_term] = STATE(805),
+    [sym_conjunction] = STATE(805),
+    [sym_disjunction] = STATE(805),
+    [sym_implication] = STATE(805),
+    [sym_quantified] = STATE(805),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(805),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -22070,7 +22692,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -22082,56 +22704,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [207] = {
-    [sym_special_call] = STATE(401),
-    [sym_prefix_cast] = STATE(401),
-    [sym_unary_expr] = STATE(401),
-    [sym_mul_expr] = STATE(401),
-    [sym_add_expr] = STATE(401),
-    [sym_in_expr] = STATE(401),
-    [sym_comp_term] = STATE(401),
-    [sym_instance_of] = STATE(401),
-    [sym_negation] = STATE(401),
-    [sym_if_term] = STATE(401),
-    [sym_conjunction] = STATE(401),
-    [sym_disjunction] = STATE(401),
-    [sym_implication] = STATE(401),
-    [sym_quantified] = STATE(401),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(401),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [212] = {
+    [sym_special_call] = STATE(807),
+    [sym_prefix_cast] = STATE(807),
+    [sym_unary_expr] = STATE(807),
+    [sym_mul_expr] = STATE(807),
+    [sym_add_expr] = STATE(807),
+    [sym_in_expr] = STATE(807),
+    [sym_comp_term] = STATE(807),
+    [sym_instance_of] = STATE(807),
+    [sym_negation] = STATE(807),
+    [sym_if_term] = STATE(807),
+    [sym_conjunction] = STATE(807),
+    [sym_disjunction] = STATE(807),
+    [sym_implication] = STATE(807),
+    [sym_quantified] = STATE(807),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(807),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -22152,68 +22775,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [208] = {
-    [sym_special_call] = STATE(418),
-    [sym_prefix_cast] = STATE(418),
-    [sym_unary_expr] = STATE(418),
-    [sym_mul_expr] = STATE(418),
-    [sym_add_expr] = STATE(418),
-    [sym_in_expr] = STATE(418),
-    [sym_comp_term] = STATE(418),
-    [sym_instance_of] = STATE(418),
-    [sym_negation] = STATE(418),
-    [sym_if_term] = STATE(418),
-    [sym_conjunction] = STATE(418),
-    [sym_disjunction] = STATE(418),
-    [sym_implication] = STATE(418),
-    [sym_quantified] = STATE(418),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(418),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [213] = {
+    [sym_special_call] = STATE(837),
+    [sym_prefix_cast] = STATE(837),
+    [sym_unary_expr] = STATE(837),
+    [sym_mul_expr] = STATE(837),
+    [sym_add_expr] = STATE(837),
+    [sym_in_expr] = STATE(837),
+    [sym_comp_term] = STATE(837),
+    [sym_instance_of] = STATE(837),
+    [sym_negation] = STATE(837),
+    [sym_if_term] = STATE(837),
+    [sym_conjunction] = STATE(837),
+    [sym_disjunction] = STATE(837),
+    [sym_implication] = STATE(837),
+    [sym_quantified] = STATE(837),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(837),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -22234,68 +22858,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [209] = {
-    [sym_special_call] = STATE(377),
-    [sym_prefix_cast] = STATE(377),
-    [sym_unary_expr] = STATE(377),
-    [sym_mul_expr] = STATE(377),
-    [sym_add_expr] = STATE(377),
-    [sym_in_expr] = STATE(377),
-    [sym_comp_term] = STATE(377),
-    [sym_instance_of] = STATE(377),
-    [sym_negation] = STATE(377),
-    [sym_if_term] = STATE(377),
-    [sym_conjunction] = STATE(377),
-    [sym_disjunction] = STATE(377),
-    [sym_implication] = STATE(377),
-    [sym_quantified] = STATE(377),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(377),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
+  [214] = {
+    [sym_special_call] = STATE(861),
+    [sym_prefix_cast] = STATE(861),
+    [sym_unary_expr] = STATE(861),
+    [sym_mul_expr] = STATE(861),
+    [sym_add_expr] = STATE(861),
+    [sym_in_expr] = STATE(861),
+    [sym_comp_term] = STATE(861),
+    [sym_instance_of] = STATE(861),
+    [sym_negation] = STATE(861),
+    [sym_if_term] = STATE(861),
+    [sym_conjunction] = STATE(861),
+    [sym_disjunction] = STATE(861),
+    [sym_implication] = STATE(861),
+    [sym_quantified] = STATE(861),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(861),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(285),
     [anon_sym_not] = ACTIONS(287),
     [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -22316,68 +22941,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [210] = {
-    [sym_special_call] = STATE(383),
-    [sym_prefix_cast] = STATE(383),
-    [sym_unary_expr] = STATE(383),
-    [sym_mul_expr] = STATE(383),
-    [sym_add_expr] = STATE(383),
-    [sym_in_expr] = STATE(383),
-    [sym_comp_term] = STATE(383),
-    [sym_instance_of] = STATE(383),
-    [sym_negation] = STATE(383),
-    [sym_if_term] = STATE(383),
-    [sym_conjunction] = STATE(383),
-    [sym_disjunction] = STATE(383),
-    [sym_implication] = STATE(383),
-    [sym_quantified] = STATE(383),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(383),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [215] = {
+    [sym_special_call] = STATE(1051),
+    [sym_prefix_cast] = STATE(1051),
+    [sym_unary_expr] = STATE(1051),
+    [sym_mul_expr] = STATE(1051),
+    [sym_add_expr] = STATE(1051),
+    [sym_in_expr] = STATE(1051),
+    [sym_comp_term] = STATE(1051),
+    [sym_instance_of] = STATE(1051),
+    [sym_negation] = STATE(1051),
+    [sym_if_term] = STATE(1051),
+    [sym_conjunction] = STATE(1051),
+    [sym_disjunction] = STATE(1051),
+    [sym_implication] = STATE(1051),
+    [sym_quantified] = STATE(1051),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1051),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -22398,63 +23024,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [211] = {
-    [sym_special_call] = STATE(1163),
-    [sym_prefix_cast] = STATE(1163),
-    [sym_unary_expr] = STATE(1163),
-    [sym_mul_expr] = STATE(1163),
-    [sym_add_expr] = STATE(1163),
-    [sym_in_expr] = STATE(1163),
-    [sym_comp_term] = STATE(1163),
-    [sym_instance_of] = STATE(1163),
-    [sym_negation] = STATE(1163),
-    [sym_if_term] = STATE(1163),
-    [sym_conjunction] = STATE(1163),
-    [sym_disjunction] = STATE(1163),
-    [sym_implication] = STATE(1163),
-    [sym_quantified] = STATE(1163),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1163),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [216] = {
+    [sym_special_call] = STATE(810),
+    [sym_prefix_cast] = STATE(810),
+    [sym_unary_expr] = STATE(810),
+    [sym_mul_expr] = STATE(810),
+    [sym_add_expr] = STATE(810),
+    [sym_in_expr] = STATE(810),
+    [sym_comp_term] = STATE(810),
+    [sym_instance_of] = STATE(810),
+    [sym_negation] = STATE(810),
+    [sym_if_term] = STATE(810),
+    [sym_conjunction] = STATE(810),
+    [sym_disjunction] = STATE(810),
+    [sym_implication] = STATE(810),
+    [sym_quantified] = STATE(810),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(810),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -22480,7 +23107,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -22492,56 +23119,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [212] = {
-    [sym_special_call] = STATE(415),
-    [sym_prefix_cast] = STATE(415),
-    [sym_unary_expr] = STATE(415),
-    [sym_mul_expr] = STATE(415),
-    [sym_add_expr] = STATE(415),
-    [sym_in_expr] = STATE(415),
-    [sym_comp_term] = STATE(415),
-    [sym_instance_of] = STATE(415),
-    [sym_negation] = STATE(415),
-    [sym_if_term] = STATE(415),
-    [sym_conjunction] = STATE(415),
-    [sym_disjunction] = STATE(415),
-    [sym_implication] = STATE(415),
-    [sym_quantified] = STATE(415),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(415),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
+  [217] = {
+    [sym_special_call] = STATE(1052),
+    [sym_prefix_cast] = STATE(1052),
+    [sym_unary_expr] = STATE(1052),
+    [sym_mul_expr] = STATE(1052),
+    [sym_add_expr] = STATE(1052),
+    [sym_in_expr] = STATE(1052),
+    [sym_comp_term] = STATE(1052),
+    [sym_instance_of] = STATE(1052),
+    [sym_negation] = STATE(1052),
+    [sym_if_term] = STATE(1052),
+    [sym_conjunction] = STATE(1052),
+    [sym_disjunction] = STATE(1052),
+    [sym_implication] = STATE(1052),
+    [sym_quantified] = STATE(1052),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1052),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -22562,59 +23190,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [213] = {
-    [sym_special_call] = STATE(1138),
-    [sym_prefix_cast] = STATE(1138),
-    [sym_unary_expr] = STATE(1138),
-    [sym_mul_expr] = STATE(1138),
-    [sym_add_expr] = STATE(1138),
-    [sym_in_expr] = STATE(1138),
-    [sym_comp_term] = STATE(1138),
-    [sym_instance_of] = STATE(1138),
-    [sym_negation] = STATE(1138),
-    [sym_if_term] = STATE(1138),
-    [sym_conjunction] = STATE(1138),
-    [sym_disjunction] = STATE(1138),
-    [sym_implication] = STATE(1138),
-    [sym_quantified] = STATE(1138),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1138),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [218] = {
+    [sym_special_call] = STATE(1078),
+    [sym_prefix_cast] = STATE(1078),
+    [sym_unary_expr] = STATE(1078),
+    [sym_mul_expr] = STATE(1078),
+    [sym_add_expr] = STATE(1078),
+    [sym_in_expr] = STATE(1078),
+    [sym_comp_term] = STATE(1078),
+    [sym_instance_of] = STATE(1078),
+    [sym_negation] = STATE(1078),
+    [sym_if_term] = STATE(1078),
+    [sym_conjunction] = STATE(1078),
+    [sym_disjunction] = STATE(1078),
+    [sym_implication] = STATE(1078),
+    [sym_quantified] = STATE(1078),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1078),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1770),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -22644,7 +23273,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -22656,51 +23285,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [214] = {
-    [sym_special_call] = STATE(1001),
-    [sym_prefix_cast] = STATE(1001),
-    [sym_unary_expr] = STATE(1001),
-    [sym_mul_expr] = STATE(1001),
-    [sym_add_expr] = STATE(1001),
-    [sym_in_expr] = STATE(1001),
-    [sym_comp_term] = STATE(1001),
-    [sym_instance_of] = STATE(1001),
-    [sym_negation] = STATE(1001),
-    [sym_if_term] = STATE(1001),
-    [sym_conjunction] = STATE(1001),
-    [sym_disjunction] = STATE(1001),
-    [sym_implication] = STATE(1001),
-    [sym_quantified] = STATE(1001),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1001),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [219] = {
+    [sym_special_call] = STATE(1109),
+    [sym_prefix_cast] = STATE(1109),
+    [sym_unary_expr] = STATE(1109),
+    [sym_mul_expr] = STATE(1109),
+    [sym_add_expr] = STATE(1109),
+    [sym_in_expr] = STATE(1109),
+    [sym_comp_term] = STATE(1109),
+    [sym_instance_of] = STATE(1109),
+    [sym_negation] = STATE(1109),
+    [sym_if_term] = STATE(1109),
+    [sym_conjunction] = STATE(1109),
+    [sym_disjunction] = STATE(1109),
+    [sym_implication] = STATE(1109),
+    [sym_quantified] = STATE(1109),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1109),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -22726,7 +23356,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -22738,51 +23368,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [215] = {
-    [sym_special_call] = STATE(1175),
-    [sym_prefix_cast] = STATE(1175),
-    [sym_unary_expr] = STATE(1175),
-    [sym_mul_expr] = STATE(1175),
-    [sym_add_expr] = STATE(1175),
-    [sym_in_expr] = STATE(1175),
-    [sym_comp_term] = STATE(1175),
-    [sym_instance_of] = STATE(1175),
-    [sym_negation] = STATE(1175),
-    [sym_if_term] = STATE(1175),
-    [sym_conjunction] = STATE(1175),
-    [sym_disjunction] = STATE(1175),
-    [sym_implication] = STATE(1175),
-    [sym_quantified] = STATE(1175),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1175),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [220] = {
+    [sym_special_call] = STATE(1110),
+    [sym_prefix_cast] = STATE(1110),
+    [sym_unary_expr] = STATE(1110),
+    [sym_mul_expr] = STATE(1110),
+    [sym_add_expr] = STATE(1110),
+    [sym_in_expr] = STATE(1110),
+    [sym_comp_term] = STATE(1110),
+    [sym_instance_of] = STATE(1110),
+    [sym_negation] = STATE(1110),
+    [sym_if_term] = STATE(1110),
+    [sym_conjunction] = STATE(1110),
+    [sym_disjunction] = STATE(1110),
+    [sym_implication] = STATE(1110),
+    [sym_quantified] = STATE(1110),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1110),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -22808,7 +23439,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -22820,47 +23451,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [216] = {
-    [sym_special_call] = STATE(1137),
-    [sym_prefix_cast] = STATE(1137),
-    [sym_unary_expr] = STATE(1137),
-    [sym_mul_expr] = STATE(1137),
-    [sym_add_expr] = STATE(1137),
-    [sym_in_expr] = STATE(1137),
-    [sym_comp_term] = STATE(1137),
-    [sym_instance_of] = STATE(1137),
-    [sym_negation] = STATE(1137),
-    [sym_if_term] = STATE(1137),
-    [sym_conjunction] = STATE(1137),
-    [sym_disjunction] = STATE(1137),
-    [sym_implication] = STATE(1137),
-    [sym_quantified] = STATE(1137),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1137),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [221] = {
+    [sym_special_call] = STATE(1006),
+    [sym_prefix_cast] = STATE(1006),
+    [sym_unary_expr] = STATE(1006),
+    [sym_mul_expr] = STATE(1006),
+    [sym_add_expr] = STATE(1006),
+    [sym_in_expr] = STATE(1006),
+    [sym_comp_term] = STATE(1006),
+    [sym_instance_of] = STATE(1006),
+    [sym_negation] = STATE(1006),
+    [sym_if_term] = STATE(1006),
+    [sym_conjunction] = STATE(1006),
+    [sym_disjunction] = STATE(1006),
+    [sym_implication] = STATE(1006),
+    [sym_quantified] = STATE(1006),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1006),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -22902,47 +23534,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [217] = {
-    [sym_special_call] = STATE(990),
-    [sym_prefix_cast] = STATE(990),
-    [sym_unary_expr] = STATE(990),
-    [sym_mul_expr] = STATE(990),
-    [sym_add_expr] = STATE(990),
-    [sym_in_expr] = STATE(990),
-    [sym_comp_term] = STATE(990),
-    [sym_instance_of] = STATE(990),
-    [sym_negation] = STATE(990),
-    [sym_if_term] = STATE(990),
-    [sym_conjunction] = STATE(990),
-    [sym_disjunction] = STATE(990),
-    [sym_implication] = STATE(990),
-    [sym_quantified] = STATE(990),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(990),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [222] = {
+    [sym_special_call] = STATE(995),
+    [sym_prefix_cast] = STATE(995),
+    [sym_unary_expr] = STATE(995),
+    [sym_mul_expr] = STATE(995),
+    [sym_add_expr] = STATE(995),
+    [sym_in_expr] = STATE(995),
+    [sym_comp_term] = STATE(995),
+    [sym_instance_of] = STATE(995),
+    [sym_negation] = STATE(995),
+    [sym_if_term] = STATE(995),
+    [sym_conjunction] = STATE(995),
+    [sym_disjunction] = STATE(995),
+    [sym_implication] = STATE(995),
+    [sym_quantified] = STATE(995),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(995),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -22984,138 +23617,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [218] = {
-    [sym_special_call] = STATE(412),
-    [sym_prefix_cast] = STATE(412),
-    [sym_unary_expr] = STATE(412),
-    [sym_mul_expr] = STATE(412),
-    [sym_add_expr] = STATE(412),
-    [sym_in_expr] = STATE(412),
-    [sym_comp_term] = STATE(412),
-    [sym_instance_of] = STATE(412),
-    [sym_negation] = STATE(412),
-    [sym_if_term] = STATE(412),
-    [sym_conjunction] = STATE(412),
-    [sym_disjunction] = STATE(412),
-    [sym_implication] = STATE(412),
-    [sym_quantified] = STATE(412),
-    [sym_quantifier] = STATE(1906),
-    [sym_call_or_unqual_agg_expr] = STATE(490),
-    [sym_qualified_expr] = STATE(490),
-    [sym_super_ref] = STATE(490),
-    [sym_aggregate] = STATE(490),
-    [sym_range] = STATE(490),
-    [sym_set_literal] = STATE(490),
-    [sym_par_expr] = STATE(490),
-    [sym_expr_annotation] = STATE(490),
-    [sym__exprOrTerm] = STATE(412),
-    [sym__primary] = STATE(490),
-    [sym_literal] = STATE(490),
-    [sym_bool] = STATE(481),
-    [sym_variable] = STATE(490),
-    [sym_unop] = STATE(218),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2002),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(422),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1907),
-    [sym_aritylessPredicateExpr] = STATE(1470),
-    [sym_varName] = STATE(487),
-    [sym_aggId] = STATE(1777),
-    [sym__lower_id] = ACTIONS(515),
-    [anon_sym_LPAREN] = ACTIONS(517),
-    [anon_sym_not] = ACTIONS(519),
-    [anon_sym_if] = ACTIONS(521),
-    [sym_specialId] = ACTIONS(523),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(525),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(527),
-    [sym_integer] = ACTIONS(529),
-    [sym_float] = ACTIONS(531),
-    [sym_string] = ACTIONS(531),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(533),
-    [sym_result] = ACTIONS(535),
-    [sym_super] = ACTIONS(537),
-    [sym_this] = ACTIONS(535),
-    [sym_true] = ACTIONS(533),
-  },
-  [219] = {
-    [sym_special_call] = STATE(830),
-    [sym_prefix_cast] = STATE(830),
-    [sym_unary_expr] = STATE(830),
-    [sym_mul_expr] = STATE(830),
-    [sym_add_expr] = STATE(830),
-    [sym_in_expr] = STATE(830),
-    [sym_comp_term] = STATE(830),
-    [sym_instance_of] = STATE(830),
-    [sym_negation] = STATE(830),
-    [sym_if_term] = STATE(830),
-    [sym_conjunction] = STATE(830),
-    [sym_disjunction] = STATE(830),
-    [sym_implication] = STATE(830),
-    [sym_quantified] = STATE(830),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(830),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [223] = {
+    [sym_special_call] = STATE(1130),
+    [sym_prefix_cast] = STATE(1130),
+    [sym_unary_expr] = STATE(1130),
+    [sym_mul_expr] = STATE(1130),
+    [sym_add_expr] = STATE(1130),
+    [sym_in_expr] = STATE(1130),
+    [sym_comp_term] = STATE(1130),
+    [sym_instance_of] = STATE(1130),
+    [sym_negation] = STATE(1130),
+    [sym_if_term] = STATE(1130),
+    [sym_conjunction] = STATE(1130),
+    [sym_disjunction] = STATE(1130),
+    [sym_implication] = STATE(1130),
+    [sym_quantified] = STATE(1130),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1130),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -23136,68 +23688,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [220] = {
-    [sym_special_call] = STATE(829),
-    [sym_prefix_cast] = STATE(829),
-    [sym_unary_expr] = STATE(829),
-    [sym_mul_expr] = STATE(829),
-    [sym_add_expr] = STATE(829),
-    [sym_in_expr] = STATE(829),
-    [sym_comp_term] = STATE(829),
-    [sym_instance_of] = STATE(829),
-    [sym_negation] = STATE(829),
-    [sym_if_term] = STATE(829),
-    [sym_conjunction] = STATE(829),
-    [sym_disjunction] = STATE(829),
-    [sym_implication] = STATE(829),
-    [sym_quantified] = STATE(829),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(829),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [224] = {
+    [sym_special_call] = STATE(1078),
+    [sym_prefix_cast] = STATE(1078),
+    [sym_unary_expr] = STATE(1078),
+    [sym_mul_expr] = STATE(1078),
+    [sym_add_expr] = STATE(1078),
+    [sym_in_expr] = STATE(1078),
+    [sym_comp_term] = STATE(1078),
+    [sym_instance_of] = STATE(1078),
+    [sym_negation] = STATE(1078),
+    [sym_if_term] = STATE(1078),
+    [sym_conjunction] = STATE(1078),
+    [sym_disjunction] = STATE(1078),
+    [sym_implication] = STATE(1078),
+    [sym_quantified] = STATE(1078),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1078),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -23218,59 +23771,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [221] = {
-    [sym_special_call] = STATE(996),
-    [sym_prefix_cast] = STATE(996),
-    [sym_unary_expr] = STATE(996),
-    [sym_mul_expr] = STATE(996),
-    [sym_add_expr] = STATE(996),
-    [sym_in_expr] = STATE(996),
-    [sym_comp_term] = STATE(996),
-    [sym_instance_of] = STATE(996),
-    [sym_negation] = STATE(996),
-    [sym_if_term] = STATE(996),
-    [sym_conjunction] = STATE(996),
-    [sym_disjunction] = STATE(996),
-    [sym_implication] = STATE(996),
-    [sym_quantified] = STATE(996),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(996),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [225] = {
+    [sym_special_call] = STATE(990),
+    [sym_prefix_cast] = STATE(990),
+    [sym_unary_expr] = STATE(990),
+    [sym_mul_expr] = STATE(990),
+    [sym_add_expr] = STATE(990),
+    [sym_in_expr] = STATE(990),
+    [sym_comp_term] = STATE(990),
+    [sym_instance_of] = STATE(990),
+    [sym_negation] = STATE(990),
+    [sym_if_term] = STATE(990),
+    [sym_conjunction] = STATE(990),
+    [sym_disjunction] = STATE(990),
+    [sym_implication] = STATE(990),
+    [sym_quantified] = STATE(990),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(990),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -23312,51 +23866,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [222] = {
-    [sym_special_call] = STATE(1098),
-    [sym_prefix_cast] = STATE(1098),
-    [sym_unary_expr] = STATE(1098),
-    [sym_mul_expr] = STATE(1098),
-    [sym_add_expr] = STATE(1098),
-    [sym_in_expr] = STATE(1098),
-    [sym_comp_term] = STATE(1098),
-    [sym_instance_of] = STATE(1098),
-    [sym_negation] = STATE(1098),
-    [sym_if_term] = STATE(1098),
-    [sym_conjunction] = STATE(1098),
-    [sym_disjunction] = STATE(1098),
-    [sym_implication] = STATE(1098),
-    [sym_quantified] = STATE(1098),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1098),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [226] = {
+    [sym_special_call] = STATE(1139),
+    [sym_prefix_cast] = STATE(1139),
+    [sym_unary_expr] = STATE(1139),
+    [sym_mul_expr] = STATE(1139),
+    [sym_add_expr] = STATE(1139),
+    [sym_in_expr] = STATE(1139),
+    [sym_comp_term] = STATE(1139),
+    [sym_instance_of] = STATE(1139),
+    [sym_negation] = STATE(1139),
+    [sym_if_term] = STATE(1139),
+    [sym_conjunction] = STATE(1139),
+    [sym_disjunction] = STATE(1139),
+    [sym_implication] = STATE(1139),
+    [sym_quantified] = STATE(1139),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1139),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -23382,7 +23937,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -23394,56 +23949,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [223] = {
-    [sym_special_call] = STATE(828),
-    [sym_prefix_cast] = STATE(828),
-    [sym_unary_expr] = STATE(828),
-    [sym_mul_expr] = STATE(828),
-    [sym_add_expr] = STATE(828),
-    [sym_in_expr] = STATE(828),
-    [sym_comp_term] = STATE(828),
-    [sym_instance_of] = STATE(828),
-    [sym_negation] = STATE(828),
-    [sym_if_term] = STATE(828),
-    [sym_conjunction] = STATE(828),
-    [sym_disjunction] = STATE(828),
-    [sym_implication] = STATE(828),
-    [sym_quantified] = STATE(828),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(828),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [227] = {
+    [sym_special_call] = STATE(1142),
+    [sym_prefix_cast] = STATE(1142),
+    [sym_unary_expr] = STATE(1142),
+    [sym_mul_expr] = STATE(1142),
+    [sym_add_expr] = STATE(1142),
+    [sym_in_expr] = STATE(1142),
+    [sym_comp_term] = STATE(1142),
+    [sym_instance_of] = STATE(1142),
+    [sym_negation] = STATE(1142),
+    [sym_if_term] = STATE(1142),
+    [sym_conjunction] = STATE(1142),
+    [sym_disjunction] = STATE(1142),
+    [sym_implication] = STATE(1142),
+    [sym_quantified] = STATE(1142),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1142),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -23464,63 +24020,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [224] = {
-    [sym_special_call] = STATE(1096),
-    [sym_prefix_cast] = STATE(1096),
-    [sym_unary_expr] = STATE(1096),
-    [sym_mul_expr] = STATE(1096),
-    [sym_add_expr] = STATE(1096),
-    [sym_in_expr] = STATE(1096),
-    [sym_comp_term] = STATE(1096),
-    [sym_instance_of] = STATE(1096),
-    [sym_negation] = STATE(1096),
-    [sym_if_term] = STATE(1096),
-    [sym_conjunction] = STATE(1096),
-    [sym_disjunction] = STATE(1096),
-    [sym_implication] = STATE(1096),
-    [sym_quantified] = STATE(1096),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1096),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [228] = {
+    [sym_special_call] = STATE(1158),
+    [sym_prefix_cast] = STATE(1158),
+    [sym_unary_expr] = STATE(1158),
+    [sym_mul_expr] = STATE(1158),
+    [sym_add_expr] = STATE(1158),
+    [sym_in_expr] = STATE(1158),
+    [sym_comp_term] = STATE(1158),
+    [sym_instance_of] = STATE(1158),
+    [sym_negation] = STATE(1158),
+    [sym_if_term] = STATE(1158),
+    [sym_conjunction] = STATE(1158),
+    [sym_disjunction] = STATE(1158),
+    [sym_implication] = STATE(1158),
+    [sym_quantified] = STATE(1158),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1158),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -23546,7 +24103,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -23558,47 +24115,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [225] = {
-    [sym_special_call] = STATE(1113),
-    [sym_prefix_cast] = STATE(1113),
-    [sym_unary_expr] = STATE(1113),
-    [sym_mul_expr] = STATE(1113),
-    [sym_add_expr] = STATE(1113),
-    [sym_in_expr] = STATE(1113),
-    [sym_comp_term] = STATE(1113),
-    [sym_instance_of] = STATE(1113),
-    [sym_negation] = STATE(1113),
-    [sym_if_term] = STATE(1113),
-    [sym_conjunction] = STATE(1113),
-    [sym_disjunction] = STATE(1113),
-    [sym_implication] = STATE(1113),
-    [sym_quantified] = STATE(1113),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1113),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [229] = {
+    [sym_special_call] = STATE(1162),
+    [sym_prefix_cast] = STATE(1162),
+    [sym_unary_expr] = STATE(1162),
+    [sym_mul_expr] = STATE(1162),
+    [sym_add_expr] = STATE(1162),
+    [sym_in_expr] = STATE(1162),
+    [sym_comp_term] = STATE(1162),
+    [sym_instance_of] = STATE(1162),
+    [sym_negation] = STATE(1162),
+    [sym_if_term] = STATE(1162),
+    [sym_conjunction] = STATE(1162),
+    [sym_disjunction] = STATE(1162),
+    [sym_implication] = STATE(1162),
+    [sym_quantified] = STATE(1162),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1162),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1800),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -23628,7 +24186,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -23640,47 +24198,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [226] = {
-    [sym_special_call] = STATE(1100),
-    [sym_prefix_cast] = STATE(1100),
-    [sym_unary_expr] = STATE(1100),
-    [sym_mul_expr] = STATE(1100),
-    [sym_add_expr] = STATE(1100),
-    [sym_in_expr] = STATE(1100),
-    [sym_comp_term] = STATE(1100),
-    [sym_instance_of] = STATE(1100),
-    [sym_negation] = STATE(1100),
-    [sym_if_term] = STATE(1100),
-    [sym_conjunction] = STATE(1100),
-    [sym_disjunction] = STATE(1100),
-    [sym_implication] = STATE(1100),
-    [sym_quantified] = STATE(1100),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1100),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [230] = {
+    [sym_special_call] = STATE(1057),
+    [sym_prefix_cast] = STATE(1057),
+    [sym_unary_expr] = STATE(1057),
+    [sym_mul_expr] = STATE(1057),
+    [sym_add_expr] = STATE(1057),
+    [sym_in_expr] = STATE(1057),
+    [sym_comp_term] = STATE(1057),
+    [sym_instance_of] = STATE(1057),
+    [sym_negation] = STATE(1057),
+    [sym_if_term] = STATE(1057),
+    [sym_conjunction] = STATE(1057),
+    [sym_disjunction] = STATE(1057),
+    [sym_implication] = STATE(1057),
+    [sym_quantified] = STATE(1057),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1057),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1787),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -23710,7 +24269,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -23722,47 +24281,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [227] = {
-    [sym_special_call] = STATE(1083),
-    [sym_prefix_cast] = STATE(1083),
-    [sym_unary_expr] = STATE(1083),
-    [sym_mul_expr] = STATE(1083),
-    [sym_add_expr] = STATE(1083),
-    [sym_in_expr] = STATE(1083),
-    [sym_comp_term] = STATE(1083),
-    [sym_instance_of] = STATE(1083),
-    [sym_negation] = STATE(1083),
-    [sym_if_term] = STATE(1083),
-    [sym_conjunction] = STATE(1083),
-    [sym_disjunction] = STATE(1083),
-    [sym_implication] = STATE(1083),
-    [sym_quantified] = STATE(1083),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1083),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [231] = {
+    [sym_special_call] = STATE(818),
+    [sym_prefix_cast] = STATE(818),
+    [sym_unary_expr] = STATE(818),
+    [sym_mul_expr] = STATE(818),
+    [sym_add_expr] = STATE(818),
+    [sym_in_expr] = STATE(818),
+    [sym_comp_term] = STATE(818),
+    [sym_instance_of] = STATE(818),
+    [sym_negation] = STATE(818),
+    [sym_if_term] = STATE(818),
+    [sym_conjunction] = STATE(818),
+    [sym_disjunction] = STATE(818),
+    [sym_implication] = STATE(818),
+    [sym_quantified] = STATE(818),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(818),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -23804,51 +24364,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [228] = {
-    [sym_special_call] = STATE(1061),
-    [sym_prefix_cast] = STATE(1061),
-    [sym_unary_expr] = STATE(1061),
-    [sym_mul_expr] = STATE(1061),
-    [sym_add_expr] = STATE(1061),
-    [sym_in_expr] = STATE(1061),
-    [sym_comp_term] = STATE(1061),
-    [sym_instance_of] = STATE(1061),
-    [sym_negation] = STATE(1061),
-    [sym_if_term] = STATE(1061),
-    [sym_conjunction] = STATE(1061),
-    [sym_disjunction] = STATE(1061),
-    [sym_implication] = STATE(1061),
-    [sym_quantified] = STATE(1061),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1061),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [232] = {
+    [sym_special_call] = STATE(1182),
+    [sym_prefix_cast] = STATE(1182),
+    [sym_unary_expr] = STATE(1182),
+    [sym_mul_expr] = STATE(1182),
+    [sym_add_expr] = STATE(1182),
+    [sym_in_expr] = STATE(1182),
+    [sym_comp_term] = STATE(1182),
+    [sym_instance_of] = STATE(1182),
+    [sym_negation] = STATE(1182),
+    [sym_if_term] = STATE(1182),
+    [sym_conjunction] = STATE(1182),
+    [sym_disjunction] = STATE(1182),
+    [sym_implication] = STATE(1182),
+    [sym_quantified] = STATE(1182),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1182),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1794),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -23874,7 +24435,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -23886,51 +24447,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [229] = {
-    [sym_special_call] = STATE(1078),
-    [sym_prefix_cast] = STATE(1078),
-    [sym_unary_expr] = STATE(1078),
-    [sym_mul_expr] = STATE(1078),
-    [sym_add_expr] = STATE(1078),
-    [sym_in_expr] = STATE(1078),
-    [sym_comp_term] = STATE(1078),
-    [sym_instance_of] = STATE(1078),
-    [sym_negation] = STATE(1078),
-    [sym_if_term] = STATE(1078),
-    [sym_conjunction] = STATE(1078),
-    [sym_disjunction] = STATE(1078),
-    [sym_implication] = STATE(1078),
-    [sym_quantified] = STATE(1078),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1078),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [233] = {
+    [sym_special_call] = STATE(1165),
+    [sym_prefix_cast] = STATE(1165),
+    [sym_unary_expr] = STATE(1165),
+    [sym_mul_expr] = STATE(1165),
+    [sym_add_expr] = STATE(1165),
+    [sym_in_expr] = STATE(1165),
+    [sym_comp_term] = STATE(1165),
+    [sym_instance_of] = STATE(1165),
+    [sym_negation] = STATE(1165),
+    [sym_if_term] = STATE(1165),
+    [sym_conjunction] = STATE(1165),
+    [sym_disjunction] = STATE(1165),
+    [sym_implication] = STATE(1165),
+    [sym_quantified] = STATE(1165),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1165),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -23956,7 +24518,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -23968,47 +24530,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [230] = {
-    [sym_special_call] = STATE(1082),
-    [sym_prefix_cast] = STATE(1082),
-    [sym_unary_expr] = STATE(1082),
-    [sym_mul_expr] = STATE(1082),
-    [sym_add_expr] = STATE(1082),
-    [sym_in_expr] = STATE(1082),
-    [sym_comp_term] = STATE(1082),
-    [sym_instance_of] = STATE(1082),
-    [sym_negation] = STATE(1082),
-    [sym_if_term] = STATE(1082),
-    [sym_conjunction] = STATE(1082),
-    [sym_disjunction] = STATE(1082),
-    [sym_implication] = STATE(1082),
-    [sym_quantified] = STATE(1082),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1082),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [234] = {
+    [sym_special_call] = STATE(944),
+    [sym_prefix_cast] = STATE(944),
+    [sym_unary_expr] = STATE(944),
+    [sym_mul_expr] = STATE(944),
+    [sym_add_expr] = STATE(944),
+    [sym_in_expr] = STATE(944),
+    [sym_comp_term] = STATE(944),
+    [sym_instance_of] = STATE(944),
+    [sym_negation] = STATE(944),
+    [sym_if_term] = STATE(944),
+    [sym_conjunction] = STATE(944),
+    [sym_disjunction] = STATE(944),
+    [sym_implication] = STATE(944),
+    [sym_quantified] = STATE(944),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(944),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -24050,51 +24613,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [231] = {
-    [sym_special_call] = STATE(1076),
-    [sym_prefix_cast] = STATE(1076),
-    [sym_unary_expr] = STATE(1076),
-    [sym_mul_expr] = STATE(1076),
-    [sym_add_expr] = STATE(1076),
-    [sym_in_expr] = STATE(1076),
-    [sym_comp_term] = STATE(1076),
-    [sym_instance_of] = STATE(1076),
-    [sym_negation] = STATE(1076),
-    [sym_if_term] = STATE(1076),
-    [sym_conjunction] = STATE(1076),
-    [sym_disjunction] = STATE(1076),
-    [sym_implication] = STATE(1076),
-    [sym_quantified] = STATE(1076),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1076),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [235] = {
+    [sym_special_call] = STATE(934),
+    [sym_prefix_cast] = STATE(934),
+    [sym_unary_expr] = STATE(934),
+    [sym_mul_expr] = STATE(934),
+    [sym_add_expr] = STATE(934),
+    [sym_in_expr] = STATE(934),
+    [sym_comp_term] = STATE(934),
+    [sym_instance_of] = STATE(934),
+    [sym_negation] = STATE(934),
+    [sym_if_term] = STATE(934),
+    [sym_conjunction] = STATE(934),
+    [sym_disjunction] = STATE(934),
+    [sym_implication] = STATE(934),
+    [sym_quantified] = STATE(934),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(934),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -24120,7 +24684,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -24132,47 +24696,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [232] = {
-    [sym_special_call] = STATE(1054),
-    [sym_prefix_cast] = STATE(1054),
-    [sym_unary_expr] = STATE(1054),
-    [sym_mul_expr] = STATE(1054),
-    [sym_add_expr] = STATE(1054),
-    [sym_in_expr] = STATE(1054),
-    [sym_comp_term] = STATE(1054),
-    [sym_instance_of] = STATE(1054),
-    [sym_negation] = STATE(1054),
-    [sym_if_term] = STATE(1054),
-    [sym_conjunction] = STATE(1054),
-    [sym_disjunction] = STATE(1054),
-    [sym_implication] = STATE(1054),
-    [sym_quantified] = STATE(1054),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1054),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [236] = {
+    [sym_special_call] = STATE(1138),
+    [sym_prefix_cast] = STATE(1138),
+    [sym_unary_expr] = STATE(1138),
+    [sym_mul_expr] = STATE(1138),
+    [sym_add_expr] = STATE(1138),
+    [sym_in_expr] = STATE(1138),
+    [sym_comp_term] = STATE(1138),
+    [sym_instance_of] = STATE(1138),
+    [sym_negation] = STATE(1138),
+    [sym_if_term] = STATE(1138),
+    [sym_conjunction] = STATE(1138),
+    [sym_disjunction] = STATE(1138),
+    [sym_implication] = STATE(1138),
+    [sym_quantified] = STATE(1138),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1138),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -24214,56 +24779,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [233] = {
-    [sym_special_call] = STATE(827),
-    [sym_prefix_cast] = STATE(827),
-    [sym_unary_expr] = STATE(827),
-    [sym_mul_expr] = STATE(827),
-    [sym_add_expr] = STATE(827),
-    [sym_in_expr] = STATE(827),
-    [sym_comp_term] = STATE(827),
-    [sym_instance_of] = STATE(827),
-    [sym_negation] = STATE(827),
-    [sym_if_term] = STATE(827),
-    [sym_conjunction] = STATE(827),
-    [sym_disjunction] = STATE(827),
-    [sym_implication] = STATE(827),
-    [sym_quantified] = STATE(827),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(827),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [237] = {
+    [sym_special_call] = STATE(933),
+    [sym_prefix_cast] = STATE(933),
+    [sym_unary_expr] = STATE(933),
+    [sym_mul_expr] = STATE(933),
+    [sym_add_expr] = STATE(933),
+    [sym_in_expr] = STATE(933),
+    [sym_comp_term] = STATE(933),
+    [sym_instance_of] = STATE(933),
+    [sym_negation] = STATE(933),
+    [sym_if_term] = STATE(933),
+    [sym_conjunction] = STATE(933),
+    [sym_disjunction] = STATE(933),
+    [sym_implication] = STATE(933),
+    [sym_quantified] = STATE(933),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(933),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -24284,59 +24850,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [234] = {
-    [sym_special_call] = STATE(1079),
-    [sym_prefix_cast] = STATE(1079),
-    [sym_unary_expr] = STATE(1079),
-    [sym_mul_expr] = STATE(1079),
-    [sym_add_expr] = STATE(1079),
-    [sym_in_expr] = STATE(1079),
-    [sym_comp_term] = STATE(1079),
-    [sym_instance_of] = STATE(1079),
-    [sym_negation] = STATE(1079),
-    [sym_if_term] = STATE(1079),
-    [sym_conjunction] = STATE(1079),
-    [sym_disjunction] = STATE(1079),
-    [sym_implication] = STATE(1079),
-    [sym_quantified] = STATE(1079),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1079),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [238] = {
+    [sym_special_call] = STATE(1053),
+    [sym_prefix_cast] = STATE(1053),
+    [sym_unary_expr] = STATE(1053),
+    [sym_mul_expr] = STATE(1053),
+    [sym_add_expr] = STATE(1053),
+    [sym_in_expr] = STATE(1053),
+    [sym_comp_term] = STATE(1053),
+    [sym_instance_of] = STATE(1053),
+    [sym_negation] = STATE(1053),
+    [sym_if_term] = STATE(1053),
+    [sym_conjunction] = STATE(1053),
+    [sym_disjunction] = STATE(1053),
+    [sym_implication] = STATE(1053),
+    [sym_quantified] = STATE(1053),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1053),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -24378,56 +24945,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [235] = {
-    [sym_special_call] = STATE(826),
-    [sym_prefix_cast] = STATE(826),
-    [sym_unary_expr] = STATE(826),
-    [sym_mul_expr] = STATE(826),
-    [sym_add_expr] = STATE(826),
-    [sym_in_expr] = STATE(826),
-    [sym_comp_term] = STATE(826),
-    [sym_instance_of] = STATE(826),
-    [sym_negation] = STATE(826),
-    [sym_if_term] = STATE(826),
-    [sym_conjunction] = STATE(826),
-    [sym_disjunction] = STATE(826),
-    [sym_implication] = STATE(826),
-    [sym_quantified] = STATE(826),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(826),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [239] = {
+    [sym_special_call] = STATE(1176),
+    [sym_prefix_cast] = STATE(1176),
+    [sym_unary_expr] = STATE(1176),
+    [sym_mul_expr] = STATE(1176),
+    [sym_add_expr] = STATE(1176),
+    [sym_in_expr] = STATE(1176),
+    [sym_comp_term] = STATE(1176),
+    [sym_instance_of] = STATE(1176),
+    [sym_negation] = STATE(1176),
+    [sym_if_term] = STATE(1176),
+    [sym_conjunction] = STATE(1176),
+    [sym_disjunction] = STATE(1176),
+    [sym_implication] = STATE(1176),
+    [sym_quantified] = STATE(1176),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1176),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -24448,59 +25016,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [236] = {
-    [sym_special_call] = STATE(1007),
-    [sym_prefix_cast] = STATE(1007),
-    [sym_unary_expr] = STATE(1007),
-    [sym_mul_expr] = STATE(1007),
-    [sym_add_expr] = STATE(1007),
-    [sym_in_expr] = STATE(1007),
-    [sym_comp_term] = STATE(1007),
-    [sym_instance_of] = STATE(1007),
-    [sym_negation] = STATE(1007),
-    [sym_if_term] = STATE(1007),
-    [sym_conjunction] = STATE(1007),
-    [sym_disjunction] = STATE(1007),
-    [sym_implication] = STATE(1007),
-    [sym_quantified] = STATE(1007),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1007),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [240] = {
+    [sym_special_call] = STATE(1174),
+    [sym_prefix_cast] = STATE(1174),
+    [sym_unary_expr] = STATE(1174),
+    [sym_mul_expr] = STATE(1174),
+    [sym_add_expr] = STATE(1174),
+    [sym_in_expr] = STATE(1174),
+    [sym_comp_term] = STATE(1174),
+    [sym_instance_of] = STATE(1174),
+    [sym_negation] = STATE(1174),
+    [sym_if_term] = STATE(1174),
+    [sym_conjunction] = STATE(1174),
+    [sym_disjunction] = STATE(1174),
+    [sym_implication] = STATE(1174),
+    [sym_quantified] = STATE(1174),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1174),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -24542,47 +25111,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [237] = {
-    [sym_special_call] = STATE(1077),
-    [sym_prefix_cast] = STATE(1077),
-    [sym_unary_expr] = STATE(1077),
-    [sym_mul_expr] = STATE(1077),
-    [sym_add_expr] = STATE(1077),
-    [sym_in_expr] = STATE(1077),
-    [sym_comp_term] = STATE(1077),
-    [sym_instance_of] = STATE(1077),
-    [sym_negation] = STATE(1077),
-    [sym_if_term] = STATE(1077),
-    [sym_conjunction] = STATE(1077),
-    [sym_disjunction] = STATE(1077),
-    [sym_implication] = STATE(1077),
-    [sym_quantified] = STATE(1077),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1077),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [241] = {
+    [sym_special_call] = STATE(1164),
+    [sym_prefix_cast] = STATE(1164),
+    [sym_unary_expr] = STATE(1164),
+    [sym_mul_expr] = STATE(1164),
+    [sym_add_expr] = STATE(1164),
+    [sym_in_expr] = STATE(1164),
+    [sym_comp_term] = STATE(1164),
+    [sym_instance_of] = STATE(1164),
+    [sym_negation] = STATE(1164),
+    [sym_if_term] = STATE(1164),
+    [sym_conjunction] = STATE(1164),
+    [sym_disjunction] = STATE(1164),
+    [sym_implication] = STATE(1164),
+    [sym_quantified] = STATE(1164),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1164),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1789),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -24612,7 +25182,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -24624,56 +25194,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [238] = {
-    [sym_special_call] = STATE(386),
-    [sym_prefix_cast] = STATE(386),
-    [sym_unary_expr] = STATE(386),
-    [sym_mul_expr] = STATE(386),
-    [sym_add_expr] = STATE(386),
-    [sym_in_expr] = STATE(386),
-    [sym_comp_term] = STATE(386),
-    [sym_instance_of] = STATE(386),
-    [sym_negation] = STATE(386),
-    [sym_if_term] = STATE(386),
-    [sym_conjunction] = STATE(386),
-    [sym_disjunction] = STATE(386),
-    [sym_implication] = STATE(386),
-    [sym_quantified] = STATE(386),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(386),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [242] = {
+    [sym_special_call] = STATE(1169),
+    [sym_prefix_cast] = STATE(1169),
+    [sym_unary_expr] = STATE(1169),
+    [sym_mul_expr] = STATE(1169),
+    [sym_add_expr] = STATE(1169),
+    [sym_in_expr] = STATE(1169),
+    [sym_comp_term] = STATE(1169),
+    [sym_instance_of] = STATE(1169),
+    [sym_negation] = STATE(1169),
+    [sym_if_term] = STATE(1169),
+    [sym_conjunction] = STATE(1169),
+    [sym_disjunction] = STATE(1169),
+    [sym_implication] = STATE(1169),
+    [sym_quantified] = STATE(1169),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1169),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -24694,145 +25265,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
-  },
-  [239] = {
-    [sym_special_call] = STATE(825),
-    [sym_prefix_cast] = STATE(825),
-    [sym_unary_expr] = STATE(825),
-    [sym_mul_expr] = STATE(825),
-    [sym_add_expr] = STATE(825),
-    [sym_in_expr] = STATE(825),
-    [sym_comp_term] = STATE(825),
-    [sym_instance_of] = STATE(825),
-    [sym_negation] = STATE(825),
-    [sym_if_term] = STATE(825),
-    [sym_conjunction] = STATE(825),
-    [sym_disjunction] = STATE(825),
-    [sym_implication] = STATE(825),
-    [sym_quantified] = STATE(825),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(825),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [240] = {
-    [sym_special_call] = STATE(854),
-    [sym_prefix_cast] = STATE(854),
-    [sym_unary_expr] = STATE(854),
-    [sym_mul_expr] = STATE(854),
-    [sym_add_expr] = STATE(854),
-    [sym_in_expr] = STATE(854),
-    [sym_comp_term] = STATE(854),
-    [sym_instance_of] = STATE(854),
-    [sym_negation] = STATE(854),
-    [sym_if_term] = STATE(854),
-    [sym_conjunction] = STATE(854),
-    [sym_disjunction] = STATE(854),
-    [sym_implication] = STATE(854),
-    [sym_quantified] = STATE(854),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(854),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [243] = {
+    [sym_special_call] = STATE(1150),
+    [sym_prefix_cast] = STATE(1150),
+    [sym_unary_expr] = STATE(1150),
+    [sym_mul_expr] = STATE(1150),
+    [sym_add_expr] = STATE(1150),
+    [sym_in_expr] = STATE(1150),
+    [sym_comp_term] = STATE(1150),
+    [sym_instance_of] = STATE(1150),
+    [sym_negation] = STATE(1150),
+    [sym_if_term] = STATE(1150),
+    [sym_conjunction] = STATE(1150),
+    [sym_disjunction] = STATE(1150),
+    [sym_implication] = STATE(1150),
+    [sym_quantified] = STATE(1150),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1150),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -24858,7 +25348,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -24870,56 +25360,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [241] = {
-    [sym_special_call] = STATE(824),
-    [sym_prefix_cast] = STATE(824),
-    [sym_unary_expr] = STATE(824),
-    [sym_mul_expr] = STATE(824),
-    [sym_add_expr] = STATE(824),
-    [sym_in_expr] = STATE(824),
-    [sym_comp_term] = STATE(824),
-    [sym_instance_of] = STATE(824),
-    [sym_negation] = STATE(824),
-    [sym_if_term] = STATE(824),
-    [sym_conjunction] = STATE(824),
-    [sym_disjunction] = STATE(824),
-    [sym_implication] = STATE(824),
-    [sym_quantified] = STATE(824),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(824),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [244] = {
+    [sym_special_call] = STATE(1146),
+    [sym_prefix_cast] = STATE(1146),
+    [sym_unary_expr] = STATE(1146),
+    [sym_mul_expr] = STATE(1146),
+    [sym_add_expr] = STATE(1146),
+    [sym_in_expr] = STATE(1146),
+    [sym_comp_term] = STATE(1146),
+    [sym_instance_of] = STATE(1146),
+    [sym_negation] = STATE(1146),
+    [sym_if_term] = STATE(1146),
+    [sym_conjunction] = STATE(1146),
+    [sym_disjunction] = STATE(1146),
+    [sym_implication] = STATE(1146),
+    [sym_quantified] = STATE(1146),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1146),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -24940,59 +25431,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [242] = {
-    [sym_special_call] = STATE(1018),
-    [sym_prefix_cast] = STATE(1018),
-    [sym_unary_expr] = STATE(1018),
-    [sym_mul_expr] = STATE(1018),
-    [sym_add_expr] = STATE(1018),
-    [sym_in_expr] = STATE(1018),
-    [sym_comp_term] = STATE(1018),
-    [sym_instance_of] = STATE(1018),
-    [sym_negation] = STATE(1018),
-    [sym_if_term] = STATE(1018),
-    [sym_conjunction] = STATE(1018),
-    [sym_disjunction] = STATE(1018),
-    [sym_implication] = STATE(1018),
-    [sym_quantified] = STATE(1018),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1018),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [245] = {
+    [sym_special_call] = STATE(986),
+    [sym_prefix_cast] = STATE(986),
+    [sym_unary_expr] = STATE(986),
+    [sym_mul_expr] = STATE(986),
+    [sym_add_expr] = STATE(986),
+    [sym_in_expr] = STATE(986),
+    [sym_comp_term] = STATE(986),
+    [sym_instance_of] = STATE(986),
+    [sym_negation] = STATE(986),
+    [sym_if_term] = STATE(986),
+    [sym_conjunction] = STATE(986),
+    [sym_disjunction] = STATE(986),
+    [sym_implication] = STATE(986),
+    [sym_quantified] = STATE(986),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(986),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -25034,51 +25526,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [243] = {
-    [sym_special_call] = STATE(862),
-    [sym_prefix_cast] = STATE(862),
-    [sym_unary_expr] = STATE(862),
-    [sym_mul_expr] = STATE(862),
-    [sym_add_expr] = STATE(862),
-    [sym_in_expr] = STATE(862),
-    [sym_comp_term] = STATE(862),
-    [sym_instance_of] = STATE(862),
-    [sym_negation] = STATE(862),
-    [sym_if_term] = STATE(862),
-    [sym_conjunction] = STATE(862),
-    [sym_disjunction] = STATE(862),
-    [sym_implication] = STATE(862),
-    [sym_quantified] = STATE(862),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(862),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [246] = {
+    [sym_special_call] = STATE(996),
+    [sym_prefix_cast] = STATE(996),
+    [sym_unary_expr] = STATE(996),
+    [sym_mul_expr] = STATE(996),
+    [sym_add_expr] = STATE(996),
+    [sym_in_expr] = STATE(996),
+    [sym_comp_term] = STATE(996),
+    [sym_instance_of] = STATE(996),
+    [sym_negation] = STATE(996),
+    [sym_if_term] = STATE(996),
+    [sym_conjunction] = STATE(996),
+    [sym_disjunction] = STATE(996),
+    [sym_implication] = STATE(996),
+    [sym_quantified] = STATE(996),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(996),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -25104,7 +25597,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -25116,56 +25609,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [244] = {
-    [sym_special_call] = STATE(823),
-    [sym_prefix_cast] = STATE(823),
-    [sym_unary_expr] = STATE(823),
-    [sym_mul_expr] = STATE(823),
-    [sym_add_expr] = STATE(823),
-    [sym_in_expr] = STATE(823),
-    [sym_comp_term] = STATE(823),
-    [sym_instance_of] = STATE(823),
-    [sym_negation] = STATE(823),
-    [sym_if_term] = STATE(823),
-    [sym_conjunction] = STATE(823),
-    [sym_disjunction] = STATE(823),
-    [sym_implication] = STATE(823),
-    [sym_quantified] = STATE(823),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(823),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [247] = {
+    [sym_special_call] = STATE(1041),
+    [sym_prefix_cast] = STATE(1041),
+    [sym_unary_expr] = STATE(1041),
+    [sym_mul_expr] = STATE(1041),
+    [sym_add_expr] = STATE(1041),
+    [sym_in_expr] = STATE(1041),
+    [sym_comp_term] = STATE(1041),
+    [sym_instance_of] = STATE(1041),
+    [sym_negation] = STATE(1041),
+    [sym_if_term] = STATE(1041),
+    [sym_conjunction] = STATE(1041),
+    [sym_disjunction] = STATE(1041),
+    [sym_implication] = STATE(1041),
+    [sym_quantified] = STATE(1041),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1041),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -25186,68 +25680,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [245] = {
-    [sym_special_call] = STATE(848),
-    [sym_prefix_cast] = STATE(848),
-    [sym_unary_expr] = STATE(848),
-    [sym_mul_expr] = STATE(848),
-    [sym_add_expr] = STATE(848),
-    [sym_in_expr] = STATE(848),
-    [sym_comp_term] = STATE(848),
-    [sym_instance_of] = STATE(848),
-    [sym_negation] = STATE(848),
-    [sym_if_term] = STATE(848),
-    [sym_conjunction] = STATE(848),
-    [sym_disjunction] = STATE(848),
-    [sym_implication] = STATE(848),
-    [sym_quantified] = STATE(848),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(848),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [248] = {
+    [sym_special_call] = STATE(1112),
+    [sym_prefix_cast] = STATE(1112),
+    [sym_unary_expr] = STATE(1112),
+    [sym_mul_expr] = STATE(1112),
+    [sym_add_expr] = STATE(1112),
+    [sym_in_expr] = STATE(1112),
+    [sym_comp_term] = STATE(1112),
+    [sym_instance_of] = STATE(1112),
+    [sym_negation] = STATE(1112),
+    [sym_if_term] = STATE(1112),
+    [sym_conjunction] = STATE(1112),
+    [sym_disjunction] = STATE(1112),
+    [sym_implication] = STATE(1112),
+    [sym_quantified] = STATE(1112),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1112),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -25268,59 +25763,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [246] = {
-    [sym_special_call] = STATE(1037),
-    [sym_prefix_cast] = STATE(1037),
-    [sym_unary_expr] = STATE(1037),
-    [sym_mul_expr] = STATE(1037),
-    [sym_add_expr] = STATE(1037),
-    [sym_in_expr] = STATE(1037),
-    [sym_comp_term] = STATE(1037),
-    [sym_instance_of] = STATE(1037),
-    [sym_negation] = STATE(1037),
-    [sym_if_term] = STATE(1037),
-    [sym_conjunction] = STATE(1037),
-    [sym_disjunction] = STATE(1037),
-    [sym_implication] = STATE(1037),
-    [sym_quantified] = STATE(1037),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1037),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [249] = {
+    [sym_special_call] = STATE(1007),
+    [sym_prefix_cast] = STATE(1007),
+    [sym_unary_expr] = STATE(1007),
+    [sym_mul_expr] = STATE(1007),
+    [sym_add_expr] = STATE(1007),
+    [sym_in_expr] = STATE(1007),
+    [sym_comp_term] = STATE(1007),
+    [sym_instance_of] = STATE(1007),
+    [sym_negation] = STATE(1007),
+    [sym_if_term] = STATE(1007),
+    [sym_conjunction] = STATE(1007),
+    [sym_disjunction] = STATE(1007),
+    [sym_implication] = STATE(1007),
+    [sym_quantified] = STATE(1007),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1007),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -25362,51 +25858,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [247] = {
-    [sym_special_call] = STATE(1065),
-    [sym_prefix_cast] = STATE(1065),
-    [sym_unary_expr] = STATE(1065),
-    [sym_mul_expr] = STATE(1065),
-    [sym_add_expr] = STATE(1065),
-    [sym_in_expr] = STATE(1065),
-    [sym_comp_term] = STATE(1065),
-    [sym_instance_of] = STATE(1065),
-    [sym_negation] = STATE(1065),
-    [sym_if_term] = STATE(1065),
-    [sym_conjunction] = STATE(1065),
-    [sym_disjunction] = STATE(1065),
-    [sym_implication] = STATE(1065),
-    [sym_quantified] = STATE(1065),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1065),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [250] = {
+    [sym_special_call] = STATE(789),
+    [sym_prefix_cast] = STATE(789),
+    [sym_unary_expr] = STATE(789),
+    [sym_mul_expr] = STATE(789),
+    [sym_add_expr] = STATE(789),
+    [sym_in_expr] = STATE(789),
+    [sym_comp_term] = STATE(789),
+    [sym_instance_of] = STATE(789),
+    [sym_negation] = STATE(789),
+    [sym_if_term] = STATE(789),
+    [sym_conjunction] = STATE(789),
+    [sym_disjunction] = STATE(789),
+    [sym_implication] = STATE(789),
+    [sym_quantified] = STATE(789),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(789),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -25432,7 +25929,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -25444,51 +25941,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [248] = {
-    [sym_special_call] = STATE(1046),
-    [sym_prefix_cast] = STATE(1046),
-    [sym_unary_expr] = STATE(1046),
-    [sym_mul_expr] = STATE(1046),
-    [sym_add_expr] = STATE(1046),
-    [sym_in_expr] = STATE(1046),
-    [sym_comp_term] = STATE(1046),
-    [sym_instance_of] = STATE(1046),
-    [sym_negation] = STATE(1046),
-    [sym_if_term] = STATE(1046),
-    [sym_conjunction] = STATE(1046),
-    [sym_disjunction] = STATE(1046),
-    [sym_implication] = STATE(1046),
-    [sym_quantified] = STATE(1046),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1046),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [251] = {
+    [sym_special_call] = STATE(1105),
+    [sym_prefix_cast] = STATE(1105),
+    [sym_unary_expr] = STATE(1105),
+    [sym_mul_expr] = STATE(1105),
+    [sym_add_expr] = STATE(1105),
+    [sym_in_expr] = STATE(1105),
+    [sym_comp_term] = STATE(1105),
+    [sym_instance_of] = STATE(1105),
+    [sym_negation] = STATE(1105),
+    [sym_if_term] = STATE(1105),
+    [sym_conjunction] = STATE(1105),
+    [sym_disjunction] = STATE(1105),
+    [sym_implication] = STATE(1105),
+    [sym_quantified] = STATE(1105),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1105),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -25514,7 +26012,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -25526,47 +26024,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [249] = {
-    [sym_special_call] = STATE(835),
-    [sym_prefix_cast] = STATE(835),
-    [sym_unary_expr] = STATE(835),
-    [sym_mul_expr] = STATE(835),
-    [sym_add_expr] = STATE(835),
-    [sym_in_expr] = STATE(835),
-    [sym_comp_term] = STATE(835),
-    [sym_instance_of] = STATE(835),
-    [sym_negation] = STATE(835),
-    [sym_if_term] = STATE(835),
-    [sym_conjunction] = STATE(835),
-    [sym_disjunction] = STATE(835),
-    [sym_implication] = STATE(835),
-    [sym_quantified] = STATE(835),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(835),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [252] = {
+    [sym_special_call] = STATE(1099),
+    [sym_prefix_cast] = STATE(1099),
+    [sym_unary_expr] = STATE(1099),
+    [sym_mul_expr] = STATE(1099),
+    [sym_add_expr] = STATE(1099),
+    [sym_in_expr] = STATE(1099),
+    [sym_comp_term] = STATE(1099),
+    [sym_instance_of] = STATE(1099),
+    [sym_negation] = STATE(1099),
+    [sym_if_term] = STATE(1099),
+    [sym_conjunction] = STATE(1099),
+    [sym_disjunction] = STATE(1099),
+    [sym_implication] = STATE(1099),
+    [sym_quantified] = STATE(1099),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1099),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -25608,51 +26107,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [250] = {
-    [sym_special_call] = STATE(1160),
-    [sym_prefix_cast] = STATE(1160),
-    [sym_unary_expr] = STATE(1160),
-    [sym_mul_expr] = STATE(1160),
-    [sym_add_expr] = STATE(1160),
-    [sym_in_expr] = STATE(1160),
-    [sym_comp_term] = STATE(1160),
-    [sym_instance_of] = STATE(1160),
-    [sym_negation] = STATE(1160),
-    [sym_if_term] = STATE(1160),
-    [sym_conjunction] = STATE(1160),
-    [sym_disjunction] = STATE(1160),
-    [sym_implication] = STATE(1160),
-    [sym_quantified] = STATE(1160),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1160),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [253] = {
+    [sym_special_call] = STATE(1092),
+    [sym_prefix_cast] = STATE(1092),
+    [sym_unary_expr] = STATE(1092),
+    [sym_mul_expr] = STATE(1092),
+    [sym_add_expr] = STATE(1092),
+    [sym_in_expr] = STATE(1092),
+    [sym_comp_term] = STATE(1092),
+    [sym_instance_of] = STATE(1092),
+    [sym_negation] = STATE(1092),
+    [sym_if_term] = STATE(1092),
+    [sym_conjunction] = STATE(1092),
+    [sym_disjunction] = STATE(1092),
+    [sym_implication] = STATE(1092),
+    [sym_quantified] = STATE(1092),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1092),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -25678,7 +26178,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -25690,47 +26190,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [251] = {
-    [sym_special_call] = STATE(857),
-    [sym_prefix_cast] = STATE(857),
-    [sym_unary_expr] = STATE(857),
-    [sym_mul_expr] = STATE(857),
-    [sym_add_expr] = STATE(857),
-    [sym_in_expr] = STATE(857),
-    [sym_comp_term] = STATE(857),
-    [sym_instance_of] = STATE(857),
-    [sym_negation] = STATE(857),
-    [sym_if_term] = STATE(857),
-    [sym_conjunction] = STATE(857),
-    [sym_disjunction] = STATE(857),
-    [sym_implication] = STATE(857),
-    [sym_quantified] = STATE(857),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(857),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [254] = {
+    [sym_special_call] = STATE(1166),
+    [sym_prefix_cast] = STATE(1166),
+    [sym_unary_expr] = STATE(1166),
+    [sym_mul_expr] = STATE(1166),
+    [sym_add_expr] = STATE(1166),
+    [sym_in_expr] = STATE(1166),
+    [sym_comp_term] = STATE(1166),
+    [sym_instance_of] = STATE(1166),
+    [sym_negation] = STATE(1166),
+    [sym_if_term] = STATE(1166),
+    [sym_conjunction] = STATE(1166),
+    [sym_disjunction] = STATE(1166),
+    [sym_implication] = STATE(1166),
+    [sym_quantified] = STATE(1166),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1166),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1771),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -25760,7 +26261,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -25772,56 +26273,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [252] = {
-    [sym_special_call] = STATE(413),
-    [sym_prefix_cast] = STATE(413),
-    [sym_unary_expr] = STATE(413),
-    [sym_mul_expr] = STATE(413),
-    [sym_add_expr] = STATE(413),
-    [sym_in_expr] = STATE(413),
-    [sym_comp_term] = STATE(413),
-    [sym_instance_of] = STATE(413),
-    [sym_negation] = STATE(413),
-    [sym_if_term] = STATE(413),
-    [sym_conjunction] = STATE(413),
-    [sym_disjunction] = STATE(413),
-    [sym_implication] = STATE(413),
-    [sym_quantified] = STATE(413),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(413),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [255] = {
+    [sym_special_call] = STATE(1177),
+    [sym_prefix_cast] = STATE(1177),
+    [sym_unary_expr] = STATE(1177),
+    [sym_mul_expr] = STATE(1177),
+    [sym_add_expr] = STATE(1177),
+    [sym_in_expr] = STATE(1177),
+    [sym_comp_term] = STATE(1177),
+    [sym_instance_of] = STATE(1177),
+    [sym_negation] = STATE(1177),
+    [sym_if_term] = STATE(1177),
+    [sym_conjunction] = STATE(1177),
+    [sym_disjunction] = STATE(1177),
+    [sym_implication] = STATE(1177),
+    [sym_quantified] = STATE(1177),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1177),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -25842,63 +26344,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [253] = {
-    [sym_special_call] = STATE(858),
-    [sym_prefix_cast] = STATE(858),
-    [sym_unary_expr] = STATE(858),
-    [sym_mul_expr] = STATE(858),
-    [sym_add_expr] = STATE(858),
-    [sym_in_expr] = STATE(858),
-    [sym_comp_term] = STATE(858),
-    [sym_instance_of] = STATE(858),
-    [sym_negation] = STATE(858),
-    [sym_if_term] = STATE(858),
-    [sym_conjunction] = STATE(858),
-    [sym_disjunction] = STATE(858),
-    [sym_implication] = STATE(858),
-    [sym_quantified] = STATE(858),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(858),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [256] = {
+    [sym_special_call] = STATE(1045),
+    [sym_prefix_cast] = STATE(1045),
+    [sym_unary_expr] = STATE(1045),
+    [sym_mul_expr] = STATE(1045),
+    [sym_add_expr] = STATE(1045),
+    [sym_in_expr] = STATE(1045),
+    [sym_comp_term] = STATE(1045),
+    [sym_instance_of] = STATE(1045),
+    [sym_negation] = STATE(1045),
+    [sym_if_term] = STATE(1045),
+    [sym_conjunction] = STATE(1045),
+    [sym_disjunction] = STATE(1045),
+    [sym_implication] = STATE(1045),
+    [sym_quantified] = STATE(1045),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1045),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -25924,7 +26427,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -25936,56 +26439,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [254] = {
-    [sym_special_call] = STATE(1025),
-    [sym_prefix_cast] = STATE(1025),
-    [sym_unary_expr] = STATE(1025),
-    [sym_mul_expr] = STATE(1025),
-    [sym_add_expr] = STATE(1025),
-    [sym_in_expr] = STATE(1025),
-    [sym_comp_term] = STATE(1025),
-    [sym_instance_of] = STATE(1025),
-    [sym_negation] = STATE(1025),
-    [sym_if_term] = STATE(1025),
-    [sym_conjunction] = STATE(1025),
-    [sym_disjunction] = STATE(1025),
-    [sym_implication] = STATE(1025),
-    [sym_quantified] = STATE(1025),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1025),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [257] = {
+    [sym_special_call] = STATE(406),
+    [sym_prefix_cast] = STATE(406),
+    [sym_unary_expr] = STATE(406),
+    [sym_mul_expr] = STATE(406),
+    [sym_add_expr] = STATE(406),
+    [sym_in_expr] = STATE(406),
+    [sym_comp_term] = STATE(406),
+    [sym_instance_of] = STATE(406),
+    [sym_negation] = STATE(406),
+    [sym_if_term] = STATE(406),
+    [sym_conjunction] = STATE(406),
+    [sym_disjunction] = STATE(406),
+    [sym_implication] = STATE(406),
+    [sym_quantified] = STATE(406),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(406),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -26006,59 +26510,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [255] = {
-    [sym_special_call] = STATE(855),
-    [sym_prefix_cast] = STATE(855),
-    [sym_unary_expr] = STATE(855),
-    [sym_mul_expr] = STATE(855),
-    [sym_add_expr] = STATE(855),
-    [sym_in_expr] = STATE(855),
-    [sym_comp_term] = STATE(855),
-    [sym_instance_of] = STATE(855),
-    [sym_negation] = STATE(855),
-    [sym_if_term] = STATE(855),
-    [sym_conjunction] = STATE(855),
-    [sym_disjunction] = STATE(855),
-    [sym_implication] = STATE(855),
-    [sym_quantified] = STATE(855),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(855),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [258] = {
+    [sym_special_call] = STATE(1038),
+    [sym_prefix_cast] = STATE(1038),
+    [sym_unary_expr] = STATE(1038),
+    [sym_mul_expr] = STATE(1038),
+    [sym_add_expr] = STATE(1038),
+    [sym_in_expr] = STATE(1038),
+    [sym_comp_term] = STATE(1038),
+    [sym_instance_of] = STATE(1038),
+    [sym_negation] = STATE(1038),
+    [sym_if_term] = STATE(1038),
+    [sym_conjunction] = STATE(1038),
+    [sym_disjunction] = STATE(1038),
+    [sym_implication] = STATE(1038),
+    [sym_quantified] = STATE(1038),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1038),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -26100,47 +26605,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [256] = {
-    [sym_special_call] = STATE(842),
-    [sym_prefix_cast] = STATE(842),
-    [sym_unary_expr] = STATE(842),
-    [sym_mul_expr] = STATE(842),
-    [sym_add_expr] = STATE(842),
-    [sym_in_expr] = STATE(842),
-    [sym_comp_term] = STATE(842),
-    [sym_instance_of] = STATE(842),
-    [sym_negation] = STATE(842),
-    [sym_if_term] = STATE(842),
-    [sym_conjunction] = STATE(842),
-    [sym_disjunction] = STATE(842),
-    [sym_implication] = STATE(842),
-    [sym_quantified] = STATE(842),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(842),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [259] = {
+    [sym_special_call] = STATE(1024),
+    [sym_prefix_cast] = STATE(1024),
+    [sym_unary_expr] = STATE(1024),
+    [sym_mul_expr] = STATE(1024),
+    [sym_add_expr] = STATE(1024),
+    [sym_in_expr] = STATE(1024),
+    [sym_comp_term] = STATE(1024),
+    [sym_instance_of] = STATE(1024),
+    [sym_negation] = STATE(1024),
+    [sym_if_term] = STATE(1024),
+    [sym_conjunction] = STATE(1024),
+    [sym_disjunction] = STATE(1024),
+    [sym_implication] = STATE(1024),
+    [sym_quantified] = STATE(1024),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1024),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -26182,51 +26688,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [257] = {
-    [sym_special_call] = STATE(843),
-    [sym_prefix_cast] = STATE(843),
-    [sym_unary_expr] = STATE(843),
-    [sym_mul_expr] = STATE(843),
-    [sym_add_expr] = STATE(843),
-    [sym_in_expr] = STATE(843),
-    [sym_comp_term] = STATE(843),
-    [sym_instance_of] = STATE(843),
-    [sym_negation] = STATE(843),
-    [sym_if_term] = STATE(843),
-    [sym_conjunction] = STATE(843),
-    [sym_disjunction] = STATE(843),
-    [sym_implication] = STATE(843),
-    [sym_quantified] = STATE(843),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(843),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+  [260] = {
+    [sym_special_call] = STATE(874),
+    [sym_prefix_cast] = STATE(874),
+    [sym_unary_expr] = STATE(874),
+    [sym_mul_expr] = STATE(874),
+    [sym_add_expr] = STATE(874),
+    [sym_in_expr] = STATE(874),
+    [sym_comp_term] = STATE(874),
+    [sym_instance_of] = STATE(874),
+    [sym_negation] = STATE(874),
+    [sym_if_term] = STATE(874),
+    [sym_conjunction] = STATE(874),
+    [sym_disjunction] = STATE(874),
+    [sym_implication] = STATE(874),
+    [sym_quantified] = STATE(874),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(874),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -26252,7 +26759,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -26264,51 +26771,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [258] = {
-    [sym_special_call] = STATE(859),
-    [sym_prefix_cast] = STATE(859),
-    [sym_unary_expr] = STATE(859),
-    [sym_mul_expr] = STATE(859),
-    [sym_add_expr] = STATE(859),
-    [sym_in_expr] = STATE(859),
-    [sym_comp_term] = STATE(859),
-    [sym_instance_of] = STATE(859),
-    [sym_negation] = STATE(859),
-    [sym_if_term] = STATE(859),
-    [sym_conjunction] = STATE(859),
-    [sym_disjunction] = STATE(859),
-    [sym_implication] = STATE(859),
-    [sym_quantified] = STATE(859),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(859),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [261] = {
+    [sym_special_call] = STATE(1119),
+    [sym_prefix_cast] = STATE(1119),
+    [sym_unary_expr] = STATE(1119),
+    [sym_mul_expr] = STATE(1119),
+    [sym_add_expr] = STATE(1119),
+    [sym_in_expr] = STATE(1119),
+    [sym_comp_term] = STATE(1119),
+    [sym_instance_of] = STATE(1119),
+    [sym_negation] = STATE(1119),
+    [sym_if_term] = STATE(1119),
+    [sym_conjunction] = STATE(1119),
+    [sym_disjunction] = STATE(1119),
+    [sym_implication] = STATE(1119),
+    [sym_quantified] = STATE(1119),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1119),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -26334,7 +26842,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -26346,56 +26854,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [259] = {
-    [sym_special_call] = STATE(382),
-    [sym_prefix_cast] = STATE(382),
-    [sym_unary_expr] = STATE(382),
-    [sym_mul_expr] = STATE(382),
-    [sym_add_expr] = STATE(382),
-    [sym_in_expr] = STATE(382),
-    [sym_comp_term] = STATE(382),
-    [sym_instance_of] = STATE(382),
-    [sym_negation] = STATE(382),
-    [sym_if_term] = STATE(382),
-    [sym_conjunction] = STATE(382),
-    [sym_disjunction] = STATE(382),
-    [sym_implication] = STATE(382),
-    [sym_quantified] = STATE(382),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(382),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+  [262] = {
+    [sym_special_call] = STATE(409),
+    [sym_prefix_cast] = STATE(409),
+    [sym_unary_expr] = STATE(409),
+    [sym_mul_expr] = STATE(409),
+    [sym_add_expr] = STATE(409),
+    [sym_in_expr] = STATE(409),
+    [sym_comp_term] = STATE(409),
+    [sym_instance_of] = STATE(409),
+    [sym_negation] = STATE(409),
+    [sym_if_term] = STATE(409),
+    [sym_conjunction] = STATE(409),
+    [sym_disjunction] = STATE(409),
+    [sym_implication] = STATE(409),
+    [sym_quantified] = STATE(409),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(409),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -26416,63 +26925,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [260] = {
-    [sym_special_call] = STATE(867),
-    [sym_prefix_cast] = STATE(867),
-    [sym_unary_expr] = STATE(867),
-    [sym_mul_expr] = STATE(867),
-    [sym_add_expr] = STATE(867),
-    [sym_in_expr] = STATE(867),
-    [sym_comp_term] = STATE(867),
-    [sym_instance_of] = STATE(867),
-    [sym_negation] = STATE(867),
-    [sym_if_term] = STATE(867),
-    [sym_conjunction] = STATE(867),
-    [sym_disjunction] = STATE(867),
-    [sym_implication] = STATE(867),
-    [sym_quantified] = STATE(867),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(867),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [263] = {
+    [sym_special_call] = STATE(1179),
+    [sym_prefix_cast] = STATE(1179),
+    [sym_unary_expr] = STATE(1179),
+    [sym_mul_expr] = STATE(1179),
+    [sym_add_expr] = STATE(1179),
+    [sym_in_expr] = STATE(1179),
+    [sym_comp_term] = STATE(1179),
+    [sym_instance_of] = STATE(1179),
+    [sym_negation] = STATE(1179),
+    [sym_if_term] = STATE(1179),
+    [sym_conjunction] = STATE(1179),
+    [sym_disjunction] = STATE(1179),
+    [sym_implication] = STATE(1179),
+    [sym_quantified] = STATE(1179),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1179),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -26498,7 +27008,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -26510,51 +27020,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [261] = {
-    [sym_special_call] = STATE(1159),
-    [sym_prefix_cast] = STATE(1159),
-    [sym_unary_expr] = STATE(1159),
-    [sym_mul_expr] = STATE(1159),
-    [sym_add_expr] = STATE(1159),
-    [sym_in_expr] = STATE(1159),
-    [sym_comp_term] = STATE(1159),
-    [sym_instance_of] = STATE(1159),
-    [sym_negation] = STATE(1159),
-    [sym_if_term] = STATE(1159),
-    [sym_conjunction] = STATE(1159),
-    [sym_disjunction] = STATE(1159),
-    [sym_implication] = STATE(1159),
-    [sym_quantified] = STATE(1159),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1159),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [264] = {
+    [sym_special_call] = STATE(1175),
+    [sym_prefix_cast] = STATE(1175),
+    [sym_unary_expr] = STATE(1175),
+    [sym_mul_expr] = STATE(1175),
+    [sym_add_expr] = STATE(1175),
+    [sym_in_expr] = STATE(1175),
+    [sym_comp_term] = STATE(1175),
+    [sym_instance_of] = STATE(1175),
+    [sym_negation] = STATE(1175),
+    [sym_if_term] = STATE(1175),
+    [sym_conjunction] = STATE(1175),
+    [sym_disjunction] = STATE(1175),
+    [sym_implication] = STATE(1175),
+    [sym_quantified] = STATE(1175),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1175),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1765),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -26580,7 +27091,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -26592,56 +27103,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [262] = {
-    [sym_special_call] = STATE(379),
-    [sym_prefix_cast] = STATE(379),
-    [sym_unary_expr] = STATE(379),
-    [sym_mul_expr] = STATE(379),
-    [sym_add_expr] = STATE(379),
-    [sym_in_expr] = STATE(379),
-    [sym_comp_term] = STATE(379),
-    [sym_instance_of] = STATE(379),
-    [sym_negation] = STATE(379),
-    [sym_if_term] = STATE(379),
-    [sym_conjunction] = STATE(379),
-    [sym_disjunction] = STATE(379),
-    [sym_implication] = STATE(379),
-    [sym_quantified] = STATE(379),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(379),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [265] = {
+    [sym_special_call] = STATE(1080),
+    [sym_prefix_cast] = STATE(1080),
+    [sym_unary_expr] = STATE(1080),
+    [sym_mul_expr] = STATE(1080),
+    [sym_add_expr] = STATE(1080),
+    [sym_in_expr] = STATE(1080),
+    [sym_comp_term] = STATE(1080),
+    [sym_instance_of] = STATE(1080),
+    [sym_negation] = STATE(1080),
+    [sym_if_term] = STATE(1080),
+    [sym_conjunction] = STATE(1080),
+    [sym_disjunction] = STATE(1080),
+    [sym_implication] = STATE(1080),
+    [sym_quantified] = STATE(1080),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1080),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -26662,68 +27174,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [263] = {
-    [sym_special_call] = STATE(380),
-    [sym_prefix_cast] = STATE(380),
-    [sym_unary_expr] = STATE(380),
-    [sym_mul_expr] = STATE(380),
-    [sym_add_expr] = STATE(380),
-    [sym_in_expr] = STATE(380),
-    [sym_comp_term] = STATE(380),
-    [sym_instance_of] = STATE(380),
-    [sym_negation] = STATE(380),
-    [sym_if_term] = STATE(380),
-    [sym_conjunction] = STATE(380),
-    [sym_disjunction] = STATE(380),
-    [sym_implication] = STATE(380),
-    [sym_quantified] = STATE(380),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(380),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [266] = {
+    [sym_special_call] = STATE(957),
+    [sym_prefix_cast] = STATE(957),
+    [sym_unary_expr] = STATE(957),
+    [sym_mul_expr] = STATE(957),
+    [sym_add_expr] = STATE(957),
+    [sym_in_expr] = STATE(957),
+    [sym_comp_term] = STATE(957),
+    [sym_instance_of] = STATE(957),
+    [sym_negation] = STATE(957),
+    [sym_if_term] = STATE(957),
+    [sym_conjunction] = STATE(957),
+    [sym_disjunction] = STATE(957),
+    [sym_implication] = STATE(957),
+    [sym_quantified] = STATE(957),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(957),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -26744,63 +27257,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [264] = {
-    [sym_special_call] = STATE(832),
-    [sym_prefix_cast] = STATE(832),
-    [sym_unary_expr] = STATE(832),
-    [sym_mul_expr] = STATE(832),
-    [sym_add_expr] = STATE(832),
-    [sym_in_expr] = STATE(832),
-    [sym_comp_term] = STATE(832),
-    [sym_instance_of] = STATE(832),
-    [sym_negation] = STATE(832),
-    [sym_if_term] = STATE(832),
-    [sym_conjunction] = STATE(832),
-    [sym_disjunction] = STATE(832),
-    [sym_implication] = STATE(832),
-    [sym_quantified] = STATE(832),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(832),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [267] = {
+    [sym_special_call] = STATE(1071),
+    [sym_prefix_cast] = STATE(1071),
+    [sym_unary_expr] = STATE(1071),
+    [sym_mul_expr] = STATE(1071),
+    [sym_add_expr] = STATE(1071),
+    [sym_in_expr] = STATE(1071),
+    [sym_comp_term] = STATE(1071),
+    [sym_instance_of] = STATE(1071),
+    [sym_negation] = STATE(1071),
+    [sym_if_term] = STATE(1071),
+    [sym_conjunction] = STATE(1071),
+    [sym_disjunction] = STATE(1071),
+    [sym_implication] = STATE(1071),
+    [sym_quantified] = STATE(1071),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1071),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -26826,7 +27340,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -26838,51 +27352,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [265] = {
-    [sym_special_call] = STATE(987),
-    [sym_prefix_cast] = STATE(987),
-    [sym_unary_expr] = STATE(987),
-    [sym_mul_expr] = STATE(987),
-    [sym_add_expr] = STATE(987),
-    [sym_in_expr] = STATE(987),
-    [sym_comp_term] = STATE(987),
-    [sym_instance_of] = STATE(987),
-    [sym_negation] = STATE(987),
-    [sym_if_term] = STATE(987),
-    [sym_conjunction] = STATE(987),
-    [sym_disjunction] = STATE(987),
-    [sym_implication] = STATE(987),
-    [sym_quantified] = STATE(987),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(987),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [268] = {
+    [sym_special_call] = STATE(869),
+    [sym_prefix_cast] = STATE(869),
+    [sym_unary_expr] = STATE(869),
+    [sym_mul_expr] = STATE(869),
+    [sym_add_expr] = STATE(869),
+    [sym_in_expr] = STATE(869),
+    [sym_comp_term] = STATE(869),
+    [sym_instance_of] = STATE(869),
+    [sym_negation] = STATE(869),
+    [sym_if_term] = STATE(869),
+    [sym_conjunction] = STATE(869),
+    [sym_disjunction] = STATE(869),
+    [sym_implication] = STATE(869),
+    [sym_quantified] = STATE(869),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(869),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -26908,7 +27423,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -26920,51 +27435,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [266] = {
-    [sym_special_call] = STATE(1043),
-    [sym_prefix_cast] = STATE(1043),
-    [sym_unary_expr] = STATE(1043),
-    [sym_mul_expr] = STATE(1043),
-    [sym_add_expr] = STATE(1043),
-    [sym_in_expr] = STATE(1043),
-    [sym_comp_term] = STATE(1043),
-    [sym_instance_of] = STATE(1043),
-    [sym_negation] = STATE(1043),
-    [sym_if_term] = STATE(1043),
-    [sym_conjunction] = STATE(1043),
-    [sym_disjunction] = STATE(1043),
-    [sym_implication] = STATE(1043),
-    [sym_quantified] = STATE(1043),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1043),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [269] = {
+    [sym_special_call] = STATE(791),
+    [sym_prefix_cast] = STATE(791),
+    [sym_unary_expr] = STATE(791),
+    [sym_mul_expr] = STATE(791),
+    [sym_add_expr] = STATE(791),
+    [sym_in_expr] = STATE(791),
+    [sym_comp_term] = STATE(791),
+    [sym_instance_of] = STATE(791),
+    [sym_negation] = STATE(791),
+    [sym_if_term] = STATE(791),
+    [sym_conjunction] = STATE(791),
+    [sym_disjunction] = STATE(791),
+    [sym_implication] = STATE(791),
+    [sym_quantified] = STATE(791),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(791),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -26990,7 +27506,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -27002,56 +27518,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [267] = {
-    [sym_special_call] = STATE(1140),
-    [sym_prefix_cast] = STATE(1140),
-    [sym_unary_expr] = STATE(1140),
-    [sym_mul_expr] = STATE(1140),
-    [sym_add_expr] = STATE(1140),
-    [sym_in_expr] = STATE(1140),
-    [sym_comp_term] = STATE(1140),
-    [sym_instance_of] = STATE(1140),
-    [sym_negation] = STATE(1140),
-    [sym_if_term] = STATE(1140),
-    [sym_conjunction] = STATE(1140),
-    [sym_disjunction] = STATE(1140),
-    [sym_implication] = STATE(1140),
-    [sym_quantified] = STATE(1140),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1140),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [270] = {
+    [sym_special_call] = STATE(412),
+    [sym_prefix_cast] = STATE(412),
+    [sym_unary_expr] = STATE(412),
+    [sym_mul_expr] = STATE(412),
+    [sym_add_expr] = STATE(412),
+    [sym_in_expr] = STATE(412),
+    [sym_comp_term] = STATE(412),
+    [sym_instance_of] = STATE(412),
+    [sym_negation] = STATE(412),
+    [sym_if_term] = STATE(412),
+    [sym_conjunction] = STATE(412),
+    [sym_disjunction] = STATE(412),
+    [sym_implication] = STATE(412),
+    [sym_quantified] = STATE(412),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(412),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27072,68 +27589,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [268] = {
-    [sym_special_call] = STATE(877),
-    [sym_prefix_cast] = STATE(877),
-    [sym_unary_expr] = STATE(877),
-    [sym_mul_expr] = STATE(877),
-    [sym_add_expr] = STATE(877),
-    [sym_in_expr] = STATE(877),
-    [sym_comp_term] = STATE(877),
-    [sym_instance_of] = STATE(877),
-    [sym_negation] = STATE(877),
-    [sym_if_term] = STATE(877),
-    [sym_conjunction] = STATE(877),
-    [sym_disjunction] = STATE(877),
-    [sym_implication] = STATE(877),
-    [sym_quantified] = STATE(877),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(877),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [271] = {
+    [sym_special_call] = STATE(403),
+    [sym_prefix_cast] = STATE(403),
+    [sym_unary_expr] = STATE(403),
+    [sym_mul_expr] = STATE(403),
+    [sym_add_expr] = STATE(403),
+    [sym_in_expr] = STATE(403),
+    [sym_comp_term] = STATE(403),
+    [sym_instance_of] = STATE(403),
+    [sym_negation] = STATE(403),
+    [sym_if_term] = STATE(403),
+    [sym_conjunction] = STATE(403),
+    [sym_disjunction] = STATE(403),
+    [sym_implication] = STATE(403),
+    [sym_quantified] = STATE(403),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(403),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27154,68 +27672,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [269] = {
-    [sym_special_call] = STATE(1047),
-    [sym_prefix_cast] = STATE(1047),
-    [sym_unary_expr] = STATE(1047),
-    [sym_mul_expr] = STATE(1047),
-    [sym_add_expr] = STATE(1047),
-    [sym_in_expr] = STATE(1047),
-    [sym_comp_term] = STATE(1047),
-    [sym_instance_of] = STATE(1047),
-    [sym_negation] = STATE(1047),
-    [sym_if_term] = STATE(1047),
-    [sym_conjunction] = STATE(1047),
-    [sym_disjunction] = STATE(1047),
-    [sym_implication] = STATE(1047),
-    [sym_quantified] = STATE(1047),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1047),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [272] = {
+    [sym_special_call] = STATE(402),
+    [sym_prefix_cast] = STATE(402),
+    [sym_unary_expr] = STATE(402),
+    [sym_mul_expr] = STATE(402),
+    [sym_add_expr] = STATE(402),
+    [sym_in_expr] = STATE(402),
+    [sym_comp_term] = STATE(402),
+    [sym_instance_of] = STATE(402),
+    [sym_negation] = STATE(402),
+    [sym_if_term] = STATE(402),
+    [sym_conjunction] = STATE(402),
+    [sym_disjunction] = STATE(402),
+    [sym_implication] = STATE(402),
+    [sym_quantified] = STATE(402),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(402),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27236,63 +27755,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [270] = {
-    [sym_special_call] = STATE(769),
-    [sym_prefix_cast] = STATE(769),
-    [sym_unary_expr] = STATE(769),
-    [sym_mul_expr] = STATE(769),
-    [sym_add_expr] = STATE(769),
-    [sym_in_expr] = STATE(769),
-    [sym_comp_term] = STATE(769),
-    [sym_instance_of] = STATE(769),
-    [sym_negation] = STATE(769),
-    [sym_if_term] = STATE(769),
-    [sym_conjunction] = STATE(769),
-    [sym_disjunction] = STATE(769),
-    [sym_implication] = STATE(769),
-    [sym_quantified] = STATE(769),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(769),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [273] = {
+    [sym_special_call] = STATE(1122),
+    [sym_prefix_cast] = STATE(1122),
+    [sym_unary_expr] = STATE(1122),
+    [sym_mul_expr] = STATE(1122),
+    [sym_add_expr] = STATE(1122),
+    [sym_in_expr] = STATE(1122),
+    [sym_comp_term] = STATE(1122),
+    [sym_instance_of] = STATE(1122),
+    [sym_negation] = STATE(1122),
+    [sym_if_term] = STATE(1122),
+    [sym_conjunction] = STATE(1122),
+    [sym_disjunction] = STATE(1122),
+    [sym_implication] = STATE(1122),
+    [sym_quantified] = STATE(1122),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1122),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1786),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -27318,7 +27838,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -27330,56 +27850,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [271] = {
-    [sym_special_call] = STATE(408),
-    [sym_prefix_cast] = STATE(408),
-    [sym_unary_expr] = STATE(408),
-    [sym_mul_expr] = STATE(408),
-    [sym_add_expr] = STATE(408),
-    [sym_in_expr] = STATE(408),
-    [sym_comp_term] = STATE(408),
-    [sym_instance_of] = STATE(408),
-    [sym_negation] = STATE(408),
-    [sym_if_term] = STATE(408),
-    [sym_conjunction] = STATE(408),
-    [sym_disjunction] = STATE(408),
-    [sym_implication] = STATE(408),
-    [sym_quantified] = STATE(408),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(408),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [274] = {
+    [sym_special_call] = STATE(418),
+    [sym_prefix_cast] = STATE(418),
+    [sym_unary_expr] = STATE(418),
+    [sym_mul_expr] = STATE(418),
+    [sym_add_expr] = STATE(418),
+    [sym_in_expr] = STATE(418),
+    [sym_comp_term] = STATE(418),
+    [sym_instance_of] = STATE(418),
+    [sym_negation] = STATE(418),
+    [sym_if_term] = STATE(418),
+    [sym_conjunction] = STATE(418),
+    [sym_disjunction] = STATE(418),
+    [sym_implication] = STATE(418),
+    [sym_quantified] = STATE(418),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(418),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27400,63 +27921,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [272] = {
-    [sym_special_call] = STATE(768),
-    [sym_prefix_cast] = STATE(768),
-    [sym_unary_expr] = STATE(768),
-    [sym_mul_expr] = STATE(768),
-    [sym_add_expr] = STATE(768),
-    [sym_in_expr] = STATE(768),
-    [sym_comp_term] = STATE(768),
-    [sym_instance_of] = STATE(768),
-    [sym_negation] = STATE(768),
-    [sym_if_term] = STATE(768),
-    [sym_conjunction] = STATE(768),
-    [sym_disjunction] = STATE(768),
-    [sym_implication] = STATE(768),
-    [sym_quantified] = STATE(768),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(768),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [275] = {
+    [sym_special_call] = STATE(1064),
+    [sym_prefix_cast] = STATE(1064),
+    [sym_unary_expr] = STATE(1064),
+    [sym_mul_expr] = STATE(1064),
+    [sym_add_expr] = STATE(1064),
+    [sym_in_expr] = STATE(1064),
+    [sym_comp_term] = STATE(1064),
+    [sym_instance_of] = STATE(1064),
+    [sym_negation] = STATE(1064),
+    [sym_if_term] = STATE(1064),
+    [sym_conjunction] = STATE(1064),
+    [sym_disjunction] = STATE(1064),
+    [sym_implication] = STATE(1064),
+    [sym_quantified] = STATE(1064),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1064),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -27482,7 +28004,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -27494,56 +28016,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [273] = {
-    [sym_special_call] = STATE(831),
-    [sym_prefix_cast] = STATE(831),
-    [sym_unary_expr] = STATE(831),
-    [sym_mul_expr] = STATE(831),
-    [sym_add_expr] = STATE(831),
-    [sym_in_expr] = STATE(831),
-    [sym_comp_term] = STATE(831),
-    [sym_instance_of] = STATE(831),
-    [sym_negation] = STATE(831),
-    [sym_if_term] = STATE(831),
-    [sym_conjunction] = STATE(831),
-    [sym_disjunction] = STATE(831),
-    [sym_implication] = STATE(831),
-    [sym_quantified] = STATE(831),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(831),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [276] = {
+    [sym_special_call] = STATE(417),
+    [sym_prefix_cast] = STATE(417),
+    [sym_unary_expr] = STATE(417),
+    [sym_mul_expr] = STATE(417),
+    [sym_add_expr] = STATE(417),
+    [sym_in_expr] = STATE(417),
+    [sym_comp_term] = STATE(417),
+    [sym_instance_of] = STATE(417),
+    [sym_negation] = STATE(417),
+    [sym_if_term] = STATE(417),
+    [sym_conjunction] = STATE(417),
+    [sym_disjunction] = STATE(417),
+    [sym_implication] = STATE(417),
+    [sym_quantified] = STATE(417),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(417),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27564,63 +28087,147 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [274] = {
-    [sym_special_call] = STATE(766),
-    [sym_prefix_cast] = STATE(766),
-    [sym_unary_expr] = STATE(766),
-    [sym_mul_expr] = STATE(766),
-    [sym_add_expr] = STATE(766),
-    [sym_in_expr] = STATE(766),
-    [sym_comp_term] = STATE(766),
-    [sym_instance_of] = STATE(766),
-    [sym_negation] = STATE(766),
-    [sym_if_term] = STATE(766),
-    [sym_conjunction] = STATE(766),
-    [sym_disjunction] = STATE(766),
-    [sym_implication] = STATE(766),
-    [sym_quantified] = STATE(766),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(766),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [277] = {
+    [sym_special_call] = STATE(416),
+    [sym_prefix_cast] = STATE(416),
+    [sym_unary_expr] = STATE(416),
+    [sym_mul_expr] = STATE(416),
+    [sym_add_expr] = STATE(416),
+    [sym_in_expr] = STATE(416),
+    [sym_comp_term] = STATE(416),
+    [sym_instance_of] = STATE(416),
+    [sym_negation] = STATE(416),
+    [sym_if_term] = STATE(416),
+    [sym_conjunction] = STATE(416),
+    [sym_disjunction] = STATE(416),
+    [sym_implication] = STATE(416),
+    [sym_quantified] = STATE(416),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(416),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(511),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
+  },
+  [278] = {
+    [sym_special_call] = STATE(1148),
+    [sym_prefix_cast] = STATE(1148),
+    [sym_unary_expr] = STATE(1148),
+    [sym_mul_expr] = STATE(1148),
+    [sym_add_expr] = STATE(1148),
+    [sym_in_expr] = STATE(1148),
+    [sym_comp_term] = STATE(1148),
+    [sym_instance_of] = STATE(1148),
+    [sym_negation] = STATE(1148),
+    [sym_if_term] = STATE(1148),
+    [sym_conjunction] = STATE(1148),
+    [sym_disjunction] = STATE(1148),
+    [sym_implication] = STATE(1148),
+    [sym_quantified] = STATE(1148),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1148),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -27646,7 +28253,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -27658,56 +28265,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [275] = {
-    [sym_special_call] = STATE(406),
-    [sym_prefix_cast] = STATE(406),
-    [sym_unary_expr] = STATE(406),
-    [sym_mul_expr] = STATE(406),
-    [sym_add_expr] = STATE(406),
-    [sym_in_expr] = STATE(406),
-    [sym_comp_term] = STATE(406),
-    [sym_instance_of] = STATE(406),
-    [sym_negation] = STATE(406),
-    [sym_if_term] = STATE(406),
-    [sym_conjunction] = STATE(406),
-    [sym_disjunction] = STATE(406),
-    [sym_implication] = STATE(406),
-    [sym_quantified] = STATE(406),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(406),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+  [279] = {
+    [sym_special_call] = STATE(1108),
+    [sym_prefix_cast] = STATE(1108),
+    [sym_unary_expr] = STATE(1108),
+    [sym_mul_expr] = STATE(1108),
+    [sym_add_expr] = STATE(1108),
+    [sym_in_expr] = STATE(1108),
+    [sym_comp_term] = STATE(1108),
+    [sym_instance_of] = STATE(1108),
+    [sym_negation] = STATE(1108),
+    [sym_if_term] = STATE(1108),
+    [sym_conjunction] = STATE(1108),
+    [sym_disjunction] = STATE(1108),
+    [sym_implication] = STATE(1108),
+    [sym_quantified] = STATE(1108),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1108),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27728,59 +28336,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [276] = {
-    [sym_special_call] = STATE(1145),
-    [sym_prefix_cast] = STATE(1145),
-    [sym_unary_expr] = STATE(1145),
-    [sym_mul_expr] = STATE(1145),
-    [sym_add_expr] = STATE(1145),
-    [sym_in_expr] = STATE(1145),
-    [sym_comp_term] = STATE(1145),
-    [sym_instance_of] = STATE(1145),
-    [sym_negation] = STATE(1145),
-    [sym_if_term] = STATE(1145),
-    [sym_conjunction] = STATE(1145),
-    [sym_disjunction] = STATE(1145),
-    [sym_implication] = STATE(1145),
-    [sym_quantified] = STATE(1145),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1145),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [280] = {
+    [sym_special_call] = STATE(1022),
+    [sym_prefix_cast] = STATE(1022),
+    [sym_unary_expr] = STATE(1022),
+    [sym_mul_expr] = STATE(1022),
+    [sym_add_expr] = STATE(1022),
+    [sym_in_expr] = STATE(1022),
+    [sym_comp_term] = STATE(1022),
+    [sym_instance_of] = STATE(1022),
+    [sym_negation] = STATE(1022),
+    [sym_if_term] = STATE(1022),
+    [sym_conjunction] = STATE(1022),
+    [sym_disjunction] = STATE(1022),
+    [sym_implication] = STATE(1022),
+    [sym_quantified] = STATE(1022),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1022),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -27822,56 +28431,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [277] = {
-    [sym_special_call] = STATE(376),
-    [sym_prefix_cast] = STATE(376),
-    [sym_unary_expr] = STATE(376),
-    [sym_mul_expr] = STATE(376),
-    [sym_add_expr] = STATE(376),
-    [sym_in_expr] = STATE(376),
-    [sym_comp_term] = STATE(376),
-    [sym_instance_of] = STATE(376),
-    [sym_negation] = STATE(376),
-    [sym_if_term] = STATE(376),
-    [sym_conjunction] = STATE(376),
-    [sym_disjunction] = STATE(376),
-    [sym_implication] = STATE(376),
-    [sym_quantified] = STATE(376),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(376),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+  [281] = {
+    [sym_special_call] = STATE(415),
+    [sym_prefix_cast] = STATE(415),
+    [sym_unary_expr] = STATE(415),
+    [sym_mul_expr] = STATE(415),
+    [sym_add_expr] = STATE(415),
+    [sym_in_expr] = STATE(415),
+    [sym_comp_term] = STATE(415),
+    [sym_instance_of] = STATE(415),
+    [sym_negation] = STATE(415),
+    [sym_if_term] = STATE(415),
+    [sym_conjunction] = STATE(415),
+    [sym_disjunction] = STATE(415),
+    [sym_implication] = STATE(415),
+    [sym_quantified] = STATE(415),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(415),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27892,68 +28502,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [278] = {
-    [sym_special_call] = STATE(397),
-    [sym_prefix_cast] = STATE(397),
-    [sym_unary_expr] = STATE(397),
-    [sym_mul_expr] = STATE(397),
-    [sym_add_expr] = STATE(397),
-    [sym_in_expr] = STATE(397),
-    [sym_comp_term] = STATE(397),
-    [sym_instance_of] = STATE(397),
-    [sym_negation] = STATE(397),
-    [sym_if_term] = STATE(397),
-    [sym_conjunction] = STATE(397),
-    [sym_disjunction] = STATE(397),
-    [sym_implication] = STATE(397),
-    [sym_quantified] = STATE(397),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(397),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+  [282] = {
+    [sym_special_call] = STATE(396),
+    [sym_prefix_cast] = STATE(396),
+    [sym_unary_expr] = STATE(396),
+    [sym_mul_expr] = STATE(396),
+    [sym_add_expr] = STATE(396),
+    [sym_in_expr] = STATE(396),
+    [sym_comp_term] = STATE(396),
+    [sym_instance_of] = STATE(396),
+    [sym_negation] = STATE(396),
+    [sym_if_term] = STATE(396),
+    [sym_conjunction] = STATE(396),
+    [sym_disjunction] = STATE(396),
+    [sym_implication] = STATE(396),
+    [sym_quantified] = STATE(396),
+    [sym_quantifier] = STATE(1907),
+    [sym_call_or_unqual_agg_expr] = STATE(473),
+    [sym_qualified_expr] = STATE(473),
+    [sym_super_ref] = STATE(473),
+    [sym_aggregate] = STATE(473),
+    [sym_range] = STATE(473),
+    [sym_set_literal] = STATE(473),
+    [sym_par_expr] = STATE(473),
+    [sym_expr_annotation] = STATE(473),
+    [sym__exprOrTerm] = STATE(396),
+    [sym__primary] = STATE(473),
+    [sym_literal] = STATE(473),
+    [sym_bool] = STATE(466),
+    [sym_variable] = STATE(473),
+    [sym_unop] = STATE(282),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2003),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(422),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1908),
+    [sym_aritylessPredicateExpr] = STATE(1459),
+    [sym_varName] = STATE(471),
+    [sym_aggId] = STATE(1767),
+    [sym__lower_id] = ACTIONS(501),
+    [anon_sym_LPAREN] = ACTIONS(503),
+    [anon_sym_not] = ACTIONS(505),
+    [anon_sym_if] = ACTIONS(507),
+    [sym_specialId] = ACTIONS(509),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(511),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -27974,63 +28585,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(513),
+    [sym_integer] = ACTIONS(515),
+    [sym_float] = ACTIONS(517),
+    [sym_string] = ACTIONS(517),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(519),
+    [sym_result] = ACTIONS(521),
+    [sym_super] = ACTIONS(523),
+    [sym_this] = ACTIONS(521),
+    [sym_true] = ACTIONS(519),
   },
-  [279] = {
-    [sym_special_call] = STATE(765),
-    [sym_prefix_cast] = STATE(765),
-    [sym_unary_expr] = STATE(765),
-    [sym_mul_expr] = STATE(765),
-    [sym_add_expr] = STATE(765),
-    [sym_in_expr] = STATE(765),
-    [sym_comp_term] = STATE(765),
-    [sym_instance_of] = STATE(765),
-    [sym_negation] = STATE(765),
-    [sym_if_term] = STATE(765),
-    [sym_conjunction] = STATE(765),
-    [sym_disjunction] = STATE(765),
-    [sym_implication] = STATE(765),
-    [sym_quantified] = STATE(765),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(765),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [283] = {
+    [sym_special_call] = STATE(1067),
+    [sym_prefix_cast] = STATE(1067),
+    [sym_unary_expr] = STATE(1067),
+    [sym_mul_expr] = STATE(1067),
+    [sym_add_expr] = STATE(1067),
+    [sym_in_expr] = STATE(1067),
+    [sym_comp_term] = STATE(1067),
+    [sym_instance_of] = STATE(1067),
+    [sym_negation] = STATE(1067),
+    [sym_if_term] = STATE(1067),
+    [sym_conjunction] = STATE(1067),
+    [sym_disjunction] = STATE(1067),
+    [sym_implication] = STATE(1067),
+    [sym_quantified] = STATE(1067),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1067),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -28056,7 +28668,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -28068,56 +28680,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [280] = {
-    [sym_special_call] = STATE(764),
-    [sym_prefix_cast] = STATE(764),
-    [sym_unary_expr] = STATE(764),
-    [sym_mul_expr] = STATE(764),
-    [sym_add_expr] = STATE(764),
-    [sym_in_expr] = STATE(764),
-    [sym_comp_term] = STATE(764),
-    [sym_instance_of] = STATE(764),
-    [sym_negation] = STATE(764),
-    [sym_if_term] = STATE(764),
-    [sym_conjunction] = STATE(764),
-    [sym_disjunction] = STATE(764),
-    [sym_implication] = STATE(764),
-    [sym_quantified] = STATE(764),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(764),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [284] = {
+    [sym_special_call] = STATE(844),
+    [sym_prefix_cast] = STATE(844),
+    [sym_unary_expr] = STATE(844),
+    [sym_mul_expr] = STATE(844),
+    [sym_add_expr] = STATE(844),
+    [sym_in_expr] = STATE(844),
+    [sym_comp_term] = STATE(844),
+    [sym_instance_of] = STATE(844),
+    [sym_negation] = STATE(844),
+    [sym_if_term] = STATE(844),
+    [sym_conjunction] = STATE(844),
+    [sym_disjunction] = STATE(844),
+    [sym_implication] = STATE(844),
+    [sym_quantified] = STATE(844),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(844),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -28138,68 +28751,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [281] = {
-    [sym_special_call] = STATE(405),
-    [sym_prefix_cast] = STATE(405),
-    [sym_unary_expr] = STATE(405),
-    [sym_mul_expr] = STATE(405),
-    [sym_add_expr] = STATE(405),
-    [sym_in_expr] = STATE(405),
-    [sym_comp_term] = STATE(405),
-    [sym_instance_of] = STATE(405),
-    [sym_negation] = STATE(405),
-    [sym_if_term] = STATE(405),
-    [sym_conjunction] = STATE(405),
-    [sym_disjunction] = STATE(405),
-    [sym_implication] = STATE(405),
-    [sym_quantified] = STATE(405),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(405),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
+  [285] = {
+    [sym_special_call] = STATE(847),
+    [sym_prefix_cast] = STATE(847),
+    [sym_unary_expr] = STATE(847),
+    [sym_mul_expr] = STATE(847),
+    [sym_add_expr] = STATE(847),
+    [sym_in_expr] = STATE(847),
+    [sym_comp_term] = STATE(847),
+    [sym_instance_of] = STATE(847),
+    [sym_negation] = STATE(847),
+    [sym_if_term] = STATE(847),
+    [sym_conjunction] = STATE(847),
+    [sym_disjunction] = STATE(847),
+    [sym_implication] = STATE(847),
+    [sym_quantified] = STATE(847),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(847),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
     [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -28220,63 +28834,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [282] = {
-    [sym_special_call] = STATE(750),
-    [sym_prefix_cast] = STATE(750),
-    [sym_unary_expr] = STATE(750),
-    [sym_mul_expr] = STATE(750),
-    [sym_add_expr] = STATE(750),
-    [sym_in_expr] = STATE(750),
-    [sym_comp_term] = STATE(750),
-    [sym_instance_of] = STATE(750),
-    [sym_negation] = STATE(750),
-    [sym_if_term] = STATE(750),
-    [sym_conjunction] = STATE(750),
-    [sym_disjunction] = STATE(750),
-    [sym_implication] = STATE(750),
-    [sym_quantified] = STATE(750),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(750),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [286] = {
+    [sym_special_call] = STATE(987),
+    [sym_prefix_cast] = STATE(987),
+    [sym_unary_expr] = STATE(987),
+    [sym_mul_expr] = STATE(987),
+    [sym_add_expr] = STATE(987),
+    [sym_in_expr] = STATE(987),
+    [sym_comp_term] = STATE(987),
+    [sym_instance_of] = STATE(987),
+    [sym_negation] = STATE(987),
+    [sym_if_term] = STATE(987),
+    [sym_conjunction] = STATE(987),
+    [sym_disjunction] = STATE(987),
+    [sym_implication] = STATE(987),
+    [sym_quantified] = STATE(987),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(987),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -28302,7 +28917,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -28314,56 +28929,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [283] = {
-    [sym_special_call] = STATE(399),
-    [sym_prefix_cast] = STATE(399),
-    [sym_unary_expr] = STATE(399),
-    [sym_mul_expr] = STATE(399),
-    [sym_add_expr] = STATE(399),
-    [sym_in_expr] = STATE(399),
-    [sym_comp_term] = STATE(399),
-    [sym_instance_of] = STATE(399),
-    [sym_negation] = STATE(399),
-    [sym_if_term] = STATE(399),
-    [sym_conjunction] = STATE(399),
-    [sym_disjunction] = STATE(399),
-    [sym_implication] = STATE(399),
-    [sym_quantified] = STATE(399),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(399),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
+  [287] = {
+    [sym_special_call] = STATE(848),
+    [sym_prefix_cast] = STATE(848),
+    [sym_unary_expr] = STATE(848),
+    [sym_mul_expr] = STATE(848),
+    [sym_add_expr] = STATE(848),
+    [sym_in_expr] = STATE(848),
+    [sym_comp_term] = STATE(848),
+    [sym_instance_of] = STATE(848),
+    [sym_negation] = STATE(848),
+    [sym_if_term] = STATE(848),
+    [sym_conjunction] = STATE(848),
+    [sym_disjunction] = STATE(848),
+    [sym_implication] = STATE(848),
+    [sym_quantified] = STATE(848),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(848),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
     [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -28384,68 +29000,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [284] = {
-    [sym_special_call] = STATE(1149),
-    [sym_prefix_cast] = STATE(1149),
-    [sym_unary_expr] = STATE(1149),
-    [sym_mul_expr] = STATE(1149),
-    [sym_add_expr] = STATE(1149),
-    [sym_in_expr] = STATE(1149),
-    [sym_comp_term] = STATE(1149),
-    [sym_instance_of] = STATE(1149),
-    [sym_negation] = STATE(1149),
-    [sym_if_term] = STATE(1149),
-    [sym_conjunction] = STATE(1149),
-    [sym_disjunction] = STATE(1149),
-    [sym_implication] = STATE(1149),
-    [sym_quantified] = STATE(1149),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1149),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [288] = {
+    [sym_special_call] = STATE(849),
+    [sym_prefix_cast] = STATE(849),
+    [sym_unary_expr] = STATE(849),
+    [sym_mul_expr] = STATE(849),
+    [sym_add_expr] = STATE(849),
+    [sym_in_expr] = STATE(849),
+    [sym_comp_term] = STATE(849),
+    [sym_instance_of] = STATE(849),
+    [sym_negation] = STATE(849),
+    [sym_if_term] = STATE(849),
+    [sym_conjunction] = STATE(849),
+    [sym_disjunction] = STATE(849),
+    [sym_implication] = STATE(849),
+    [sym_quantified] = STATE(849),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(849),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -28466,63 +29083,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [285] = {
-    [sym_special_call] = STATE(942),
-    [sym_prefix_cast] = STATE(942),
-    [sym_unary_expr] = STATE(942),
-    [sym_mul_expr] = STATE(942),
-    [sym_add_expr] = STATE(942),
-    [sym_in_expr] = STATE(942),
-    [sym_comp_term] = STATE(942),
-    [sym_instance_of] = STATE(942),
-    [sym_negation] = STATE(942),
-    [sym_if_term] = STATE(942),
-    [sym_conjunction] = STATE(942),
-    [sym_disjunction] = STATE(942),
-    [sym_implication] = STATE(942),
-    [sym_quantified] = STATE(942),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(942),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [289] = {
+    [sym_special_call] = STATE(1059),
+    [sym_prefix_cast] = STATE(1059),
+    [sym_unary_expr] = STATE(1059),
+    [sym_mul_expr] = STATE(1059),
+    [sym_add_expr] = STATE(1059),
+    [sym_in_expr] = STATE(1059),
+    [sym_comp_term] = STATE(1059),
+    [sym_instance_of] = STATE(1059),
+    [sym_negation] = STATE(1059),
+    [sym_if_term] = STATE(1059),
+    [sym_conjunction] = STATE(1059),
+    [sym_disjunction] = STATE(1059),
+    [sym_implication] = STATE(1059),
+    [sym_quantified] = STATE(1059),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1059),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -28548,7 +29166,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -28560,56 +29178,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [286] = {
-    [sym_special_call] = STATE(956),
-    [sym_prefix_cast] = STATE(956),
-    [sym_unary_expr] = STATE(956),
-    [sym_mul_expr] = STATE(956),
-    [sym_add_expr] = STATE(956),
-    [sym_in_expr] = STATE(956),
-    [sym_comp_term] = STATE(956),
-    [sym_instance_of] = STATE(956),
-    [sym_negation] = STATE(956),
-    [sym_if_term] = STATE(956),
-    [sym_conjunction] = STATE(956),
-    [sym_disjunction] = STATE(956),
-    [sym_implication] = STATE(956),
-    [sym_quantified] = STATE(956),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(956),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [290] = {
+    [sym_special_call] = STATE(851),
+    [sym_prefix_cast] = STATE(851),
+    [sym_unary_expr] = STATE(851),
+    [sym_mul_expr] = STATE(851),
+    [sym_add_expr] = STATE(851),
+    [sym_in_expr] = STATE(851),
+    [sym_comp_term] = STATE(851),
+    [sym_instance_of] = STATE(851),
+    [sym_negation] = STATE(851),
+    [sym_if_term] = STATE(851),
+    [sym_conjunction] = STATE(851),
+    [sym_disjunction] = STATE(851),
+    [sym_implication] = STATE(851),
+    [sym_quantified] = STATE(851),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(851),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -28630,68 +29249,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [287] = {
-    [sym_special_call] = STATE(1155),
-    [sym_prefix_cast] = STATE(1155),
-    [sym_unary_expr] = STATE(1155),
-    [sym_mul_expr] = STATE(1155),
-    [sym_add_expr] = STATE(1155),
-    [sym_in_expr] = STATE(1155),
-    [sym_comp_term] = STATE(1155),
-    [sym_instance_of] = STATE(1155),
-    [sym_negation] = STATE(1155),
-    [sym_if_term] = STATE(1155),
-    [sym_conjunction] = STATE(1155),
-    [sym_disjunction] = STATE(1155),
-    [sym_implication] = STATE(1155),
-    [sym_quantified] = STATE(1155),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1155),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [291] = {
+    [sym_special_call] = STATE(852),
+    [sym_prefix_cast] = STATE(852),
+    [sym_unary_expr] = STATE(852),
+    [sym_mul_expr] = STATE(852),
+    [sym_add_expr] = STATE(852),
+    [sym_in_expr] = STATE(852),
+    [sym_comp_term] = STATE(852),
+    [sym_instance_of] = STATE(852),
+    [sym_negation] = STATE(852),
+    [sym_if_term] = STATE(852),
+    [sym_conjunction] = STATE(852),
+    [sym_disjunction] = STATE(852),
+    [sym_implication] = STATE(852),
+    [sym_quantified] = STATE(852),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(852),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -28712,70 +29332,71 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [288] = {
-    [sym_special_call] = STATE(403),
-    [sym_prefix_cast] = STATE(403),
-    [sym_unary_expr] = STATE(403),
-    [sym_mul_expr] = STATE(403),
-    [sym_add_expr] = STATE(403),
-    [sym_in_expr] = STATE(403),
-    [sym_comp_term] = STATE(403),
-    [sym_instance_of] = STATE(403),
-    [sym_negation] = STATE(403),
-    [sym_if_term] = STATE(403),
-    [sym_conjunction] = STATE(403),
-    [sym_disjunction] = STATE(403),
-    [sym_implication] = STATE(403),
-    [sym_quantified] = STATE(403),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(403),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
+  [292] = {
+    [sym_special_call] = STATE(853),
+    [sym_prefix_cast] = STATE(853),
+    [sym_unary_expr] = STATE(853),
+    [sym_mul_expr] = STATE(853),
+    [sym_add_expr] = STATE(853),
+    [sym_in_expr] = STATE(853),
+    [sym_comp_term] = STATE(853),
+    [sym_instance_of] = STATE(853),
+    [sym_negation] = STATE(853),
+    [sym_if_term] = STATE(853),
+    [sym_conjunction] = STATE(853),
+    [sym_disjunction] = STATE(853),
+    [sym_implication] = STATE(853),
+    [sym_quantified] = STATE(853),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(853),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1881),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(539),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
     [anon_sym_date] = ACTIONS(27),
     [anon_sym_float] = ACTIONS(27),
@@ -28794,63 +29415,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [289] = {
-    [sym_special_call] = STATE(1053),
-    [sym_prefix_cast] = STATE(1053),
-    [sym_unary_expr] = STATE(1053),
-    [sym_mul_expr] = STATE(1053),
-    [sym_add_expr] = STATE(1053),
-    [sym_in_expr] = STATE(1053),
-    [sym_comp_term] = STATE(1053),
-    [sym_instance_of] = STATE(1053),
-    [sym_negation] = STATE(1053),
-    [sym_if_term] = STATE(1053),
-    [sym_conjunction] = STATE(1053),
-    [sym_disjunction] = STATE(1053),
-    [sym_implication] = STATE(1053),
-    [sym_quantified] = STATE(1053),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1053),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [293] = {
+    [sym_special_call] = STATE(867),
+    [sym_prefix_cast] = STATE(867),
+    [sym_unary_expr] = STATE(867),
+    [sym_mul_expr] = STATE(867),
+    [sym_add_expr] = STATE(867),
+    [sym_in_expr] = STATE(867),
+    [sym_comp_term] = STATE(867),
+    [sym_instance_of] = STATE(867),
+    [sym_negation] = STATE(867),
+    [sym_if_term] = STATE(867),
+    [sym_conjunction] = STATE(867),
+    [sym_disjunction] = STATE(867),
+    [sym_implication] = STATE(867),
+    [sym_quantified] = STATE(867),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(867),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -28876,7 +29498,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -28888,56 +29510,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [290] = {
-    [sym_special_call] = STATE(404),
-    [sym_prefix_cast] = STATE(404),
-    [sym_unary_expr] = STATE(404),
-    [sym_mul_expr] = STATE(404),
-    [sym_add_expr] = STATE(404),
-    [sym_in_expr] = STATE(404),
-    [sym_comp_term] = STATE(404),
-    [sym_instance_of] = STATE(404),
-    [sym_negation] = STATE(404),
-    [sym_if_term] = STATE(404),
-    [sym_conjunction] = STATE(404),
-    [sym_disjunction] = STATE(404),
-    [sym_implication] = STATE(404),
-    [sym_quantified] = STATE(404),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(404),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
+  [294] = {
+    [sym_special_call] = STATE(854),
+    [sym_prefix_cast] = STATE(854),
+    [sym_unary_expr] = STATE(854),
+    [sym_mul_expr] = STATE(854),
+    [sym_add_expr] = STATE(854),
+    [sym_in_expr] = STATE(854),
+    [sym_comp_term] = STATE(854),
+    [sym_instance_of] = STATE(854),
+    [sym_negation] = STATE(854),
+    [sym_if_term] = STATE(854),
+    [sym_conjunction] = STATE(854),
+    [sym_disjunction] = STATE(854),
+    [sym_implication] = STATE(854),
+    [sym_quantified] = STATE(854),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(854),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
     [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -28958,68 +29581,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [291] = {
-    [sym_special_call] = STATE(411),
-    [sym_prefix_cast] = STATE(411),
-    [sym_unary_expr] = STATE(411),
-    [sym_mul_expr] = STATE(411),
-    [sym_add_expr] = STATE(411),
-    [sym_in_expr] = STATE(411),
-    [sym_comp_term] = STATE(411),
-    [sym_instance_of] = STATE(411),
-    [sym_negation] = STATE(411),
-    [sym_if_term] = STATE(411),
-    [sym_conjunction] = STATE(411),
-    [sym_disjunction] = STATE(411),
-    [sym_implication] = STATE(411),
-    [sym_quantified] = STATE(411),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(411),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
+  [295] = {
+    [sym_special_call] = STATE(856),
+    [sym_prefix_cast] = STATE(856),
+    [sym_unary_expr] = STATE(856),
+    [sym_mul_expr] = STATE(856),
+    [sym_add_expr] = STATE(856),
+    [sym_in_expr] = STATE(856),
+    [sym_comp_term] = STATE(856),
+    [sym_instance_of] = STATE(856),
+    [sym_negation] = STATE(856),
+    [sym_if_term] = STATE(856),
+    [sym_conjunction] = STATE(856),
+    [sym_disjunction] = STATE(856),
+    [sym_implication] = STATE(856),
+    [sym_quantified] = STATE(856),
+    [sym_quantifier] = STATE(1880),
+    [sym_call_or_unqual_agg_expr] = STATE(954),
+    [sym_qualified_expr] = STATE(954),
+    [sym_super_ref] = STATE(954),
+    [sym_aggregate] = STATE(954),
+    [sym_range] = STATE(954),
+    [sym_set_literal] = STATE(954),
+    [sym_par_expr] = STATE(954),
+    [sym_expr_annotation] = STATE(954),
+    [sym__exprOrTerm] = STATE(856),
+    [sym__primary] = STATE(954),
+    [sym_literal] = STATE(954),
+    [sym_bool] = STATE(962),
+    [sym_variable] = STATE(954),
+    [sym_unop] = STATE(295),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2002),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(864),
+    [sym_className] = STATE(1433),
     [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_aritylessPredicateExpr] = STATE(1458),
+    [sym_varName] = STATE(959),
+    [sym_aggId] = STATE(1758),
+    [sym__lower_id] = ACTIONS(529),
+    [anon_sym_LPAREN] = ACTIONS(531),
+    [anon_sym_not] = ACTIONS(533),
+    [anon_sym_if] = ACTIONS(535),
+    [sym_specialId] = ACTIONS(537),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(539),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29040,63 +29664,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(541),
+    [sym_integer] = ACTIONS(543),
+    [sym_float] = ACTIONS(545),
+    [sym_string] = ACTIONS(545),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(547),
+    [sym_result] = ACTIONS(549),
+    [sym_super] = ACTIONS(551),
+    [sym_this] = ACTIONS(549),
+    [sym_true] = ACTIONS(547),
   },
-  [292] = {
-    [sym_special_call] = STATE(932),
-    [sym_prefix_cast] = STATE(932),
-    [sym_unary_expr] = STATE(932),
-    [sym_mul_expr] = STATE(932),
-    [sym_add_expr] = STATE(932),
-    [sym_in_expr] = STATE(932),
-    [sym_comp_term] = STATE(932),
-    [sym_instance_of] = STATE(932),
-    [sym_negation] = STATE(932),
-    [sym_if_term] = STATE(932),
-    [sym_conjunction] = STATE(932),
-    [sym_disjunction] = STATE(932),
-    [sym_implication] = STATE(932),
-    [sym_quantified] = STATE(932),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(932),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [296] = {
+    [sym_special_call] = STATE(1048),
+    [sym_prefix_cast] = STATE(1048),
+    [sym_unary_expr] = STATE(1048),
+    [sym_mul_expr] = STATE(1048),
+    [sym_add_expr] = STATE(1048),
+    [sym_in_expr] = STATE(1048),
+    [sym_comp_term] = STATE(1048),
+    [sym_instance_of] = STATE(1048),
+    [sym_negation] = STATE(1048),
+    [sym_if_term] = STATE(1048),
+    [sym_conjunction] = STATE(1048),
+    [sym_disjunction] = STATE(1048),
+    [sym_implication] = STATE(1048),
+    [sym_quantified] = STATE(1048),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1048),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -29122,7 +29747,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -29134,56 +29759,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [293] = {
-    [sym_special_call] = STATE(845),
-    [sym_prefix_cast] = STATE(845),
-    [sym_unary_expr] = STATE(845),
-    [sym_mul_expr] = STATE(845),
-    [sym_add_expr] = STATE(845),
-    [sym_in_expr] = STATE(845),
-    [sym_comp_term] = STATE(845),
-    [sym_instance_of] = STATE(845),
-    [sym_negation] = STATE(845),
-    [sym_if_term] = STATE(845),
-    [sym_conjunction] = STATE(845),
-    [sym_disjunction] = STATE(845),
-    [sym_implication] = STATE(845),
-    [sym_quantified] = STATE(845),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(845),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
+  [297] = {
+    [sym_special_call] = STATE(374),
+    [sym_prefix_cast] = STATE(374),
+    [sym_unary_expr] = STATE(374),
+    [sym_mul_expr] = STATE(374),
+    [sym_add_expr] = STATE(374),
+    [sym_in_expr] = STATE(374),
+    [sym_comp_term] = STATE(374),
+    [sym_instance_of] = STATE(374),
+    [sym_negation] = STATE(374),
+    [sym_if_term] = STATE(374),
+    [sym_conjunction] = STATE(374),
+    [sym_disjunction] = STATE(374),
+    [sym_implication] = STATE(374),
+    [sym_quantified] = STATE(374),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(374),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
     [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29204,68 +29830,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [294] = {
-    [sym_special_call] = STATE(1130),
-    [sym_prefix_cast] = STATE(1130),
-    [sym_unary_expr] = STATE(1130),
-    [sym_mul_expr] = STATE(1130),
-    [sym_add_expr] = STATE(1130),
-    [sym_in_expr] = STATE(1130),
-    [sym_comp_term] = STATE(1130),
-    [sym_instance_of] = STATE(1130),
-    [sym_negation] = STATE(1130),
-    [sym_if_term] = STATE(1130),
-    [sym_conjunction] = STATE(1130),
-    [sym_disjunction] = STATE(1130),
-    [sym_implication] = STATE(1130),
-    [sym_quantified] = STATE(1130),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1130),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [298] = {
+    [sym_special_call] = STATE(408),
+    [sym_prefix_cast] = STATE(408),
+    [sym_unary_expr] = STATE(408),
+    [sym_mul_expr] = STATE(408),
+    [sym_add_expr] = STATE(408),
+    [sym_in_expr] = STATE(408),
+    [sym_comp_term] = STATE(408),
+    [sym_instance_of] = STATE(408),
+    [sym_negation] = STATE(408),
+    [sym_if_term] = STATE(408),
+    [sym_conjunction] = STATE(408),
+    [sym_disjunction] = STATE(408),
+    [sym_implication] = STATE(408),
+    [sym_quantified] = STATE(408),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(408),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29286,68 +29913,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [295] = {
-    [sym_special_call] = STATE(381),
-    [sym_prefix_cast] = STATE(381),
-    [sym_unary_expr] = STATE(381),
-    [sym_mul_expr] = STATE(381),
-    [sym_add_expr] = STATE(381),
-    [sym_in_expr] = STATE(381),
-    [sym_comp_term] = STATE(381),
-    [sym_instance_of] = STATE(381),
-    [sym_negation] = STATE(381),
-    [sym_if_term] = STATE(381),
-    [sym_conjunction] = STATE(381),
-    [sym_disjunction] = STATE(381),
-    [sym_implication] = STATE(381),
-    [sym_quantified] = STATE(381),
-    [sym_quantifier] = STATE(1836),
-    [sym_call_or_unqual_agg_expr] = STATE(584),
-    [sym_qualified_expr] = STATE(584),
-    [sym_super_ref] = STATE(584),
-    [sym_aggregate] = STATE(584),
-    [sym_range] = STATE(584),
-    [sym_set_literal] = STATE(584),
-    [sym_par_expr] = STATE(584),
-    [sym_expr_annotation] = STATE(584),
-    [sym__exprOrTerm] = STATE(381),
-    [sym__primary] = STATE(584),
-    [sym_literal] = STATE(584),
-    [sym_bool] = STATE(590),
-    [sym_variable] = STATE(584),
-    [sym_unop] = STATE(295),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1999),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [299] = {
+    [sym_special_call] = STATE(395),
+    [sym_prefix_cast] = STATE(395),
+    [sym_unary_expr] = STATE(395),
+    [sym_mul_expr] = STATE(395),
+    [sym_add_expr] = STATE(395),
+    [sym_in_expr] = STATE(395),
+    [sym_comp_term] = STATE(395),
+    [sym_instance_of] = STATE(395),
+    [sym_negation] = STATE(395),
+    [sym_if_term] = STATE(395),
+    [sym_conjunction] = STATE(395),
+    [sym_disjunction] = STATE(395),
+    [sym_implication] = STATE(395),
+    [sym_quantified] = STATE(395),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(395),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(421),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1814),
-    [sym_aritylessPredicateExpr] = STATE(1460),
-    [sym_varName] = STATE(587),
-    [sym_aggId] = STATE(1786),
-    [sym__lower_id] = ACTIONS(319),
-    [anon_sym_LPAREN] = ACTIONS(321),
-    [anon_sym_not] = ACTIONS(323),
-    [anon_sym_if] = ACTIONS(325),
-    [sym_specialId] = ACTIONS(327),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(329),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29368,68 +29996,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(331),
-    [sym_integer] = ACTIONS(333),
-    [sym_float] = ACTIONS(335),
-    [sym_string] = ACTIONS(335),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(337),
-    [sym_result] = ACTIONS(339),
-    [sym_super] = ACTIONS(341),
-    [sym_this] = ACTIONS(339),
-    [sym_true] = ACTIONS(337),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [296] = {
-    [sym_special_call] = STATE(1159),
-    [sym_prefix_cast] = STATE(1159),
-    [sym_unary_expr] = STATE(1159),
-    [sym_mul_expr] = STATE(1159),
-    [sym_add_expr] = STATE(1159),
-    [sym_in_expr] = STATE(1159),
-    [sym_comp_term] = STATE(1159),
-    [sym_instance_of] = STATE(1159),
-    [sym_negation] = STATE(1159),
-    [sym_if_term] = STATE(1159),
-    [sym_conjunction] = STATE(1159),
-    [sym_disjunction] = STATE(1159),
-    [sym_implication] = STATE(1159),
-    [sym_quantified] = STATE(1159),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1159),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [300] = {
+    [sym_special_call] = STATE(394),
+    [sym_prefix_cast] = STATE(394),
+    [sym_unary_expr] = STATE(394),
+    [sym_mul_expr] = STATE(394),
+    [sym_add_expr] = STATE(394),
+    [sym_in_expr] = STATE(394),
+    [sym_comp_term] = STATE(394),
+    [sym_instance_of] = STATE(394),
+    [sym_negation] = STATE(394),
+    [sym_if_term] = STATE(394),
+    [sym_conjunction] = STATE(394),
+    [sym_disjunction] = STATE(394),
+    [sym_implication] = STATE(394),
+    [sym_quantified] = STATE(394),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(394),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29450,68 +30079,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [297] = {
-    [sym_special_call] = STATE(833),
-    [sym_prefix_cast] = STATE(833),
-    [sym_unary_expr] = STATE(833),
-    [sym_mul_expr] = STATE(833),
-    [sym_add_expr] = STATE(833),
-    [sym_in_expr] = STATE(833),
-    [sym_comp_term] = STATE(833),
-    [sym_instance_of] = STATE(833),
-    [sym_negation] = STATE(833),
-    [sym_if_term] = STATE(833),
-    [sym_conjunction] = STATE(833),
-    [sym_disjunction] = STATE(833),
-    [sym_implication] = STATE(833),
-    [sym_quantified] = STATE(833),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(833),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
+  [301] = {
+    [sym_special_call] = STATE(393),
+    [sym_prefix_cast] = STATE(393),
+    [sym_unary_expr] = STATE(393),
+    [sym_mul_expr] = STATE(393),
+    [sym_add_expr] = STATE(393),
+    [sym_in_expr] = STATE(393),
+    [sym_comp_term] = STATE(393),
+    [sym_instance_of] = STATE(393),
+    [sym_negation] = STATE(393),
+    [sym_if_term] = STATE(393),
+    [sym_conjunction] = STATE(393),
+    [sym_disjunction] = STATE(393),
+    [sym_implication] = STATE(393),
+    [sym_quantified] = STATE(393),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(393),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
     [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29532,68 +30162,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [298] = {
-    [sym_special_call] = STATE(400),
-    [sym_prefix_cast] = STATE(400),
-    [sym_unary_expr] = STATE(400),
-    [sym_mul_expr] = STATE(400),
-    [sym_add_expr] = STATE(400),
-    [sym_in_expr] = STATE(400),
-    [sym_comp_term] = STATE(400),
-    [sym_instance_of] = STATE(400),
-    [sym_negation] = STATE(400),
-    [sym_if_term] = STATE(400),
-    [sym_conjunction] = STATE(400),
-    [sym_disjunction] = STATE(400),
-    [sym_implication] = STATE(400),
-    [sym_quantified] = STATE(400),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(400),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [302] = {
+    [sym_special_call] = STATE(392),
+    [sym_prefix_cast] = STATE(392),
+    [sym_unary_expr] = STATE(392),
+    [sym_mul_expr] = STATE(392),
+    [sym_add_expr] = STATE(392),
+    [sym_in_expr] = STATE(392),
+    [sym_comp_term] = STATE(392),
+    [sym_instance_of] = STATE(392),
+    [sym_negation] = STATE(392),
+    [sym_if_term] = STATE(392),
+    [sym_conjunction] = STATE(392),
+    [sym_disjunction] = STATE(392),
+    [sym_implication] = STATE(392),
+    [sym_quantified] = STATE(392),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(392),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29614,68 +30245,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [299] = {
-    [sym_special_call] = STATE(1162),
-    [sym_prefix_cast] = STATE(1162),
-    [sym_unary_expr] = STATE(1162),
-    [sym_mul_expr] = STATE(1162),
-    [sym_add_expr] = STATE(1162),
-    [sym_in_expr] = STATE(1162),
-    [sym_comp_term] = STATE(1162),
-    [sym_instance_of] = STATE(1162),
-    [sym_negation] = STATE(1162),
-    [sym_if_term] = STATE(1162),
-    [sym_conjunction] = STATE(1162),
-    [sym_disjunction] = STATE(1162),
-    [sym_implication] = STATE(1162),
-    [sym_quantified] = STATE(1162),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1162),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [303] = {
+    [sym_special_call] = STATE(373),
+    [sym_prefix_cast] = STATE(373),
+    [sym_unary_expr] = STATE(373),
+    [sym_mul_expr] = STATE(373),
+    [sym_add_expr] = STATE(373),
+    [sym_in_expr] = STATE(373),
+    [sym_comp_term] = STATE(373),
+    [sym_instance_of] = STATE(373),
+    [sym_negation] = STATE(373),
+    [sym_if_term] = STATE(373),
+    [sym_conjunction] = STATE(373),
+    [sym_disjunction] = STATE(373),
+    [sym_implication] = STATE(373),
+    [sym_quantified] = STATE(373),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(373),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29696,68 +30328,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [300] = {
-    [sym_special_call] = STATE(1177),
-    [sym_prefix_cast] = STATE(1177),
-    [sym_unary_expr] = STATE(1177),
-    [sym_mul_expr] = STATE(1177),
-    [sym_add_expr] = STATE(1177),
-    [sym_in_expr] = STATE(1177),
-    [sym_comp_term] = STATE(1177),
-    [sym_instance_of] = STATE(1177),
-    [sym_negation] = STATE(1177),
-    [sym_if_term] = STATE(1177),
-    [sym_conjunction] = STATE(1177),
-    [sym_disjunction] = STATE(1177),
-    [sym_implication] = STATE(1177),
-    [sym_quantified] = STATE(1177),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1177),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [304] = {
+    [sym_special_call] = STATE(390),
+    [sym_prefix_cast] = STATE(390),
+    [sym_unary_expr] = STATE(390),
+    [sym_mul_expr] = STATE(390),
+    [sym_add_expr] = STATE(390),
+    [sym_in_expr] = STATE(390),
+    [sym_comp_term] = STATE(390),
+    [sym_instance_of] = STATE(390),
+    [sym_negation] = STATE(390),
+    [sym_if_term] = STATE(390),
+    [sym_conjunction] = STATE(390),
+    [sym_disjunction] = STATE(390),
+    [sym_implication] = STATE(390),
+    [sym_quantified] = STATE(390),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(390),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29778,63 +30411,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [301] = {
-    [sym_special_call] = STATE(1119),
-    [sym_prefix_cast] = STATE(1119),
-    [sym_unary_expr] = STATE(1119),
-    [sym_mul_expr] = STATE(1119),
-    [sym_add_expr] = STATE(1119),
-    [sym_in_expr] = STATE(1119),
-    [sym_comp_term] = STATE(1119),
-    [sym_instance_of] = STATE(1119),
-    [sym_negation] = STATE(1119),
-    [sym_if_term] = STATE(1119),
-    [sym_conjunction] = STATE(1119),
-    [sym_disjunction] = STATE(1119),
-    [sym_implication] = STATE(1119),
-    [sym_quantified] = STATE(1119),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1119),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [305] = {
+    [sym_special_call] = STATE(865),
+    [sym_prefix_cast] = STATE(865),
+    [sym_unary_expr] = STATE(865),
+    [sym_mul_expr] = STATE(865),
+    [sym_add_expr] = STATE(865),
+    [sym_in_expr] = STATE(865),
+    [sym_comp_term] = STATE(865),
+    [sym_instance_of] = STATE(865),
+    [sym_negation] = STATE(865),
+    [sym_if_term] = STATE(865),
+    [sym_conjunction] = STATE(865),
+    [sym_disjunction] = STATE(865),
+    [sym_implication] = STATE(865),
+    [sym_quantified] = STATE(865),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(865),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1766),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -29860,7 +30494,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -29872,56 +30506,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [302] = {
-    [sym_special_call] = STATE(1095),
-    [sym_prefix_cast] = STATE(1095),
-    [sym_unary_expr] = STATE(1095),
-    [sym_mul_expr] = STATE(1095),
-    [sym_add_expr] = STATE(1095),
-    [sym_in_expr] = STATE(1095),
-    [sym_comp_term] = STATE(1095),
-    [sym_instance_of] = STATE(1095),
-    [sym_negation] = STATE(1095),
-    [sym_if_term] = STATE(1095),
-    [sym_conjunction] = STATE(1095),
-    [sym_disjunction] = STATE(1095),
-    [sym_implication] = STATE(1095),
-    [sym_quantified] = STATE(1095),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1095),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [306] = {
+    [sym_special_call] = STATE(405),
+    [sym_prefix_cast] = STATE(405),
+    [sym_unary_expr] = STATE(405),
+    [sym_mul_expr] = STATE(405),
+    [sym_add_expr] = STATE(405),
+    [sym_in_expr] = STATE(405),
+    [sym_comp_term] = STATE(405),
+    [sym_instance_of] = STATE(405),
+    [sym_negation] = STATE(405),
+    [sym_if_term] = STATE(405),
+    [sym_conjunction] = STATE(405),
+    [sym_disjunction] = STATE(405),
+    [sym_implication] = STATE(405),
+    [sym_quantified] = STATE(405),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(405),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -29942,68 +30577,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [303] = {
-    [sym_special_call] = STATE(898),
-    [sym_prefix_cast] = STATE(898),
-    [sym_unary_expr] = STATE(898),
-    [sym_mul_expr] = STATE(898),
-    [sym_add_expr] = STATE(898),
-    [sym_in_expr] = STATE(898),
-    [sym_comp_term] = STATE(898),
-    [sym_instance_of] = STATE(898),
-    [sym_negation] = STATE(898),
-    [sym_if_term] = STATE(898),
-    [sym_conjunction] = STATE(898),
-    [sym_disjunction] = STATE(898),
-    [sym_implication] = STATE(898),
-    [sym_quantified] = STATE(898),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(898),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [307] = {
+    [sym_special_call] = STATE(389),
+    [sym_prefix_cast] = STATE(389),
+    [sym_unary_expr] = STATE(389),
+    [sym_mul_expr] = STATE(389),
+    [sym_add_expr] = STATE(389),
+    [sym_in_expr] = STATE(389),
+    [sym_comp_term] = STATE(389),
+    [sym_instance_of] = STATE(389),
+    [sym_negation] = STATE(389),
+    [sym_if_term] = STATE(389),
+    [sym_conjunction] = STATE(389),
+    [sym_disjunction] = STATE(389),
+    [sym_implication] = STATE(389),
+    [sym_quantified] = STATE(389),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(389),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1998),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30024,68 +30660,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [304] = {
-    [sym_special_call] = STATE(840),
-    [sym_prefix_cast] = STATE(840),
-    [sym_unary_expr] = STATE(840),
-    [sym_mul_expr] = STATE(840),
-    [sym_add_expr] = STATE(840),
-    [sym_in_expr] = STATE(840),
-    [sym_comp_term] = STATE(840),
-    [sym_instance_of] = STATE(840),
-    [sym_negation] = STATE(840),
-    [sym_if_term] = STATE(840),
-    [sym_conjunction] = STATE(840),
-    [sym_disjunction] = STATE(840),
-    [sym_implication] = STATE(840),
-    [sym_quantified] = STATE(840),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(840),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [308] = {
+    [sym_special_call] = STATE(381),
+    [sym_prefix_cast] = STATE(381),
+    [sym_unary_expr] = STATE(381),
+    [sym_mul_expr] = STATE(381),
+    [sym_add_expr] = STATE(381),
+    [sym_in_expr] = STATE(381),
+    [sym_comp_term] = STATE(381),
+    [sym_instance_of] = STATE(381),
+    [sym_negation] = STATE(381),
+    [sym_if_term] = STATE(381),
+    [sym_conjunction] = STATE(381),
+    [sym_disjunction] = STATE(381),
+    [sym_implication] = STATE(381),
+    [sym_quantified] = STATE(381),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(381),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30106,68 +30743,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [305] = {
-    [sym_special_call] = STATE(849),
-    [sym_prefix_cast] = STATE(849),
-    [sym_unary_expr] = STATE(849),
-    [sym_mul_expr] = STATE(849),
-    [sym_add_expr] = STATE(849),
-    [sym_in_expr] = STATE(849),
-    [sym_comp_term] = STATE(849),
-    [sym_instance_of] = STATE(849),
-    [sym_negation] = STATE(849),
-    [sym_if_term] = STATE(849),
-    [sym_conjunction] = STATE(849),
-    [sym_disjunction] = STATE(849),
-    [sym_implication] = STATE(849),
-    [sym_quantified] = STATE(849),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(849),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [309] = {
+    [sym_special_call] = STATE(380),
+    [sym_prefix_cast] = STATE(380),
+    [sym_unary_expr] = STATE(380),
+    [sym_mul_expr] = STATE(380),
+    [sym_add_expr] = STATE(380),
+    [sym_in_expr] = STATE(380),
+    [sym_comp_term] = STATE(380),
+    [sym_instance_of] = STATE(380),
+    [sym_negation] = STATE(380),
+    [sym_if_term] = STATE(380),
+    [sym_conjunction] = STATE(380),
+    [sym_disjunction] = STATE(380),
+    [sym_implication] = STATE(380),
+    [sym_quantified] = STATE(380),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(380),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30188,63 +30826,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [306] = {
-    [sym_special_call] = STATE(1143),
-    [sym_prefix_cast] = STATE(1143),
-    [sym_unary_expr] = STATE(1143),
-    [sym_mul_expr] = STATE(1143),
-    [sym_add_expr] = STATE(1143),
-    [sym_in_expr] = STATE(1143),
-    [sym_comp_term] = STATE(1143),
-    [sym_instance_of] = STATE(1143),
-    [sym_negation] = STATE(1143),
-    [sym_if_term] = STATE(1143),
-    [sym_conjunction] = STATE(1143),
-    [sym_disjunction] = STATE(1143),
-    [sym_implication] = STATE(1143),
-    [sym_quantified] = STATE(1143),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1143),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [310] = {
+    [sym_special_call] = STATE(1116),
+    [sym_prefix_cast] = STATE(1116),
+    [sym_unary_expr] = STATE(1116),
+    [sym_mul_expr] = STATE(1116),
+    [sym_add_expr] = STATE(1116),
+    [sym_in_expr] = STATE(1116),
+    [sym_comp_term] = STATE(1116),
+    [sym_instance_of] = STATE(1116),
+    [sym_negation] = STATE(1116),
+    [sym_if_term] = STATE(1116),
+    [sym_conjunction] = STATE(1116),
+    [sym_disjunction] = STATE(1116),
+    [sym_implication] = STATE(1116),
+    [sym_quantified] = STATE(1116),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1116),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -30270,7 +30909,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -30282,56 +30921,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [307] = {
-    [sym_special_call] = STATE(1148),
-    [sym_prefix_cast] = STATE(1148),
-    [sym_unary_expr] = STATE(1148),
-    [sym_mul_expr] = STATE(1148),
-    [sym_add_expr] = STATE(1148),
-    [sym_in_expr] = STATE(1148),
-    [sym_comp_term] = STATE(1148),
-    [sym_instance_of] = STATE(1148),
-    [sym_negation] = STATE(1148),
-    [sym_if_term] = STATE(1148),
-    [sym_conjunction] = STATE(1148),
-    [sym_disjunction] = STATE(1148),
-    [sym_implication] = STATE(1148),
-    [sym_quantified] = STATE(1148),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1148),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [311] = {
+    [sym_special_call] = STATE(401),
+    [sym_prefix_cast] = STATE(401),
+    [sym_unary_expr] = STATE(401),
+    [sym_mul_expr] = STATE(401),
+    [sym_add_expr] = STATE(401),
+    [sym_in_expr] = STATE(401),
+    [sym_comp_term] = STATE(401),
+    [sym_instance_of] = STATE(401),
+    [sym_negation] = STATE(401),
+    [sym_if_term] = STATE(401),
+    [sym_conjunction] = STATE(401),
+    [sym_disjunction] = STATE(401),
+    [sym_implication] = STATE(401),
+    [sym_quantified] = STATE(401),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(401),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30352,68 +30992,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [308] = {
-    [sym_special_call] = STATE(1044),
-    [sym_prefix_cast] = STATE(1044),
-    [sym_unary_expr] = STATE(1044),
-    [sym_mul_expr] = STATE(1044),
-    [sym_add_expr] = STATE(1044),
-    [sym_in_expr] = STATE(1044),
-    [sym_comp_term] = STATE(1044),
-    [sym_instance_of] = STATE(1044),
-    [sym_negation] = STATE(1044),
-    [sym_if_term] = STATE(1044),
-    [sym_conjunction] = STATE(1044),
-    [sym_disjunction] = STATE(1044),
-    [sym_implication] = STATE(1044),
-    [sym_quantified] = STATE(1044),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1044),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1761),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [312] = {
+    [sym_special_call] = STATE(400),
+    [sym_prefix_cast] = STATE(400),
+    [sym_unary_expr] = STATE(400),
+    [sym_mul_expr] = STATE(400),
+    [sym_add_expr] = STATE(400),
+    [sym_in_expr] = STATE(400),
+    [sym_comp_term] = STATE(400),
+    [sym_instance_of] = STATE(400),
+    [sym_negation] = STATE(400),
+    [sym_if_term] = STATE(400),
+    [sym_conjunction] = STATE(400),
+    [sym_disjunction] = STATE(400),
+    [sym_implication] = STATE(400),
+    [sym_quantified] = STATE(400),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(400),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30434,68 +31075,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [309] = {
-    [sym_special_call] = STATE(1075),
-    [sym_prefix_cast] = STATE(1075),
-    [sym_unary_expr] = STATE(1075),
-    [sym_mul_expr] = STATE(1075),
-    [sym_add_expr] = STATE(1075),
-    [sym_in_expr] = STATE(1075),
-    [sym_comp_term] = STATE(1075),
-    [sym_instance_of] = STATE(1075),
-    [sym_negation] = STATE(1075),
-    [sym_if_term] = STATE(1075),
-    [sym_conjunction] = STATE(1075),
-    [sym_disjunction] = STATE(1075),
-    [sym_implication] = STATE(1075),
-    [sym_quantified] = STATE(1075),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1075),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [313] = {
+    [sym_special_call] = STATE(399),
+    [sym_prefix_cast] = STATE(399),
+    [sym_unary_expr] = STATE(399),
+    [sym_mul_expr] = STATE(399),
+    [sym_add_expr] = STATE(399),
+    [sym_in_expr] = STATE(399),
+    [sym_comp_term] = STATE(399),
+    [sym_instance_of] = STATE(399),
+    [sym_negation] = STATE(399),
+    [sym_if_term] = STATE(399),
+    [sym_conjunction] = STATE(399),
+    [sym_disjunction] = STATE(399),
+    [sym_implication] = STATE(399),
+    [sym_quantified] = STATE(399),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(399),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30516,68 +31158,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [310] = {
-    [sym_special_call] = STATE(853),
-    [sym_prefix_cast] = STATE(853),
-    [sym_unary_expr] = STATE(853),
-    [sym_mul_expr] = STATE(853),
-    [sym_add_expr] = STATE(853),
-    [sym_in_expr] = STATE(853),
-    [sym_comp_term] = STATE(853),
-    [sym_instance_of] = STATE(853),
-    [sym_negation] = STATE(853),
-    [sym_if_term] = STATE(853),
-    [sym_conjunction] = STATE(853),
-    [sym_disjunction] = STATE(853),
-    [sym_implication] = STATE(853),
-    [sym_quantified] = STATE(853),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(853),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
+  [314] = {
+    [sym_special_call] = STATE(388),
+    [sym_prefix_cast] = STATE(388),
+    [sym_unary_expr] = STATE(388),
+    [sym_mul_expr] = STATE(388),
+    [sym_add_expr] = STATE(388),
+    [sym_in_expr] = STATE(388),
+    [sym_comp_term] = STATE(388),
+    [sym_instance_of] = STATE(388),
+    [sym_negation] = STATE(388),
+    [sym_if_term] = STATE(388),
+    [sym_conjunction] = STATE(388),
+    [sym_disjunction] = STATE(388),
+    [sym_implication] = STATE(388),
+    [sym_quantified] = STATE(388),
+    [sym_quantifier] = STATE(1857),
+    [sym_call_or_unqual_agg_expr] = STATE(561),
+    [sym_qualified_expr] = STATE(561),
+    [sym_super_ref] = STATE(561),
+    [sym_aggregate] = STATE(561),
+    [sym_range] = STATE(561),
+    [sym_set_literal] = STATE(561),
+    [sym_par_expr] = STATE(561),
+    [sym_expr_annotation] = STATE(561),
+    [sym__exprOrTerm] = STATE(388),
+    [sym__primary] = STATE(561),
+    [sym_literal] = STATE(561),
+    [sym_bool] = STATE(575),
+    [sym_variable] = STATE(561),
+    [sym_unop] = STATE(297),
+    [sym_literalId] = STATE(1575),
     [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(421),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1856),
+    [sym_aritylessPredicateExpr] = STATE(1469),
+    [sym_varName] = STATE(572),
+    [sym_aggId] = STATE(1774),
+    [sym__lower_id] = ACTIONS(339),
+    [anon_sym_LPAREN] = ACTIONS(341),
+    [anon_sym_not] = ACTIONS(343),
+    [anon_sym_if] = ACTIONS(345),
+    [sym_specialId] = ACTIONS(347),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(349),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30598,68 +31241,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(351),
+    [sym_integer] = ACTIONS(353),
+    [sym_float] = ACTIONS(355),
+    [sym_string] = ACTIONS(355),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(357),
+    [sym_result] = ACTIONS(359),
+    [sym_super] = ACTIONS(361),
+    [sym_this] = ACTIONS(359),
+    [sym_true] = ACTIONS(357),
   },
-  [311] = {
-    [sym_special_call] = STATE(1129),
-    [sym_prefix_cast] = STATE(1129),
-    [sym_unary_expr] = STATE(1129),
-    [sym_mul_expr] = STATE(1129),
-    [sym_add_expr] = STATE(1129),
-    [sym_in_expr] = STATE(1129),
-    [sym_comp_term] = STATE(1129),
-    [sym_instance_of] = STATE(1129),
-    [sym_negation] = STATE(1129),
-    [sym_if_term] = STATE(1129),
-    [sym_conjunction] = STATE(1129),
-    [sym_disjunction] = STATE(1129),
-    [sym_implication] = STATE(1129),
-    [sym_quantified] = STATE(1129),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1129),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [315] = {
+    [sym_special_call] = STATE(397),
+    [sym_prefix_cast] = STATE(397),
+    [sym_unary_expr] = STATE(397),
+    [sym_mul_expr] = STATE(397),
+    [sym_add_expr] = STATE(397),
+    [sym_in_expr] = STATE(397),
+    [sym_comp_term] = STATE(397),
+    [sym_instance_of] = STATE(397),
+    [sym_negation] = STATE(397),
+    [sym_if_term] = STATE(397),
+    [sym_conjunction] = STATE(397),
+    [sym_disjunction] = STATE(397),
+    [sym_implication] = STATE(397),
+    [sym_quantified] = STATE(397),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(397),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -30680,145 +31324,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [312] = {
-    [sym_special_call] = STATE(385),
-    [sym_prefix_cast] = STATE(385),
-    [sym_unary_expr] = STATE(385),
-    [sym_mul_expr] = STATE(385),
-    [sym_add_expr] = STATE(385),
-    [sym_in_expr] = STATE(385),
-    [sym_comp_term] = STATE(385),
-    [sym_instance_of] = STATE(385),
-    [sym_negation] = STATE(385),
-    [sym_if_term] = STATE(385),
-    [sym_conjunction] = STATE(385),
-    [sym_disjunction] = STATE(385),
-    [sym_implication] = STATE(385),
-    [sym_quantified] = STATE(385),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(385),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
-  },
-  [313] = {
-    [sym_special_call] = STATE(1085),
-    [sym_prefix_cast] = STATE(1085),
-    [sym_unary_expr] = STATE(1085),
-    [sym_mul_expr] = STATE(1085),
-    [sym_add_expr] = STATE(1085),
-    [sym_in_expr] = STATE(1085),
-    [sym_comp_term] = STATE(1085),
-    [sym_instance_of] = STATE(1085),
-    [sym_negation] = STATE(1085),
-    [sym_if_term] = STATE(1085),
-    [sym_conjunction] = STATE(1085),
-    [sym_disjunction] = STATE(1085),
-    [sym_implication] = STATE(1085),
-    [sym_quantified] = STATE(1085),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1085),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [316] = {
+    [sym_special_call] = STATE(840),
+    [sym_prefix_cast] = STATE(840),
+    [sym_unary_expr] = STATE(840),
+    [sym_mul_expr] = STATE(840),
+    [sym_add_expr] = STATE(840),
+    [sym_in_expr] = STATE(840),
+    [sym_comp_term] = STATE(840),
+    [sym_instance_of] = STATE(840),
+    [sym_negation] = STATE(840),
+    [sym_if_term] = STATE(840),
+    [sym_conjunction] = STATE(840),
+    [sym_disjunction] = STATE(840),
+    [sym_implication] = STATE(840),
+    [sym_quantified] = STATE(840),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(840),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -30844,7 +31407,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -30856,51 +31419,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [314] = {
-    [sym_special_call] = STATE(1058),
-    [sym_prefix_cast] = STATE(1058),
-    [sym_unary_expr] = STATE(1058),
-    [sym_mul_expr] = STATE(1058),
-    [sym_add_expr] = STATE(1058),
-    [sym_in_expr] = STATE(1058),
-    [sym_comp_term] = STATE(1058),
-    [sym_instance_of] = STATE(1058),
-    [sym_negation] = STATE(1058),
-    [sym_if_term] = STATE(1058),
-    [sym_conjunction] = STATE(1058),
-    [sym_disjunction] = STATE(1058),
-    [sym_implication] = STATE(1058),
-    [sym_quantified] = STATE(1058),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1058),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [317] = {
+    [sym_special_call] = STATE(855),
+    [sym_prefix_cast] = STATE(855),
+    [sym_unary_expr] = STATE(855),
+    [sym_mul_expr] = STATE(855),
+    [sym_add_expr] = STATE(855),
+    [sym_in_expr] = STATE(855),
+    [sym_comp_term] = STATE(855),
+    [sym_instance_of] = STATE(855),
+    [sym_negation] = STATE(855),
+    [sym_if_term] = STATE(855),
+    [sym_conjunction] = STATE(855),
+    [sym_disjunction] = STATE(855),
+    [sym_implication] = STATE(855),
+    [sym_quantified] = STATE(855),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(855),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -30926,7 +31490,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -30938,56 +31502,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [315] = {
-    [sym_special_call] = STATE(818),
-    [sym_prefix_cast] = STATE(818),
-    [sym_unary_expr] = STATE(818),
-    [sym_mul_expr] = STATE(818),
-    [sym_add_expr] = STATE(818),
-    [sym_in_expr] = STATE(818),
-    [sym_comp_term] = STATE(818),
-    [sym_instance_of] = STATE(818),
-    [sym_negation] = STATE(818),
-    [sym_if_term] = STATE(818),
-    [sym_conjunction] = STATE(818),
-    [sym_disjunction] = STATE(818),
-    [sym_implication] = STATE(818),
-    [sym_quantified] = STATE(818),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(818),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [318] = {
+    [sym_special_call] = STATE(375),
+    [sym_prefix_cast] = STATE(375),
+    [sym_unary_expr] = STATE(375),
+    [sym_mul_expr] = STATE(375),
+    [sym_add_expr] = STATE(375),
+    [sym_in_expr] = STATE(375),
+    [sym_comp_term] = STATE(375),
+    [sym_instance_of] = STATE(375),
+    [sym_negation] = STATE(375),
+    [sym_if_term] = STATE(375),
+    [sym_conjunction] = STATE(375),
+    [sym_disjunction] = STATE(375),
+    [sym_implication] = STATE(375),
+    [sym_quantified] = STATE(375),
+    [sym_quantifier] = STATE(1853),
+    [sym_call_or_unqual_agg_expr] = STATE(540),
+    [sym_qualified_expr] = STATE(540),
+    [sym_super_ref] = STATE(540),
+    [sym_aggregate] = STATE(540),
+    [sym_range] = STATE(540),
+    [sym_set_literal] = STATE(540),
+    [sym_par_expr] = STATE(540),
+    [sym_expr_annotation] = STATE(540),
+    [sym__exprOrTerm] = STATE(375),
+    [sym__primary] = STATE(540),
+    [sym_literal] = STATE(540),
+    [sym_bool] = STATE(517),
+    [sym_variable] = STATE(540),
+    [sym_unop] = STATE(318),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2001),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(419),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1854),
+    [sym_aritylessPredicateExpr] = STATE(1467),
+    [sym_varName] = STATE(535),
+    [sym_aggId] = STATE(1796),
+    [sym__lower_id] = ACTIONS(467),
+    [anon_sym_LPAREN] = ACTIONS(469),
+    [anon_sym_not] = ACTIONS(471),
+    [anon_sym_if] = ACTIONS(473),
+    [sym_specialId] = ACTIONS(475),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(477),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -31008,63 +31573,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(479),
+    [sym_integer] = ACTIONS(481),
+    [sym_float] = ACTIONS(483),
+    [sym_string] = ACTIONS(483),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(485),
+    [sym_result] = ACTIONS(487),
+    [sym_super] = ACTIONS(489),
+    [sym_this] = ACTIONS(487),
+    [sym_true] = ACTIONS(485),
   },
-  [316] = {
-    [sym_special_call] = STATE(1146),
-    [sym_prefix_cast] = STATE(1146),
-    [sym_unary_expr] = STATE(1146),
-    [sym_mul_expr] = STATE(1146),
-    [sym_add_expr] = STATE(1146),
-    [sym_in_expr] = STATE(1146),
-    [sym_comp_term] = STATE(1146),
-    [sym_instance_of] = STATE(1146),
-    [sym_negation] = STATE(1146),
-    [sym_if_term] = STATE(1146),
-    [sym_conjunction] = STATE(1146),
-    [sym_disjunction] = STATE(1146),
-    [sym_implication] = STATE(1146),
-    [sym_quantified] = STATE(1146),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1146),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [319] = {
+    [sym_special_call] = STATE(858),
+    [sym_prefix_cast] = STATE(858),
+    [sym_unary_expr] = STATE(858),
+    [sym_mul_expr] = STATE(858),
+    [sym_add_expr] = STATE(858),
+    [sym_in_expr] = STATE(858),
+    [sym_comp_term] = STATE(858),
+    [sym_instance_of] = STATE(858),
+    [sym_negation] = STATE(858),
+    [sym_if_term] = STATE(858),
+    [sym_conjunction] = STATE(858),
+    [sym_disjunction] = STATE(858),
+    [sym_implication] = STATE(858),
+    [sym_quantified] = STATE(858),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(858),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -31090,7 +31656,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -31102,51 +31668,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [317] = {
-    [sym_special_call] = STATE(1114),
-    [sym_prefix_cast] = STATE(1114),
-    [sym_unary_expr] = STATE(1114),
-    [sym_mul_expr] = STATE(1114),
-    [sym_add_expr] = STATE(1114),
-    [sym_in_expr] = STATE(1114),
-    [sym_comp_term] = STATE(1114),
-    [sym_instance_of] = STATE(1114),
-    [sym_negation] = STATE(1114),
-    [sym_if_term] = STATE(1114),
-    [sym_conjunction] = STATE(1114),
-    [sym_disjunction] = STATE(1114),
-    [sym_implication] = STATE(1114),
-    [sym_quantified] = STATE(1114),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1114),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [320] = {
+    [sym_special_call] = STATE(859),
+    [sym_prefix_cast] = STATE(859),
+    [sym_unary_expr] = STATE(859),
+    [sym_mul_expr] = STATE(859),
+    [sym_add_expr] = STATE(859),
+    [sym_in_expr] = STATE(859),
+    [sym_comp_term] = STATE(859),
+    [sym_instance_of] = STATE(859),
+    [sym_negation] = STATE(859),
+    [sym_if_term] = STATE(859),
+    [sym_conjunction] = STATE(859),
+    [sym_disjunction] = STATE(859),
+    [sym_implication] = STATE(859),
+    [sym_quantified] = STATE(859),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(859),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -31172,7 +31739,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -31184,47 +31751,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [318] = {
-    [sym_special_call] = STATE(1152),
-    [sym_prefix_cast] = STATE(1152),
-    [sym_unary_expr] = STATE(1152),
-    [sym_mul_expr] = STATE(1152),
-    [sym_add_expr] = STATE(1152),
-    [sym_in_expr] = STATE(1152),
-    [sym_comp_term] = STATE(1152),
-    [sym_instance_of] = STATE(1152),
-    [sym_negation] = STATE(1152),
-    [sym_if_term] = STATE(1152),
-    [sym_conjunction] = STATE(1152),
-    [sym_disjunction] = STATE(1152),
-    [sym_implication] = STATE(1152),
-    [sym_quantified] = STATE(1152),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1152),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [321] = {
+    [sym_special_call] = STATE(850),
+    [sym_prefix_cast] = STATE(850),
+    [sym_unary_expr] = STATE(850),
+    [sym_mul_expr] = STATE(850),
+    [sym_add_expr] = STATE(850),
+    [sym_in_expr] = STATE(850),
+    [sym_comp_term] = STATE(850),
+    [sym_instance_of] = STATE(850),
+    [sym_negation] = STATE(850),
+    [sym_if_term] = STATE(850),
+    [sym_conjunction] = STATE(850),
+    [sym_disjunction] = STATE(850),
+    [sym_implication] = STATE(850),
+    [sym_quantified] = STATE(850),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(850),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -31266,56 +31834,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [319] = {
-    [sym_special_call] = STATE(1080),
-    [sym_prefix_cast] = STATE(1080),
-    [sym_unary_expr] = STATE(1080),
-    [sym_mul_expr] = STATE(1080),
-    [sym_add_expr] = STATE(1080),
-    [sym_in_expr] = STATE(1080),
-    [sym_comp_term] = STATE(1080),
-    [sym_instance_of] = STATE(1080),
-    [sym_negation] = STATE(1080),
-    [sym_if_term] = STATE(1080),
-    [sym_conjunction] = STATE(1080),
-    [sym_disjunction] = STATE(1080),
-    [sym_implication] = STATE(1080),
-    [sym_quantified] = STATE(1080),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1080),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [322] = {
+    [sym_special_call] = STATE(383),
+    [sym_prefix_cast] = STATE(383),
+    [sym_unary_expr] = STATE(383),
+    [sym_mul_expr] = STATE(383),
+    [sym_add_expr] = STATE(383),
+    [sym_in_expr] = STATE(383),
+    [sym_comp_term] = STATE(383),
+    [sym_instance_of] = STATE(383),
+    [sym_negation] = STATE(383),
+    [sym_if_term] = STATE(383),
+    [sym_conjunction] = STATE(383),
+    [sym_disjunction] = STATE(383),
+    [sym_implication] = STATE(383),
+    [sym_quantified] = STATE(383),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(383),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -31336,68 +31905,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [320] = {
-    [sym_special_call] = STATE(850),
-    [sym_prefix_cast] = STATE(850),
-    [sym_unary_expr] = STATE(850),
-    [sym_mul_expr] = STATE(850),
-    [sym_add_expr] = STATE(850),
-    [sym_in_expr] = STATE(850),
-    [sym_comp_term] = STATE(850),
-    [sym_instance_of] = STATE(850),
-    [sym_negation] = STATE(850),
-    [sym_if_term] = STATE(850),
-    [sym_conjunction] = STATE(850),
-    [sym_disjunction] = STATE(850),
-    [sym_implication] = STATE(850),
-    [sym_quantified] = STATE(850),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(850),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [323] = {
+    [sym_special_call] = STATE(835),
+    [sym_prefix_cast] = STATE(835),
+    [sym_unary_expr] = STATE(835),
+    [sym_mul_expr] = STATE(835),
+    [sym_add_expr] = STATE(835),
+    [sym_in_expr] = STATE(835),
+    [sym_comp_term] = STATE(835),
+    [sym_instance_of] = STATE(835),
+    [sym_negation] = STATE(835),
+    [sym_if_term] = STATE(835),
+    [sym_conjunction] = STATE(835),
+    [sym_disjunction] = STATE(835),
+    [sym_implication] = STATE(835),
+    [sym_quantified] = STATE(835),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(835),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -31418,63 +31988,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(127),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [321] = {
-    [sym_special_call] = STATE(1074),
-    [sym_prefix_cast] = STATE(1074),
-    [sym_unary_expr] = STATE(1074),
-    [sym_mul_expr] = STATE(1074),
-    [sym_add_expr] = STATE(1074),
-    [sym_in_expr] = STATE(1074),
-    [sym_comp_term] = STATE(1074),
-    [sym_instance_of] = STATE(1074),
-    [sym_negation] = STATE(1074),
-    [sym_if_term] = STATE(1074),
-    [sym_conjunction] = STATE(1074),
-    [sym_disjunction] = STATE(1074),
-    [sym_implication] = STATE(1074),
-    [sym_quantified] = STATE(1074),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1074),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [324] = {
+    [sym_special_call] = STATE(834),
+    [sym_prefix_cast] = STATE(834),
+    [sym_unary_expr] = STATE(834),
+    [sym_mul_expr] = STATE(834),
+    [sym_add_expr] = STATE(834),
+    [sym_in_expr] = STATE(834),
+    [sym_comp_term] = STATE(834),
+    [sym_instance_of] = STATE(834),
+    [sym_negation] = STATE(834),
+    [sym_if_term] = STATE(834),
+    [sym_conjunction] = STATE(834),
+    [sym_disjunction] = STATE(834),
+    [sym_implication] = STATE(834),
+    [sym_quantified] = STATE(834),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(834),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -31500,7 +32071,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -31512,47 +32083,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [322] = {
-    [sym_special_call] = STATE(847),
-    [sym_prefix_cast] = STATE(847),
-    [sym_unary_expr] = STATE(847),
-    [sym_mul_expr] = STATE(847),
-    [sym_add_expr] = STATE(847),
-    [sym_in_expr] = STATE(847),
-    [sym_comp_term] = STATE(847),
-    [sym_instance_of] = STATE(847),
-    [sym_negation] = STATE(847),
-    [sym_if_term] = STATE(847),
-    [sym_conjunction] = STATE(847),
-    [sym_disjunction] = STATE(847),
-    [sym_implication] = STATE(847),
-    [sym_quantified] = STATE(847),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(847),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [325] = {
+    [sym_special_call] = STATE(825),
+    [sym_prefix_cast] = STATE(825),
+    [sym_unary_expr] = STATE(825),
+    [sym_mul_expr] = STATE(825),
+    [sym_add_expr] = STATE(825),
+    [sym_in_expr] = STATE(825),
+    [sym_comp_term] = STATE(825),
+    [sym_instance_of] = STATE(825),
+    [sym_negation] = STATE(825),
+    [sym_if_term] = STATE(825),
+    [sym_conjunction] = STATE(825),
+    [sym_disjunction] = STATE(825),
+    [sym_implication] = STATE(825),
+    [sym_quantified] = STATE(825),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(825),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -31594,56 +32166,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [323] = {
-    [sym_special_call] = STATE(402),
-    [sym_prefix_cast] = STATE(402),
-    [sym_unary_expr] = STATE(402),
-    [sym_mul_expr] = STATE(402),
-    [sym_add_expr] = STATE(402),
-    [sym_in_expr] = STATE(402),
-    [sym_comp_term] = STATE(402),
-    [sym_instance_of] = STATE(402),
-    [sym_negation] = STATE(402),
-    [sym_if_term] = STATE(402),
-    [sym_conjunction] = STATE(402),
-    [sym_disjunction] = STATE(402),
-    [sym_implication] = STATE(402),
-    [sym_quantified] = STATE(402),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(402),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [326] = {
+    [sym_special_call] = STATE(1047),
+    [sym_prefix_cast] = STATE(1047),
+    [sym_unary_expr] = STATE(1047),
+    [sym_mul_expr] = STATE(1047),
+    [sym_add_expr] = STATE(1047),
+    [sym_in_expr] = STATE(1047),
+    [sym_comp_term] = STATE(1047),
+    [sym_instance_of] = STATE(1047),
+    [sym_negation] = STATE(1047),
+    [sym_if_term] = STATE(1047),
+    [sym_conjunction] = STATE(1047),
+    [sym_disjunction] = STATE(1047),
+    [sym_implication] = STATE(1047),
+    [sym_quantified] = STATE(1047),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1047),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -31664,59 +32237,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [324] = {
-    [sym_special_call] = STATE(1113),
-    [sym_prefix_cast] = STATE(1113),
-    [sym_unary_expr] = STATE(1113),
-    [sym_mul_expr] = STATE(1113),
-    [sym_add_expr] = STATE(1113),
-    [sym_in_expr] = STATE(1113),
-    [sym_comp_term] = STATE(1113),
-    [sym_instance_of] = STATE(1113),
-    [sym_negation] = STATE(1113),
-    [sym_if_term] = STATE(1113),
-    [sym_conjunction] = STATE(1113),
-    [sym_disjunction] = STATE(1113),
-    [sym_implication] = STATE(1113),
-    [sym_quantified] = STATE(1113),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1113),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [327] = {
+    [sym_special_call] = STATE(832),
+    [sym_prefix_cast] = STATE(832),
+    [sym_unary_expr] = STATE(832),
+    [sym_mul_expr] = STATE(832),
+    [sym_add_expr] = STATE(832),
+    [sym_in_expr] = STATE(832),
+    [sym_comp_term] = STATE(832),
+    [sym_instance_of] = STATE(832),
+    [sym_negation] = STATE(832),
+    [sym_if_term] = STATE(832),
+    [sym_conjunction] = STATE(832),
+    [sym_disjunction] = STATE(832),
+    [sym_implication] = STATE(832),
+    [sym_quantified] = STATE(832),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(832),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -31758,51 +32332,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [325] = {
-    [sym_special_call] = STATE(860),
-    [sym_prefix_cast] = STATE(860),
-    [sym_unary_expr] = STATE(860),
-    [sym_mul_expr] = STATE(860),
-    [sym_add_expr] = STATE(860),
-    [sym_in_expr] = STATE(860),
-    [sym_comp_term] = STATE(860),
-    [sym_instance_of] = STATE(860),
-    [sym_negation] = STATE(860),
-    [sym_if_term] = STATE(860),
-    [sym_conjunction] = STATE(860),
-    [sym_disjunction] = STATE(860),
-    [sym_implication] = STATE(860),
-    [sym_quantified] = STATE(860),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(860),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [328] = {
+    [sym_special_call] = STATE(863),
+    [sym_prefix_cast] = STATE(863),
+    [sym_unary_expr] = STATE(863),
+    [sym_mul_expr] = STATE(863),
+    [sym_add_expr] = STATE(863),
+    [sym_in_expr] = STATE(863),
+    [sym_comp_term] = STATE(863),
+    [sym_instance_of] = STATE(863),
+    [sym_negation] = STATE(863),
+    [sym_if_term] = STATE(863),
+    [sym_conjunction] = STATE(863),
+    [sym_disjunction] = STATE(863),
+    [sym_implication] = STATE(863),
+    [sym_quantified] = STATE(863),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(863),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -31828,7 +32403,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -31840,133 +32415,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [326] = {
-    [sym_special_call] = STATE(390),
-    [sym_prefix_cast] = STATE(390),
-    [sym_unary_expr] = STATE(390),
-    [sym_mul_expr] = STATE(390),
-    [sym_add_expr] = STATE(390),
-    [sym_in_expr] = STATE(390),
-    [sym_comp_term] = STATE(390),
-    [sym_instance_of] = STATE(390),
-    [sym_negation] = STATE(390),
-    [sym_if_term] = STATE(390),
-    [sym_conjunction] = STATE(390),
-    [sym_disjunction] = STATE(390),
-    [sym_implication] = STATE(390),
-    [sym_quantified] = STATE(390),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(390),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
+  [329] = {
+    [sym_special_call] = STATE(1068),
+    [sym_prefix_cast] = STATE(1068),
+    [sym_unary_expr] = STATE(1068),
+    [sym_mul_expr] = STATE(1068),
+    [sym_add_expr] = STATE(1068),
+    [sym_in_expr] = STATE(1068),
+    [sym_comp_term] = STATE(1068),
+    [sym_instance_of] = STATE(1068),
+    [sym_negation] = STATE(1068),
+    [sym_if_term] = STATE(1068),
+    [sym_conjunction] = STATE(1068),
+    [sym_disjunction] = STATE(1068),
+    [sym_implication] = STATE(1068),
+    [sym_quantified] = STATE(1068),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1068),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(285),
     [anon_sym_not] = ACTIONS(287),
     [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
-  },
-  [327] = {
-    [sym_special_call] = STATE(1107),
-    [sym_prefix_cast] = STATE(1107),
-    [sym_unary_expr] = STATE(1107),
-    [sym_mul_expr] = STATE(1107),
-    [sym_add_expr] = STATE(1107),
-    [sym_in_expr] = STATE(1107),
-    [sym_comp_term] = STATE(1107),
-    [sym_instance_of] = STATE(1107),
-    [sym_negation] = STATE(1107),
-    [sym_if_term] = STATE(1107),
-    [sym_conjunction] = STATE(1107),
-    [sym_disjunction] = STATE(1107),
-    [sym_implication] = STATE(1107),
-    [sym_quantified] = STATE(1107),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1107),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -31992,7 +32486,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -32004,56 +32498,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [328] = {
-    [sym_special_call] = STATE(1000),
-    [sym_prefix_cast] = STATE(1000),
-    [sym_unary_expr] = STATE(1000),
-    [sym_mul_expr] = STATE(1000),
-    [sym_add_expr] = STATE(1000),
-    [sym_in_expr] = STATE(1000),
-    [sym_comp_term] = STATE(1000),
-    [sym_instance_of] = STATE(1000),
-    [sym_negation] = STATE(1000),
-    [sym_if_term] = STATE(1000),
-    [sym_conjunction] = STATE(1000),
-    [sym_disjunction] = STATE(1000),
-    [sym_implication] = STATE(1000),
-    [sym_quantified] = STATE(1000),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1000),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [330] = {
+    [sym_special_call] = STATE(382),
+    [sym_prefix_cast] = STATE(382),
+    [sym_unary_expr] = STATE(382),
+    [sym_mul_expr] = STATE(382),
+    [sym_add_expr] = STATE(382),
+    [sym_in_expr] = STATE(382),
+    [sym_comp_term] = STATE(382),
+    [sym_instance_of] = STATE(382),
+    [sym_negation] = STATE(382),
+    [sym_if_term] = STATE(382),
+    [sym_conjunction] = STATE(382),
+    [sym_disjunction] = STATE(382),
+    [sym_implication] = STATE(382),
+    [sym_quantified] = STATE(382),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(382),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32074,68 +32569,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [329] = {
-    [sym_special_call] = STATE(396),
-    [sym_prefix_cast] = STATE(396),
-    [sym_unary_expr] = STATE(396),
-    [sym_mul_expr] = STATE(396),
-    [sym_add_expr] = STATE(396),
-    [sym_in_expr] = STATE(396),
-    [sym_comp_term] = STATE(396),
-    [sym_instance_of] = STATE(396),
-    [sym_negation] = STATE(396),
-    [sym_if_term] = STATE(396),
-    [sym_conjunction] = STATE(396),
-    [sym_disjunction] = STATE(396),
-    [sym_implication] = STATE(396),
-    [sym_quantified] = STATE(396),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(396),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [331] = {
+    [sym_special_call] = STATE(846),
+    [sym_prefix_cast] = STATE(846),
+    [sym_unary_expr] = STATE(846),
+    [sym_mul_expr] = STATE(846),
+    [sym_add_expr] = STATE(846),
+    [sym_in_expr] = STATE(846),
+    [sym_comp_term] = STATE(846),
+    [sym_instance_of] = STATE(846),
+    [sym_negation] = STATE(846),
+    [sym_if_term] = STATE(846),
+    [sym_conjunction] = STATE(846),
+    [sym_disjunction] = STATE(846),
+    [sym_implication] = STATE(846),
+    [sym_quantified] = STATE(846),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(846),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32156,68 +32652,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [330] = {
-    [sym_special_call] = STATE(822),
-    [sym_prefix_cast] = STATE(822),
-    [sym_unary_expr] = STATE(822),
-    [sym_mul_expr] = STATE(822),
-    [sym_add_expr] = STATE(822),
-    [sym_in_expr] = STATE(822),
-    [sym_comp_term] = STATE(822),
-    [sym_instance_of] = STATE(822),
-    [sym_negation] = STATE(822),
-    [sym_if_term] = STATE(822),
-    [sym_conjunction] = STATE(822),
-    [sym_disjunction] = STATE(822),
-    [sym_implication] = STATE(822),
-    [sym_quantified] = STATE(822),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(822),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
-    [sym__lower_id] = ACTIONS(35),
-    [anon_sym_LPAREN] = ACTIONS(37),
-    [anon_sym_not] = ACTIONS(41),
-    [anon_sym_if] = ACTIONS(43),
-    [sym_specialId] = ACTIONS(47),
+  [332] = {
+    [sym_special_call] = STATE(385),
+    [sym_prefix_cast] = STATE(385),
+    [sym_unary_expr] = STATE(385),
+    [sym_mul_expr] = STATE(385),
+    [sym_add_expr] = STATE(385),
+    [sym_in_expr] = STATE(385),
+    [sym_comp_term] = STATE(385),
+    [sym_instance_of] = STATE(385),
+    [sym_negation] = STATE(385),
+    [sym_if_term] = STATE(385),
+    [sym_conjunction] = STATE(385),
+    [sym_disjunction] = STATE(385),
+    [sym_implication] = STATE(385),
+    [sym_quantified] = STATE(385),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(385),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32238,68 +32735,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(57),
-    [sym_integer] = ACTIONS(59),
-    [sym_float] = ACTIONS(61),
-    [sym_string] = ACTIONS(61),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(63),
-    [sym_result] = ACTIONS(65),
-    [sym_super] = ACTIONS(67),
-    [sym_this] = ACTIONS(65),
-    [sym_true] = ACTIONS(63),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [331] = {
-    [sym_special_call] = STATE(851),
-    [sym_prefix_cast] = STATE(851),
-    [sym_unary_expr] = STATE(851),
-    [sym_mul_expr] = STATE(851),
-    [sym_add_expr] = STATE(851),
-    [sym_in_expr] = STATE(851),
-    [sym_comp_term] = STATE(851),
-    [sym_instance_of] = STATE(851),
-    [sym_negation] = STATE(851),
-    [sym_if_term] = STATE(851),
-    [sym_conjunction] = STATE(851),
-    [sym_disjunction] = STATE(851),
-    [sym_implication] = STATE(851),
-    [sym_quantified] = STATE(851),
-    [sym_quantifier] = STATE(1879),
-    [sym_call_or_unqual_agg_expr] = STATE(931),
-    [sym_qualified_expr] = STATE(931),
-    [sym_super_ref] = STATE(931),
-    [sym_aggregate] = STATE(931),
-    [sym_range] = STATE(931),
-    [sym_set_literal] = STATE(931),
-    [sym_par_expr] = STATE(931),
-    [sym_expr_annotation] = STATE(931),
-    [sym__exprOrTerm] = STATE(851),
-    [sym__primary] = STATE(931),
-    [sym_literal] = STATE(931),
-    [sym_bool] = STATE(936),
-    [sym_variable] = STATE(931),
-    [sym_unop] = STATE(245),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2001),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(868),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1880),
-    [sym_aritylessPredicateExpr] = STATE(1473),
-    [sym_varName] = STATE(934),
-    [sym_aggId] = STATE(1783),
-    [sym__lower_id] = ACTIONS(491),
-    [anon_sym_LPAREN] = ACTIONS(493),
-    [anon_sym_not] = ACTIONS(495),
-    [anon_sym_if] = ACTIONS(497),
-    [sym_specialId] = ACTIONS(499),
+  [333] = {
+    [sym_special_call] = STATE(404),
+    [sym_prefix_cast] = STATE(404),
+    [sym_unary_expr] = STATE(404),
+    [sym_mul_expr] = STATE(404),
+    [sym_add_expr] = STATE(404),
+    [sym_in_expr] = STATE(404),
+    [sym_comp_term] = STATE(404),
+    [sym_instance_of] = STATE(404),
+    [sym_negation] = STATE(404),
+    [sym_if_term] = STATE(404),
+    [sym_conjunction] = STATE(404),
+    [sym_disjunction] = STATE(404),
+    [sym_implication] = STATE(404),
+    [sym_quantified] = STATE(404),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(404),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(501),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32320,68 +32818,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(503),
-    [sym_integer] = ACTIONS(505),
-    [sym_float] = ACTIONS(507),
-    [sym_string] = ACTIONS(507),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(509),
-    [sym_result] = ACTIONS(511),
-    [sym_super] = ACTIONS(513),
-    [sym_this] = ACTIONS(511),
-    [sym_true] = ACTIONS(509),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [332] = {
-    [sym_special_call] = STATE(394),
-    [sym_prefix_cast] = STATE(394),
-    [sym_unary_expr] = STATE(394),
-    [sym_mul_expr] = STATE(394),
-    [sym_add_expr] = STATE(394),
-    [sym_in_expr] = STATE(394),
-    [sym_comp_term] = STATE(394),
-    [sym_instance_of] = STATE(394),
-    [sym_negation] = STATE(394),
-    [sym_if_term] = STATE(394),
-    [sym_conjunction] = STATE(394),
-    [sym_disjunction] = STATE(394),
-    [sym_implication] = STATE(394),
-    [sym_quantified] = STATE(394),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(394),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
+  [334] = {
+    [sym_special_call] = STATE(379),
+    [sym_prefix_cast] = STATE(379),
+    [sym_unary_expr] = STATE(379),
+    [sym_mul_expr] = STATE(379),
+    [sym_add_expr] = STATE(379),
+    [sym_in_expr] = STATE(379),
+    [sym_comp_term] = STATE(379),
+    [sym_instance_of] = STATE(379),
+    [sym_negation] = STATE(379),
+    [sym_if_term] = STATE(379),
+    [sym_conjunction] = STATE(379),
+    [sym_disjunction] = STATE(379),
+    [sym_implication] = STATE(379),
+    [sym_quantified] = STATE(379),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(379),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
     [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32402,68 +32901,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [333] = {
-    [sym_special_call] = STATE(1099),
-    [sym_prefix_cast] = STATE(1099),
-    [sym_unary_expr] = STATE(1099),
-    [sym_mul_expr] = STATE(1099),
-    [sym_add_expr] = STATE(1099),
-    [sym_in_expr] = STATE(1099),
-    [sym_comp_term] = STATE(1099),
-    [sym_instance_of] = STATE(1099),
-    [sym_negation] = STATE(1099),
-    [sym_if_term] = STATE(1099),
-    [sym_conjunction] = STATE(1099),
-    [sym_disjunction] = STATE(1099),
-    [sym_implication] = STATE(1099),
-    [sym_quantified] = STATE(1099),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1099),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [335] = {
+    [sym_special_call] = STATE(378),
+    [sym_prefix_cast] = STATE(378),
+    [sym_unary_expr] = STATE(378),
+    [sym_mul_expr] = STATE(378),
+    [sym_add_expr] = STATE(378),
+    [sym_in_expr] = STATE(378),
+    [sym_comp_term] = STATE(378),
+    [sym_instance_of] = STATE(378),
+    [sym_negation] = STATE(378),
+    [sym_if_term] = STATE(378),
+    [sym_conjunction] = STATE(378),
+    [sym_disjunction] = STATE(378),
+    [sym_implication] = STATE(378),
+    [sym_quantified] = STATE(378),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(378),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32484,68 +32984,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [334] = {
-    [sym_special_call] = STATE(1101),
-    [sym_prefix_cast] = STATE(1101),
-    [sym_unary_expr] = STATE(1101),
-    [sym_mul_expr] = STATE(1101),
-    [sym_add_expr] = STATE(1101),
-    [sym_in_expr] = STATE(1101),
-    [sym_comp_term] = STATE(1101),
-    [sym_instance_of] = STATE(1101),
-    [sym_negation] = STATE(1101),
-    [sym_if_term] = STATE(1101),
-    [sym_conjunction] = STATE(1101),
-    [sym_disjunction] = STATE(1101),
-    [sym_implication] = STATE(1101),
-    [sym_quantified] = STATE(1101),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1101),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
+  [336] = {
+    [sym_special_call] = STATE(377),
+    [sym_prefix_cast] = STATE(377),
+    [sym_unary_expr] = STATE(377),
+    [sym_mul_expr] = STATE(377),
+    [sym_add_expr] = STATE(377),
+    [sym_in_expr] = STATE(377),
+    [sym_comp_term] = STATE(377),
+    [sym_instance_of] = STATE(377),
+    [sym_negation] = STATE(377),
+    [sym_if_term] = STATE(377),
+    [sym_conjunction] = STATE(377),
+    [sym_disjunction] = STATE(377),
+    [sym_implication] = STATE(377),
+    [sym_quantified] = STATE(377),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(377),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32566,63 +33067,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [335] = {
-    [sym_special_call] = STATE(1110),
-    [sym_prefix_cast] = STATE(1110),
-    [sym_unary_expr] = STATE(1110),
-    [sym_mul_expr] = STATE(1110),
-    [sym_add_expr] = STATE(1110),
-    [sym_in_expr] = STATE(1110),
-    [sym_comp_term] = STATE(1110),
-    [sym_instance_of] = STATE(1110),
-    [sym_negation] = STATE(1110),
-    [sym_if_term] = STATE(1110),
-    [sym_conjunction] = STATE(1110),
-    [sym_disjunction] = STATE(1110),
-    [sym_implication] = STATE(1110),
-    [sym_quantified] = STATE(1110),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1110),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [337] = {
+    [sym_special_call] = STATE(1086),
+    [sym_prefix_cast] = STATE(1086),
+    [sym_unary_expr] = STATE(1086),
+    [sym_mul_expr] = STATE(1086),
+    [sym_add_expr] = STATE(1086),
+    [sym_in_expr] = STATE(1086),
+    [sym_comp_term] = STATE(1086),
+    [sym_instance_of] = STATE(1086),
+    [sym_negation] = STATE(1086),
+    [sym_if_term] = STATE(1086),
+    [sym_conjunction] = STATE(1086),
+    [sym_disjunction] = STATE(1086),
+    [sym_implication] = STATE(1086),
+    [sym_quantified] = STATE(1086),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1086),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -32648,7 +33150,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -32660,56 +33162,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [336] = {
-    [sym_special_call] = STATE(1012),
-    [sym_prefix_cast] = STATE(1012),
-    [sym_unary_expr] = STATE(1012),
-    [sym_mul_expr] = STATE(1012),
-    [sym_add_expr] = STATE(1012),
-    [sym_in_expr] = STATE(1012),
-    [sym_comp_term] = STATE(1012),
-    [sym_instance_of] = STATE(1012),
-    [sym_negation] = STATE(1012),
-    [sym_if_term] = STATE(1012),
-    [sym_conjunction] = STATE(1012),
-    [sym_disjunction] = STATE(1012),
-    [sym_implication] = STATE(1012),
-    [sym_quantified] = STATE(1012),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1012),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [338] = {
+    [sym_special_call] = STATE(376),
+    [sym_prefix_cast] = STATE(376),
+    [sym_unary_expr] = STATE(376),
+    [sym_mul_expr] = STATE(376),
+    [sym_add_expr] = STATE(376),
+    [sym_in_expr] = STATE(376),
+    [sym_comp_term] = STATE(376),
+    [sym_instance_of] = STATE(376),
+    [sym_negation] = STATE(376),
+    [sym_if_term] = STATE(376),
+    [sym_conjunction] = STATE(376),
+    [sym_disjunction] = STATE(376),
+    [sym_implication] = STATE(376),
+    [sym_quantified] = STATE(376),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(376),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(305),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -32730,63 +33233,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
   },
-  [337] = {
-    [sym_special_call] = STATE(1144),
-    [sym_prefix_cast] = STATE(1144),
-    [sym_unary_expr] = STATE(1144),
-    [sym_mul_expr] = STATE(1144),
-    [sym_add_expr] = STATE(1144),
-    [sym_in_expr] = STATE(1144),
-    [sym_comp_term] = STATE(1144),
-    [sym_instance_of] = STATE(1144),
-    [sym_negation] = STATE(1144),
-    [sym_if_term] = STATE(1144),
-    [sym_conjunction] = STATE(1144),
-    [sym_disjunction] = STATE(1144),
-    [sym_implication] = STATE(1144),
-    [sym_quantified] = STATE(1144),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1144),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [339] = {
+    [sym_special_call] = STATE(1085),
+    [sym_prefix_cast] = STATE(1085),
+    [sym_unary_expr] = STATE(1085),
+    [sym_mul_expr] = STATE(1085),
+    [sym_add_expr] = STATE(1085),
+    [sym_in_expr] = STATE(1085),
+    [sym_comp_term] = STATE(1085),
+    [sym_instance_of] = STATE(1085),
+    [sym_negation] = STATE(1085),
+    [sym_if_term] = STATE(1085),
+    [sym_conjunction] = STATE(1085),
+    [sym_disjunction] = STATE(1085),
+    [sym_implication] = STATE(1085),
+    [sym_quantified] = STATE(1085),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1085),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -32812,7 +33316,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -32824,51 +33328,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [338] = {
-    [sym_special_call] = STATE(861),
-    [sym_prefix_cast] = STATE(861),
-    [sym_unary_expr] = STATE(861),
-    [sym_mul_expr] = STATE(861),
-    [sym_add_expr] = STATE(861),
-    [sym_in_expr] = STATE(861),
-    [sym_comp_term] = STATE(861),
-    [sym_instance_of] = STATE(861),
-    [sym_negation] = STATE(861),
-    [sym_if_term] = STATE(861),
-    [sym_conjunction] = STATE(861),
-    [sym_disjunction] = STATE(861),
-    [sym_implication] = STATE(861),
-    [sym_quantified] = STATE(861),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(861),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [340] = {
+    [sym_special_call] = STATE(1083),
+    [sym_prefix_cast] = STATE(1083),
+    [sym_unary_expr] = STATE(1083),
+    [sym_mul_expr] = STATE(1083),
+    [sym_add_expr] = STATE(1083),
+    [sym_in_expr] = STATE(1083),
+    [sym_comp_term] = STATE(1083),
+    [sym_instance_of] = STATE(1083),
+    [sym_negation] = STATE(1083),
+    [sym_if_term] = STATE(1083),
+    [sym_conjunction] = STATE(1083),
+    [sym_disjunction] = STATE(1083),
+    [sym_implication] = STATE(1083),
+    [sym_quantified] = STATE(1083),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1083),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -32894,7 +33399,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -32906,51 +33411,135 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [339] = {
-    [sym_special_call] = STATE(1055),
-    [sym_prefix_cast] = STATE(1055),
-    [sym_unary_expr] = STATE(1055),
-    [sym_mul_expr] = STATE(1055),
-    [sym_add_expr] = STATE(1055),
-    [sym_in_expr] = STATE(1055),
-    [sym_comp_term] = STATE(1055),
-    [sym_instance_of] = STATE(1055),
-    [sym_negation] = STATE(1055),
-    [sym_if_term] = STATE(1055),
-    [sym_conjunction] = STATE(1055),
-    [sym_disjunction] = STATE(1055),
-    [sym_implication] = STATE(1055),
-    [sym_quantified] = STATE(1055),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1055),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [341] = {
+    [sym_special_call] = STATE(391),
+    [sym_prefix_cast] = STATE(391),
+    [sym_unary_expr] = STATE(391),
+    [sym_mul_expr] = STATE(391),
+    [sym_add_expr] = STATE(391),
+    [sym_in_expr] = STATE(391),
+    [sym_comp_term] = STATE(391),
+    [sym_instance_of] = STATE(391),
+    [sym_negation] = STATE(391),
+    [sym_if_term] = STATE(391),
+    [sym_conjunction] = STATE(391),
+    [sym_disjunction] = STATE(391),
+    [sym_implication] = STATE(391),
+    [sym_quantified] = STATE(391),
+    [sym_quantifier] = STATE(1839),
+    [sym_call_or_unqual_agg_expr] = STATE(432),
+    [sym_qualified_expr] = STATE(432),
+    [sym_super_ref] = STATE(432),
+    [sym_aggregate] = STATE(432),
+    [sym_range] = STATE(432),
+    [sym_set_literal] = STATE(432),
+    [sym_par_expr] = STATE(432),
+    [sym_expr_annotation] = STATE(432),
+    [sym__exprOrTerm] = STATE(391),
+    [sym__primary] = STATE(432),
+    [sym_literal] = STATE(432),
+    [sym_bool] = STATE(427),
+    [sym_variable] = STATE(432),
+    [sym_unop] = STATE(341),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(2000),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(420),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1827),
+    [sym_aritylessPredicateExpr] = STATE(1460),
+    [sym_varName] = STATE(425),
+    [sym_aggId] = STATE(1764),
+    [sym__lower_id] = ACTIONS(295),
+    [anon_sym_LPAREN] = ACTIONS(297),
+    [anon_sym_not] = ACTIONS(299),
+    [anon_sym_if] = ACTIONS(301),
+    [sym_specialId] = ACTIONS(303),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(305),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(307),
+    [sym_integer] = ACTIONS(309),
+    [sym_float] = ACTIONS(311),
+    [sym_string] = ACTIONS(311),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(313),
+    [sym_result] = ACTIONS(315),
+    [sym_super] = ACTIONS(317),
+    [sym_this] = ACTIONS(315),
+    [sym_true] = ACTIONS(313),
+  },
+  [342] = {
+    [sym_special_call] = STATE(1081),
+    [sym_prefix_cast] = STATE(1081),
+    [sym_unary_expr] = STATE(1081),
+    [sym_mul_expr] = STATE(1081),
+    [sym_add_expr] = STATE(1081),
+    [sym_in_expr] = STATE(1081),
+    [sym_comp_term] = STATE(1081),
+    [sym_instance_of] = STATE(1081),
+    [sym_negation] = STATE(1081),
+    [sym_if_term] = STATE(1081),
+    [sym_conjunction] = STATE(1081),
+    [sym_disjunction] = STATE(1081),
+    [sym_implication] = STATE(1081),
+    [sym_quantified] = STATE(1081),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1081),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -32976,7 +33565,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -32988,56 +33577,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [340] = {
-    [sym_special_call] = STATE(393),
-    [sym_prefix_cast] = STATE(393),
-    [sym_unary_expr] = STATE(393),
-    [sym_mul_expr] = STATE(393),
-    [sym_add_expr] = STATE(393),
-    [sym_in_expr] = STATE(393),
-    [sym_comp_term] = STATE(393),
-    [sym_instance_of] = STATE(393),
-    [sym_negation] = STATE(393),
-    [sym_if_term] = STATE(393),
-    [sym_conjunction] = STATE(393),
-    [sym_disjunction] = STATE(393),
-    [sym_implication] = STATE(393),
-    [sym_quantified] = STATE(393),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(393),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [343] = {
+    [sym_special_call] = STATE(1181),
+    [sym_prefix_cast] = STATE(1181),
+    [sym_unary_expr] = STATE(1181),
+    [sym_mul_expr] = STATE(1181),
+    [sym_add_expr] = STATE(1181),
+    [sym_in_expr] = STATE(1181),
+    [sym_comp_term] = STATE(1181),
+    [sym_instance_of] = STATE(1181),
+    [sym_negation] = STATE(1181),
+    [sym_if_term] = STATE(1181),
+    [sym_conjunction] = STATE(1181),
+    [sym_disjunction] = STATE(1181),
+    [sym_implication] = STATE(1181),
+    [sym_quantified] = STATE(1181),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1181),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(705),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
+    [sym__lower_id] = ACTIONS(109),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
+    [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(125),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -33058,63 +33648,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(293),
+    [sym_integer] = ACTIONS(129),
+    [sym_float] = ACTIONS(131),
+    [sym_string] = ACTIONS(131),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(133),
+    [sym_result] = ACTIONS(135),
+    [sym_super] = ACTIONS(137),
+    [sym_this] = ACTIONS(135),
+    [sym_true] = ACTIONS(133),
   },
-  [341] = {
-    [sym_special_call] = STATE(1045),
-    [sym_prefix_cast] = STATE(1045),
-    [sym_unary_expr] = STATE(1045),
-    [sym_mul_expr] = STATE(1045),
-    [sym_add_expr] = STATE(1045),
-    [sym_in_expr] = STATE(1045),
-    [sym_comp_term] = STATE(1045),
-    [sym_instance_of] = STATE(1045),
-    [sym_negation] = STATE(1045),
-    [sym_if_term] = STATE(1045),
-    [sym_conjunction] = STATE(1045),
-    [sym_disjunction] = STATE(1045),
-    [sym_implication] = STATE(1045),
-    [sym_quantified] = STATE(1045),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1045),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [344] = {
+    [sym_special_call] = STATE(808),
+    [sym_prefix_cast] = STATE(808),
+    [sym_unary_expr] = STATE(808),
+    [sym_mul_expr] = STATE(808),
+    [sym_add_expr] = STATE(808),
+    [sym_in_expr] = STATE(808),
+    [sym_comp_term] = STATE(808),
+    [sym_instance_of] = STATE(808),
+    [sym_negation] = STATE(808),
+    [sym_if_term] = STATE(808),
+    [sym_conjunction] = STATE(808),
+    [sym_disjunction] = STATE(808),
+    [sym_implication] = STATE(808),
+    [sym_quantified] = STATE(808),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(808),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -33140,7 +33731,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -33152,47 +33743,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [342] = {
-    [sym_special_call] = STATE(836),
-    [sym_prefix_cast] = STATE(836),
-    [sym_unary_expr] = STATE(836),
-    [sym_mul_expr] = STATE(836),
-    [sym_add_expr] = STATE(836),
-    [sym_in_expr] = STATE(836),
-    [sym_comp_term] = STATE(836),
-    [sym_instance_of] = STATE(836),
-    [sym_negation] = STATE(836),
-    [sym_if_term] = STATE(836),
-    [sym_conjunction] = STATE(836),
-    [sym_disjunction] = STATE(836),
-    [sym_implication] = STATE(836),
-    [sym_quantified] = STATE(836),
-    [sym_quantifier] = STATE(1813),
-    [sym_call_or_unqual_agg_expr] = STATE(1038),
-    [sym_qualified_expr] = STATE(1038),
-    [sym_super_ref] = STATE(1038),
-    [sym_aggregate] = STATE(1038),
-    [sym_range] = STATE(1038),
-    [sym_set_literal] = STATE(1038),
-    [sym_par_expr] = STATE(1038),
-    [sym_expr_annotation] = STATE(1038),
-    [sym__exprOrTerm] = STATE(836),
-    [sym__primary] = STATE(1038),
-    [sym_literal] = STATE(1038),
-    [sym_bool] = STATE(1022),
-    [sym_variable] = STATE(1038),
-    [sym_unop] = STATE(293),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1998),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(872),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1837),
-    [sym_aritylessPredicateExpr] = STATE(1463),
-    [sym_varName] = STATE(1031),
-    [sym_aggId] = STATE(1799),
+  [345] = {
+    [sym_special_call] = STATE(845),
+    [sym_prefix_cast] = STATE(845),
+    [sym_unary_expr] = STATE(845),
+    [sym_mul_expr] = STATE(845),
+    [sym_add_expr] = STATE(845),
+    [sym_in_expr] = STATE(845),
+    [sym_comp_term] = STATE(845),
+    [sym_instance_of] = STATE(845),
+    [sym_negation] = STATE(845),
+    [sym_if_term] = STATE(845),
+    [sym_conjunction] = STATE(845),
+    [sym_disjunction] = STATE(845),
+    [sym_implication] = STATE(845),
+    [sym_quantified] = STATE(845),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(845),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
     [sym__lower_id] = ACTIONS(35),
     [anon_sym_LPAREN] = ACTIONS(37),
     [anon_sym_not] = ACTIONS(41),
@@ -33234,51 +33826,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(65),
     [sym_true] = ACTIONS(63),
   },
-  [343] = {
-    [sym_special_call] = STATE(788),
-    [sym_prefix_cast] = STATE(788),
-    [sym_unary_expr] = STATE(788),
-    [sym_mul_expr] = STATE(788),
-    [sym_add_expr] = STATE(788),
-    [sym_in_expr] = STATE(788),
-    [sym_comp_term] = STATE(788),
-    [sym_instance_of] = STATE(788),
-    [sym_negation] = STATE(788),
-    [sym_if_term] = STATE(788),
-    [sym_conjunction] = STATE(788),
-    [sym_disjunction] = STATE(788),
-    [sym_implication] = STATE(788),
-    [sym_quantified] = STATE(788),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(788),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [346] = {
+    [sym_special_call] = STATE(1073),
+    [sym_prefix_cast] = STATE(1073),
+    [sym_unary_expr] = STATE(1073),
+    [sym_mul_expr] = STATE(1073),
+    [sym_add_expr] = STATE(1073),
+    [sym_in_expr] = STATE(1073),
+    [sym_comp_term] = STATE(1073),
+    [sym_instance_of] = STATE(1073),
+    [sym_negation] = STATE(1073),
+    [sym_if_term] = STATE(1073),
+    [sym_conjunction] = STATE(1073),
+    [sym_disjunction] = STATE(1073),
+    [sym_implication] = STATE(1073),
+    [sym_quantified] = STATE(1073),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1073),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -33304,7 +33897,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -33316,51 +33909,135 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [344] = {
-    [sym_special_call] = STATE(1094),
-    [sym_prefix_cast] = STATE(1094),
-    [sym_unary_expr] = STATE(1094),
-    [sym_mul_expr] = STATE(1094),
-    [sym_add_expr] = STATE(1094),
-    [sym_in_expr] = STATE(1094),
-    [sym_comp_term] = STATE(1094),
-    [sym_instance_of] = STATE(1094),
-    [sym_negation] = STATE(1094),
-    [sym_if_term] = STATE(1094),
-    [sym_conjunction] = STATE(1094),
-    [sym_disjunction] = STATE(1094),
-    [sym_implication] = STATE(1094),
-    [sym_quantified] = STATE(1094),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1094),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [347] = {
+    [sym_special_call] = STATE(821),
+    [sym_prefix_cast] = STATE(821),
+    [sym_unary_expr] = STATE(821),
+    [sym_mul_expr] = STATE(821),
+    [sym_add_expr] = STATE(821),
+    [sym_in_expr] = STATE(821),
+    [sym_comp_term] = STATE(821),
+    [sym_instance_of] = STATE(821),
+    [sym_negation] = STATE(821),
+    [sym_if_term] = STATE(821),
+    [sym_conjunction] = STATE(821),
+    [sym_disjunction] = STATE(821),
+    [sym_implication] = STATE(821),
+    [sym_quantified] = STATE(821),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(821),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
+    [anon_sym_exists] = ACTIONS(49),
+    [anon_sym_forall] = ACTIONS(49),
+    [anon_sym_forex] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_PLUS] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(53),
+    [anon_sym_boolean] = ACTIONS(27),
+    [anon_sym_date] = ACTIONS(27),
+    [anon_sym_float] = ACTIONS(27),
+    [anon_sym_int] = ACTIONS(27),
+    [anon_sym_string] = ACTIONS(27),
+    [sym_dbtype] = ACTIONS(29),
+    [anon_sym_avg] = ACTIONS(55),
+    [anon_sym_concat] = ACTIONS(55),
+    [anon_sym_strictconcat] = ACTIONS(55),
+    [anon_sym_count] = ACTIONS(55),
+    [anon_sym_max] = ACTIONS(55),
+    [anon_sym_min] = ACTIONS(55),
+    [anon_sym_rank] = ACTIONS(55),
+    [anon_sym_strictcount] = ACTIONS(55),
+    [anon_sym_strictsum] = ACTIONS(55),
+    [anon_sym_sum] = ACTIONS(55),
+    [anon_sym_any] = ACTIONS(55),
+    [anon_sym_unique] = ACTIONS(55),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
+    [sym_line_comment] = ACTIONS(3),
+    [sym_block_comment] = ACTIONS(3),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
+  },
+  [348] = {
+    [sym_special_call] = STATE(1180),
+    [sym_prefix_cast] = STATE(1180),
+    [sym_unary_expr] = STATE(1180),
+    [sym_mul_expr] = STATE(1180),
+    [sym_add_expr] = STATE(1180),
+    [sym_in_expr] = STATE(1180),
+    [sym_comp_term] = STATE(1180),
+    [sym_instance_of] = STATE(1180),
+    [sym_negation] = STATE(1180),
+    [sym_if_term] = STATE(1180),
+    [sym_conjunction] = STATE(1180),
+    [sym_disjunction] = STATE(1180),
+    [sym_implication] = STATE(1180),
+    [sym_quantified] = STATE(1180),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1180),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -33386,7 +34063,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(127),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -33398,56 +34075,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [345] = {
-    [sym_special_call] = STATE(409),
-    [sym_prefix_cast] = STATE(409),
-    [sym_unary_expr] = STATE(409),
-    [sym_mul_expr] = STATE(409),
-    [sym_add_expr] = STATE(409),
-    [sym_in_expr] = STATE(409),
-    [sym_comp_term] = STATE(409),
-    [sym_instance_of] = STATE(409),
-    [sym_negation] = STATE(409),
-    [sym_if_term] = STATE(409),
-    [sym_conjunction] = STATE(409),
-    [sym_disjunction] = STATE(409),
-    [sym_implication] = STATE(409),
-    [sym_quantified] = STATE(409),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(409),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [349] = {
+    [sym_special_call] = STATE(842),
+    [sym_prefix_cast] = STATE(842),
+    [sym_unary_expr] = STATE(842),
+    [sym_mul_expr] = STATE(842),
+    [sym_add_expr] = STATE(842),
+    [sym_in_expr] = STATE(842),
+    [sym_comp_term] = STATE(842),
+    [sym_instance_of] = STATE(842),
+    [sym_negation] = STATE(842),
+    [sym_if_term] = STATE(842),
+    [sym_conjunction] = STATE(842),
+    [sym_disjunction] = STATE(842),
+    [sym_implication] = STATE(842),
+    [sym_quantified] = STATE(842),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(842),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -33468,63 +34146,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [346] = {
-    [sym_special_call] = STATE(1044),
-    [sym_prefix_cast] = STATE(1044),
-    [sym_unary_expr] = STATE(1044),
-    [sym_mul_expr] = STATE(1044),
-    [sym_add_expr] = STATE(1044),
-    [sym_in_expr] = STATE(1044),
-    [sym_comp_term] = STATE(1044),
-    [sym_instance_of] = STATE(1044),
-    [sym_negation] = STATE(1044),
-    [sym_if_term] = STATE(1044),
-    [sym_conjunction] = STATE(1044),
-    [sym_disjunction] = STATE(1044),
-    [sym_implication] = STATE(1044),
-    [sym_quantified] = STATE(1044),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1044),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [350] = {
+    [sym_special_call] = STATE(1127),
+    [sym_prefix_cast] = STATE(1127),
+    [sym_unary_expr] = STATE(1127),
+    [sym_mul_expr] = STATE(1127),
+    [sym_add_expr] = STATE(1127),
+    [sym_in_expr] = STATE(1127),
+    [sym_comp_term] = STATE(1127),
+    [sym_instance_of] = STATE(1127),
+    [sym_negation] = STATE(1127),
+    [sym_if_term] = STATE(1127),
+    [sym_conjunction] = STATE(1127),
+    [sym_disjunction] = STATE(1127),
+    [sym_implication] = STATE(1127),
+    [sym_quantified] = STATE(1127),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1127),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1774),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -33550,7 +34229,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -33562,47 +34241,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [347] = {
-    [sym_special_call] = STATE(1042),
-    [sym_prefix_cast] = STATE(1042),
-    [sym_unary_expr] = STATE(1042),
-    [sym_mul_expr] = STATE(1042),
-    [sym_add_expr] = STATE(1042),
-    [sym_in_expr] = STATE(1042),
-    [sym_comp_term] = STATE(1042),
-    [sym_instance_of] = STATE(1042),
-    [sym_negation] = STATE(1042),
-    [sym_if_term] = STATE(1042),
-    [sym_conjunction] = STATE(1042),
-    [sym_disjunction] = STATE(1042),
-    [sym_implication] = STATE(1042),
-    [sym_quantified] = STATE(1042),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1042),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [351] = {
+    [sym_special_call] = STATE(972),
+    [sym_prefix_cast] = STATE(972),
+    [sym_unary_expr] = STATE(972),
+    [sym_mul_expr] = STATE(972),
+    [sym_add_expr] = STATE(972),
+    [sym_in_expr] = STATE(972),
+    [sym_comp_term] = STATE(972),
+    [sym_instance_of] = STATE(972),
+    [sym_negation] = STATE(972),
+    [sym_if_term] = STATE(972),
+    [sym_conjunction] = STATE(972),
+    [sym_disjunction] = STATE(972),
+    [sym_implication] = STATE(972),
+    [sym_quantified] = STATE(972),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(972),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
     [anon_sym_LPAREN] = ACTIONS(111),
     [anon_sym_not] = ACTIONS(115),
@@ -33644,56 +34324,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [348] = {
-    [sym_special_call] = STATE(410),
-    [sym_prefix_cast] = STATE(410),
-    [sym_unary_expr] = STATE(410),
-    [sym_mul_expr] = STATE(410),
-    [sym_add_expr] = STATE(410),
-    [sym_in_expr] = STATE(410),
-    [sym_comp_term] = STATE(410),
-    [sym_instance_of] = STATE(410),
-    [sym_negation] = STATE(410),
-    [sym_if_term] = STATE(410),
-    [sym_conjunction] = STATE(410),
-    [sym_disjunction] = STATE(410),
-    [sym_implication] = STATE(410),
-    [sym_quantified] = STATE(410),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(410),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
+  [352] = {
+    [sym_special_call] = STATE(829),
+    [sym_prefix_cast] = STATE(829),
+    [sym_unary_expr] = STATE(829),
+    [sym_mul_expr] = STATE(829),
+    [sym_add_expr] = STATE(829),
+    [sym_in_expr] = STATE(829),
+    [sym_comp_term] = STATE(829),
+    [sym_instance_of] = STATE(829),
+    [sym_negation] = STATE(829),
+    [sym_if_term] = STATE(829),
+    [sym_conjunction] = STATE(829),
+    [sym_disjunction] = STATE(829),
+    [sym_implication] = STATE(829),
+    [sym_quantified] = STATE(829),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(829),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -33714,63 +34395,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [349] = {
-    [sym_special_call] = STATE(1119),
-    [sym_prefix_cast] = STATE(1119),
-    [sym_unary_expr] = STATE(1119),
-    [sym_mul_expr] = STATE(1119),
-    [sym_add_expr] = STATE(1119),
-    [sym_in_expr] = STATE(1119),
-    [sym_comp_term] = STATE(1119),
-    [sym_instance_of] = STATE(1119),
-    [sym_negation] = STATE(1119),
-    [sym_if_term] = STATE(1119),
-    [sym_conjunction] = STATE(1119),
-    [sym_disjunction] = STATE(1119),
-    [sym_implication] = STATE(1119),
-    [sym_quantified] = STATE(1119),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1119),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [353] = {
+    [sym_special_call] = STATE(1077),
+    [sym_prefix_cast] = STATE(1077),
+    [sym_unary_expr] = STATE(1077),
+    [sym_mul_expr] = STATE(1077),
+    [sym_add_expr] = STATE(1077),
+    [sym_in_expr] = STATE(1077),
+    [sym_comp_term] = STATE(1077),
+    [sym_instance_of] = STATE(1077),
+    [sym_negation] = STATE(1077),
+    [sym_if_term] = STATE(1077),
+    [sym_conjunction] = STATE(1077),
+    [sym_disjunction] = STATE(1077),
+    [sym_implication] = STATE(1077),
+    [sym_quantified] = STATE(1077),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1077),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(250),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(285),
+    [anon_sym_not] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(289),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -33796,7 +34478,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -33808,56 +34490,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [350] = {
-    [sym_special_call] = STATE(1019),
-    [sym_prefix_cast] = STATE(1019),
-    [sym_unary_expr] = STATE(1019),
-    [sym_mul_expr] = STATE(1019),
-    [sym_add_expr] = STATE(1019),
-    [sym_in_expr] = STATE(1019),
-    [sym_comp_term] = STATE(1019),
-    [sym_instance_of] = STATE(1019),
-    [sym_negation] = STATE(1019),
-    [sym_if_term] = STATE(1019),
-    [sym_conjunction] = STATE(1019),
-    [sym_disjunction] = STATE(1019),
-    [sym_implication] = STATE(1019),
-    [sym_quantified] = STATE(1019),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1019),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+  [354] = {
+    [sym_special_call] = STATE(833),
+    [sym_prefix_cast] = STATE(833),
+    [sym_unary_expr] = STATE(833),
+    [sym_mul_expr] = STATE(833),
+    [sym_add_expr] = STATE(833),
+    [sym_in_expr] = STATE(833),
+    [sym_comp_term] = STATE(833),
+    [sym_instance_of] = STATE(833),
+    [sym_negation] = STATE(833),
+    [sym_if_term] = STATE(833),
+    [sym_conjunction] = STATE(833),
+    [sym_disjunction] = STATE(833),
+    [sym_implication] = STATE(833),
+    [sym_quantified] = STATE(833),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(833),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -33878,63 +34561,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
-  [351] = {
-    [sym_special_call] = STATE(770),
-    [sym_prefix_cast] = STATE(770),
-    [sym_unary_expr] = STATE(770),
-    [sym_mul_expr] = STATE(770),
-    [sym_add_expr] = STATE(770),
-    [sym_in_expr] = STATE(770),
-    [sym_comp_term] = STATE(770),
-    [sym_instance_of] = STATE(770),
-    [sym_negation] = STATE(770),
-    [sym_if_term] = STATE(770),
-    [sym_conjunction] = STATE(770),
-    [sym_disjunction] = STATE(770),
-    [sym_implication] = STATE(770),
-    [sym_quantified] = STATE(770),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(770),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [355] = {
+    [sym_special_call] = STATE(1058),
+    [sym_prefix_cast] = STATE(1058),
+    [sym_unary_expr] = STATE(1058),
+    [sym_mul_expr] = STATE(1058),
+    [sym_add_expr] = STATE(1058),
+    [sym_in_expr] = STATE(1058),
+    [sym_comp_term] = STATE(1058),
+    [sym_instance_of] = STATE(1058),
+    [sym_negation] = STATE(1058),
+    [sym_if_term] = STATE(1058),
+    [sym_conjunction] = STATE(1058),
+    [sym_disjunction] = STATE(1058),
+    [sym_implication] = STATE(1058),
+    [sym_quantified] = STATE(1058),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1058),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1754),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -33960,7 +34644,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
+    [sym__upper_id] = ACTIONS(293),
     [sym_integer] = ACTIONS(129),
     [sym_float] = ACTIONS(131),
     [sym_string] = ACTIONS(131),
@@ -33972,379 +34656,52 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_this] = ACTIONS(135),
     [sym_true] = ACTIONS(133),
   },
-  [352] = {
-    [sym_special_call] = STATE(752),
-    [sym_prefix_cast] = STATE(752),
-    [sym_unary_expr] = STATE(752),
-    [sym_mul_expr] = STATE(752),
-    [sym_add_expr] = STATE(752),
-    [sym_in_expr] = STATE(752),
-    [sym_comp_term] = STATE(752),
-    [sym_instance_of] = STATE(752),
-    [sym_negation] = STATE(752),
-    [sym_if_term] = STATE(752),
-    [sym_conjunction] = STATE(752),
-    [sym_disjunction] = STATE(752),
-    [sym_implication] = STATE(752),
-    [sym_quantified] = STATE(752),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(752),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
+  [356] = {
+    [sym_special_call] = STATE(1046),
+    [sym_prefix_cast] = STATE(1046),
+    [sym_unary_expr] = STATE(1046),
+    [sym_mul_expr] = STATE(1046),
+    [sym_add_expr] = STATE(1046),
+    [sym_in_expr] = STATE(1046),
+    [sym_comp_term] = STATE(1046),
+    [sym_instance_of] = STATE(1046),
+    [sym_negation] = STATE(1046),
+    [sym_if_term] = STATE(1046),
+    [sym_conjunction] = STATE(1046),
+    [sym_disjunction] = STATE(1046),
+    [sym_implication] = STATE(1046),
+    [sym_quantified] = STATE(1046),
+    [sym_quantifier] = STATE(1900),
+    [sym_call_or_unqual_agg_expr] = STATE(753),
+    [sym_qualified_expr] = STATE(753),
+    [sym_super_ref] = STATE(753),
+    [sym_aggregate] = STATE(753),
+    [sym_range] = STATE(753),
+    [sym_set_literal] = STATE(753),
+    [sym_par_expr] = STATE(753),
+    [sym_expr_annotation] = STATE(753),
+    [sym__exprOrTerm] = STATE(1046),
+    [sym__primary] = STATE(753),
+    [sym_literal] = STATE(753),
+    [sym_bool] = STATE(732),
+    [sym_variable] = STATE(753),
+    [sym_unop] = STATE(316),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1895),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
     [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1889),
+    [sym_aritylessPredicateExpr] = STATE(1457),
+    [sym_varName] = STATE(735),
+    [sym_aggId] = STATE(1759),
     [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
-  },
-  [353] = {
-    [sym_special_call] = STATE(378),
-    [sym_prefix_cast] = STATE(378),
-    [sym_unary_expr] = STATE(378),
-    [sym_mul_expr] = STATE(378),
-    [sym_add_expr] = STATE(378),
-    [sym_in_expr] = STATE(378),
-    [sym_comp_term] = STATE(378),
-    [sym_instance_of] = STATE(378),
-    [sym_negation] = STATE(378),
-    [sym_if_term] = STATE(378),
-    [sym_conjunction] = STATE(378),
-    [sym_disjunction] = STATE(378),
-    [sym_implication] = STATE(378),
-    [sym_quantified] = STATE(378),
-    [sym_quantifier] = STATE(1856),
-    [sym_call_or_unqual_agg_expr] = STATE(483),
-    [sym_qualified_expr] = STATE(483),
-    [sym_super_ref] = STATE(483),
-    [sym_aggregate] = STATE(483),
-    [sym_range] = STATE(483),
-    [sym_set_literal] = STATE(483),
-    [sym_par_expr] = STATE(483),
-    [sym_expr_annotation] = STATE(483),
-    [sym__exprOrTerm] = STATE(378),
-    [sym__primary] = STATE(483),
-    [sym_literal] = STATE(483),
-    [sym_bool] = STATE(488),
-    [sym_variable] = STATE(483),
-    [sym_unop] = STATE(298),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(2000),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(420),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1857),
-    [sym_aritylessPredicateExpr] = STATE(1467),
-    [sym_varName] = STATE(485),
-    [sym_aggId] = STATE(1796),
-    [sym__lower_id] = ACTIONS(467),
-    [anon_sym_LPAREN] = ACTIONS(469),
-    [anon_sym_not] = ACTIONS(471),
-    [anon_sym_if] = ACTIONS(473),
-    [sym_specialId] = ACTIONS(475),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(477),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(479),
-    [sym_integer] = ACTIONS(481),
-    [sym_float] = ACTIONS(483),
-    [sym_string] = ACTIONS(483),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(485),
-    [sym_result] = ACTIONS(487),
-    [sym_super] = ACTIONS(489),
-    [sym_this] = ACTIONS(487),
-    [sym_true] = ACTIONS(485),
-  },
-  [354] = {
-    [sym_special_call] = STATE(1059),
-    [sym_prefix_cast] = STATE(1059),
-    [sym_unary_expr] = STATE(1059),
-    [sym_mul_expr] = STATE(1059),
-    [sym_add_expr] = STATE(1059),
-    [sym_in_expr] = STATE(1059),
-    [sym_comp_term] = STATE(1059),
-    [sym_instance_of] = STATE(1059),
-    [sym_negation] = STATE(1059),
-    [sym_if_term] = STATE(1059),
-    [sym_conjunction] = STATE(1059),
-    [sym_disjunction] = STATE(1059),
-    [sym_implication] = STATE(1059),
-    [sym_quantified] = STATE(1059),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1059),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(352),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(309),
-    [anon_sym_not] = ACTIONS(311),
-    [anon_sym_if] = ACTIONS(313),
-    [sym_specialId] = ACTIONS(121),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(317),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
-  },
-  [355] = {
-    [sym_special_call] = STATE(1060),
-    [sym_prefix_cast] = STATE(1060),
-    [sym_unary_expr] = STATE(1060),
-    [sym_mul_expr] = STATE(1060),
-    [sym_add_expr] = STATE(1060),
-    [sym_in_expr] = STATE(1060),
-    [sym_comp_term] = STATE(1060),
-    [sym_instance_of] = STATE(1060),
-    [sym_negation] = STATE(1060),
-    [sym_if_term] = STATE(1060),
-    [sym_conjunction] = STATE(1060),
-    [sym_disjunction] = STATE(1060),
-    [sym_implication] = STATE(1060),
-    [sym_quantified] = STATE(1060),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1060),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
-    [anon_sym_exists] = ACTIONS(49),
-    [anon_sym_forall] = ACTIONS(49),
-    [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
-    [anon_sym_PLUS] = ACTIONS(53),
-    [anon_sym_DASH] = ACTIONS(53),
-    [anon_sym_boolean] = ACTIONS(27),
-    [anon_sym_date] = ACTIONS(27),
-    [anon_sym_float] = ACTIONS(27),
-    [anon_sym_int] = ACTIONS(27),
-    [anon_sym_string] = ACTIONS(27),
-    [sym_dbtype] = ACTIONS(29),
-    [anon_sym_avg] = ACTIONS(55),
-    [anon_sym_concat] = ACTIONS(55),
-    [anon_sym_strictconcat] = ACTIONS(55),
-    [anon_sym_count] = ACTIONS(55),
-    [anon_sym_max] = ACTIONS(55),
-    [anon_sym_min] = ACTIONS(55),
-    [anon_sym_rank] = ACTIONS(55),
-    [anon_sym_strictcount] = ACTIONS(55),
-    [anon_sym_strictsum] = ACTIONS(55),
-    [anon_sym_sum] = ACTIONS(55),
-    [anon_sym_any] = ACTIONS(55),
-    [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
-    [sym_line_comment] = ACTIONS(3),
-    [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
-  },
-  [356] = {
-    [sym_special_call] = STATE(1061),
-    [sym_prefix_cast] = STATE(1061),
-    [sym_unary_expr] = STATE(1061),
-    [sym_mul_expr] = STATE(1061),
-    [sym_add_expr] = STATE(1061),
-    [sym_in_expr] = STATE(1061),
-    [sym_comp_term] = STATE(1061),
-    [sym_instance_of] = STATE(1061),
-    [sym_negation] = STATE(1061),
-    [sym_if_term] = STATE(1061),
-    [sym_conjunction] = STATE(1061),
-    [sym_disjunction] = STATE(1061),
-    [sym_implication] = STATE(1061),
-    [sym_quantified] = STATE(1061),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1061),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
+    [anon_sym_LPAREN] = ACTIONS(111),
+    [anon_sym_not] = ACTIONS(115),
+    [anon_sym_if] = ACTIONS(117),
     [sym_specialId] = ACTIONS(121),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
@@ -34383,55 +34740,56 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_true] = ACTIONS(133),
   },
   [357] = {
-    [sym_special_call] = STATE(395),
-    [sym_prefix_cast] = STATE(395),
-    [sym_unary_expr] = STATE(395),
-    [sym_mul_expr] = STATE(395),
-    [sym_add_expr] = STATE(395),
-    [sym_in_expr] = STATE(395),
-    [sym_comp_term] = STATE(395),
-    [sym_instance_of] = STATE(395),
-    [sym_negation] = STATE(395),
-    [sym_if_term] = STATE(395),
-    [sym_conjunction] = STATE(395),
-    [sym_disjunction] = STATE(395),
-    [sym_implication] = STATE(395),
-    [sym_quantified] = STATE(395),
-    [sym_quantifier] = STATE(1996),
-    [sym_call_or_unqual_agg_expr] = STATE(575),
-    [sym_qualified_expr] = STATE(575),
-    [sym_super_ref] = STATE(575),
-    [sym_aggregate] = STATE(575),
-    [sym_range] = STATE(575),
-    [sym_set_literal] = STATE(575),
-    [sym_par_expr] = STATE(575),
-    [sym_expr_annotation] = STATE(575),
-    [sym__exprOrTerm] = STATE(395),
-    [sym__primary] = STATE(575),
-    [sym_literal] = STATE(575),
-    [sym_bool] = STATE(596),
-    [sym_variable] = STATE(575),
-    [sym_unop] = STATE(259),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1997),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(419),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1881),
-    [sym_aritylessPredicateExpr] = STATE(1472),
-    [sym_varName] = STATE(598),
-    [sym_aggId] = STATE(1795),
-    [sym__lower_id] = ACTIONS(283),
-    [anon_sym_LPAREN] = ACTIONS(285),
-    [anon_sym_not] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(289),
-    [sym_specialId] = ACTIONS(291),
+    [sym_special_call] = STATE(819),
+    [sym_prefix_cast] = STATE(819),
+    [sym_unary_expr] = STATE(819),
+    [sym_mul_expr] = STATE(819),
+    [sym_add_expr] = STATE(819),
+    [sym_in_expr] = STATE(819),
+    [sym_comp_term] = STATE(819),
+    [sym_instance_of] = STATE(819),
+    [sym_negation] = STATE(819),
+    [sym_if_term] = STATE(819),
+    [sym_conjunction] = STATE(819),
+    [sym_disjunction] = STATE(819),
+    [sym_implication] = STATE(819),
+    [sym_quantified] = STATE(819),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(819),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(293),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -34452,68 +34810,69 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(295),
-    [sym_integer] = ACTIONS(297),
-    [sym_float] = ACTIONS(299),
-    [sym_string] = ACTIONS(299),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(301),
-    [sym_result] = ACTIONS(303),
-    [sym_super] = ACTIONS(305),
-    [sym_this] = ACTIONS(303),
-    [sym_true] = ACTIONS(301),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
   [358] = {
-    [sym_special_call] = STATE(1040),
-    [sym_prefix_cast] = STATE(1040),
-    [sym_unary_expr] = STATE(1040),
-    [sym_mul_expr] = STATE(1040),
-    [sym_add_expr] = STATE(1040),
-    [sym_in_expr] = STATE(1040),
-    [sym_comp_term] = STATE(1040),
-    [sym_instance_of] = STATE(1040),
-    [sym_negation] = STATE(1040),
-    [sym_if_term] = STATE(1040),
-    [sym_conjunction] = STATE(1040),
-    [sym_disjunction] = STATE(1040),
-    [sym_implication] = STATE(1040),
-    [sym_quantified] = STATE(1040),
-    [sym_quantifier] = STATE(1962),
-    [sym_call_or_unqual_agg_expr] = STATE(722),
-    [sym_qualified_expr] = STATE(722),
-    [sym_super_ref] = STATE(722),
-    [sym_aggregate] = STATE(722),
-    [sym_range] = STATE(722),
-    [sym_set_literal] = STATE(722),
-    [sym_par_expr] = STATE(722),
-    [sym_expr_annotation] = STATE(722),
-    [sym__exprOrTerm] = STATE(1040),
-    [sym__primary] = STATE(722),
-    [sym_literal] = STATE(722),
-    [sym_bool] = STATE(715),
-    [sym_variable] = STATE(722),
-    [sym_unop] = STATE(322),
-    [sym_literalId] = STATE(1593),
-    [sym_annotName] = STATE(1958),
-    [sym_moduleExpr] = STATE(1957),
-    [sym_moduleInstantiation] = STATE(1759),
-    [sym_primitiveType] = STATE(1443),
-    [sym_simpleId] = STATE(705),
-    [sym_className] = STATE(1438),
-    [sym_typeExpr] = STATE(1954),
-    [sym_aritylessPredicateExpr] = STATE(1462),
-    [sym_varName] = STATE(720),
-    [sym_aggId] = STATE(1762),
-    [sym__lower_id] = ACTIONS(109),
-    [anon_sym_LPAREN] = ACTIONS(111),
-    [anon_sym_not] = ACTIONS(115),
-    [anon_sym_if] = ACTIONS(117),
-    [sym_specialId] = ACTIONS(121),
+    [sym_special_call] = STATE(839),
+    [sym_prefix_cast] = STATE(839),
+    [sym_unary_expr] = STATE(839),
+    [sym_mul_expr] = STATE(839),
+    [sym_add_expr] = STATE(839),
+    [sym_in_expr] = STATE(839),
+    [sym_comp_term] = STATE(839),
+    [sym_instance_of] = STATE(839),
+    [sym_negation] = STATE(839),
+    [sym_if_term] = STATE(839),
+    [sym_conjunction] = STATE(839),
+    [sym_disjunction] = STATE(839),
+    [sym_implication] = STATE(839),
+    [sym_quantified] = STATE(839),
+    [sym_quantifier] = STATE(1801),
+    [sym_call_or_unqual_agg_expr] = STATE(965),
+    [sym_qualified_expr] = STATE(965),
+    [sym_super_ref] = STATE(965),
+    [sym_aggregate] = STATE(965),
+    [sym_range] = STATE(965),
+    [sym_set_literal] = STATE(965),
+    [sym_par_expr] = STATE(965),
+    [sym_expr_annotation] = STATE(965),
+    [sym__exprOrTerm] = STATE(839),
+    [sym__primary] = STATE(965),
+    [sym_literal] = STATE(965),
+    [sym_bool] = STATE(969),
+    [sym_variable] = STATE(965),
+    [sym_unop] = STATE(331),
+    [sym_literalId] = STATE(1575),
+    [sym_annotName] = STATE(1999),
+    [sym_moduleName] = STATE(1971),
+    [sym_moduleExpr] = STATE(1894),
+    [sym_moduleInstantiation] = STATE(1776),
+    [sym_primitiveType] = STATE(1442),
+    [sym_simpleId] = STATE(866),
+    [sym_className] = STATE(1433),
+    [sym_typeExpr] = STATE(1840),
+    [sym_aritylessPredicateExpr] = STATE(1456),
+    [sym_varName] = STATE(967),
+    [sym_aggId] = STATE(1800),
+    [sym__lower_id] = ACTIONS(35),
+    [anon_sym_LPAREN] = ACTIONS(37),
+    [anon_sym_not] = ACTIONS(41),
+    [anon_sym_if] = ACTIONS(43),
+    [sym_specialId] = ACTIONS(47),
     [anon_sym_exists] = ACTIONS(49),
     [anon_sym_forall] = ACTIONS(49),
     [anon_sym_forex] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(125),
+    [anon_sym_LBRACK] = ACTIONS(51),
     [anon_sym_PLUS] = ACTIONS(53),
     [anon_sym_DASH] = ACTIONS(53),
     [anon_sym_boolean] = ACTIONS(27),
@@ -34534,70 +34893,72 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_sum] = ACTIONS(55),
     [anon_sym_any] = ACTIONS(55),
     [anon_sym_unique] = ACTIONS(55),
-    [sym__upper_id] = ACTIONS(127),
-    [sym_integer] = ACTIONS(129),
-    [sym_float] = ACTIONS(131),
-    [sym_string] = ACTIONS(131),
+    [sym__upper_id] = ACTIONS(57),
+    [sym_integer] = ACTIONS(59),
+    [sym_float] = ACTIONS(61),
+    [sym_string] = ACTIONS(61),
     [sym_line_comment] = ACTIONS(3),
     [sym_block_comment] = ACTIONS(3),
-    [sym_false] = ACTIONS(133),
-    [sym_result] = ACTIONS(135),
-    [sym_super] = ACTIONS(137),
-    [sym_this] = ACTIONS(135),
-    [sym_true] = ACTIONS(133),
+    [sym_false] = ACTIONS(63),
+    [sym_result] = ACTIONS(65),
+    [sym_super] = ACTIONS(67),
+    [sym_this] = ACTIONS(65),
+    [sym_true] = ACTIONS(63),
   },
 };
 
 static const uint16_t ts_small_parse_table[] = {
-  [0] = 26,
+  [0] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(467), 1,
+    ACTIONS(109), 1,
       sym__lower_id,
-    ACTIONS(477), 1,
+    ACTIONS(125), 1,
       anon_sym_LBRACK,
-    ACTIONS(479), 1,
-      sym__upper_id,
-    ACTIONS(481), 1,
+    ACTIONS(129), 1,
       sym_integer,
-    ACTIONS(489), 1,
+    ACTIONS(137), 1,
       sym_super,
+    ACTIONS(293), 1,
+      sym__upper_id,
     ACTIONS(565), 1,
       anon_sym_LPAREN,
-    STATE(420), 1,
+    STATE(705), 1,
       sym_simpleId,
-    STATE(485), 1,
-      sym_varName,
-    STATE(488), 1,
+    STATE(732), 1,
       sym_bool,
-    STATE(1438), 1,
+    STATE(735), 1,
+      sym_varName,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1467), 1,
+    STATE(1457), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
     STATE(1759), 1,
-      sym_moduleInstantiation,
-    STATE(1796), 1,
       sym_aggId,
-    STATE(1857), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1889), 1,
       sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(2000), 1,
+    STATE(1895), 1,
       sym_annotName,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(483), 2,
+    ACTIONS(131), 2,
       sym_float,
       sym_string,
-    ACTIONS(485), 2,
+    ACTIONS(133), 2,
       sym_false,
       sym_true,
-    ACTIONS(487), 2,
+    ACTIONS(135), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -34606,7 +34967,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(456), 11,
+    STATE(717), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -34631,55 +34992,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [108] = 26,
+  [111] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(515), 1,
+    ACTIONS(501), 1,
       sym__lower_id,
-    ACTIONS(525), 1,
+    ACTIONS(511), 1,
       anon_sym_LBRACK,
-    ACTIONS(527), 1,
+    ACTIONS(513), 1,
       sym__upper_id,
-    ACTIONS(529), 1,
+    ACTIONS(515), 1,
       sym_integer,
-    ACTIONS(537), 1,
+    ACTIONS(523), 1,
       sym_super,
     ACTIONS(567), 1,
       anon_sym_LPAREN,
     STATE(422), 1,
       sym_simpleId,
-    STATE(481), 1,
+    STATE(466), 1,
       sym_bool,
-    STATE(487), 1,
+    STATE(471), 1,
       sym_varName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1470), 1,
+    STATE(1459), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1759), 1,
-      sym_moduleInstantiation,
-    STATE(1777), 1,
+    STATE(1767), 1,
       sym_aggId,
-    STATE(1907), 1,
-      sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(2002), 1,
+    STATE(1908), 1,
+      sym_typeExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(2003), 1,
       sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(531), 2,
+    ACTIONS(517), 2,
       sym_float,
       sym_string,
-    ACTIONS(533), 2,
+    ACTIONS(519), 2,
       sym_false,
       sym_true,
-    ACTIONS(535), 2,
+    ACTIONS(521), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -34688,7 +35051,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(504), 11,
+    STATE(514), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -34713,55 +35076,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [216] = 26,
+  [222] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(491), 1,
+    ACTIONS(35), 1,
       sym__lower_id,
-    ACTIONS(501), 1,
+    ACTIONS(51), 1,
       anon_sym_LBRACK,
-    ACTIONS(503), 1,
+    ACTIONS(57), 1,
       sym__upper_id,
-    ACTIONS(505), 1,
+    ACTIONS(59), 1,
       sym_integer,
-    ACTIONS(513), 1,
+    ACTIONS(67), 1,
       sym_super,
     ACTIONS(569), 1,
       anon_sym_LPAREN,
-    STATE(868), 1,
+    STATE(866), 1,
       sym_simpleId,
-    STATE(934), 1,
+    STATE(967), 1,
       sym_varName,
-    STATE(936), 1,
+    STATE(969), 1,
       sym_bool,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1473), 1,
+    STATE(1456), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1759), 1,
+    STATE(1776), 1,
       sym_moduleInstantiation,
-    STATE(1783), 1,
+    STATE(1800), 1,
       sym_aggId,
-    STATE(1880), 1,
+    STATE(1840), 1,
       sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(2001), 1,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(1999), 1,
       sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(507), 2,
+    ACTIONS(61), 2,
       sym_float,
       sym_string,
-    ACTIONS(509), 2,
+    ACTIONS(63), 2,
       sym_false,
       sym_true,
-    ACTIONS(511), 2,
+    ACTIONS(65), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -34770,7 +35135,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(897), 11,
+    STATE(940), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -34795,55 +35160,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [324] = 26,
+  [333] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(109), 1,
+    ACTIONS(529), 1,
       sym__lower_id,
-    ACTIONS(125), 1,
+    ACTIONS(539), 1,
       anon_sym_LBRACK,
-    ACTIONS(127), 1,
+    ACTIONS(541), 1,
       sym__upper_id,
-    ACTIONS(129), 1,
+    ACTIONS(543), 1,
       sym_integer,
-    ACTIONS(137), 1,
+    ACTIONS(551), 1,
       sym_super,
     ACTIONS(571), 1,
       anon_sym_LPAREN,
-    STATE(705), 1,
+    STATE(864), 1,
       sym_simpleId,
-    STATE(715), 1,
-      sym_bool,
-    STATE(720), 1,
+    STATE(959), 1,
       sym_varName,
-    STATE(1438), 1,
+    STATE(962), 1,
+      sym_bool,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1462), 1,
+    STATE(1458), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1759), 1,
-      sym_moduleInstantiation,
-    STATE(1762), 1,
+    STATE(1758), 1,
       sym_aggId,
-    STATE(1954), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1881), 1,
       sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(1958), 1,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(2002), 1,
       sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(131), 2,
+    ACTIONS(545), 2,
       sym_float,
       sym_string,
-    ACTIONS(133), 2,
+    ACTIONS(547), 2,
       sym_false,
       sym_true,
-    ACTIONS(135), 2,
+    ACTIONS(549), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -34852,7 +35219,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(742), 11,
+    STATE(914), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -34877,55 +35244,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [432] = 26,
+  [444] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(283), 1,
+    ACTIONS(339), 1,
       sym__lower_id,
-    ACTIONS(293), 1,
+    ACTIONS(349), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(351), 1,
       sym__upper_id,
-    ACTIONS(297), 1,
+    ACTIONS(353), 1,
       sym_integer,
-    ACTIONS(305), 1,
+    ACTIONS(361), 1,
       sym_super,
     ACTIONS(573), 1,
       anon_sym_LPAREN,
-    STATE(419), 1,
+    STATE(421), 1,
       sym_simpleId,
-    STATE(596), 1,
-      sym_bool,
-    STATE(598), 1,
+    STATE(572), 1,
       sym_varName,
-    STATE(1438), 1,
+    STATE(575), 1,
+      sym_bool,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1472), 1,
+    STATE(1469), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1759), 1,
-      sym_moduleInstantiation,
-    STATE(1795), 1,
+    STATE(1774), 1,
       sym_aggId,
-    STATE(1881), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1856), 1,
       sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(1997), 1,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(1998), 1,
       sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(299), 2,
+    ACTIONS(355), 2,
       sym_float,
       sym_string,
-    ACTIONS(301), 2,
+    ACTIONS(357), 2,
       sym_false,
       sym_true,
-    ACTIONS(303), 2,
+    ACTIONS(359), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -34934,7 +35303,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(502), 11,
+    STATE(510), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -34959,55 +35328,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [540] = 26,
+  [555] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(109), 1,
+    ACTIONS(467), 1,
       sym__lower_id,
-    ACTIONS(125), 1,
+    ACTIONS(477), 1,
       anon_sym_LBRACK,
-    ACTIONS(129), 1,
+    ACTIONS(479), 1,
+      sym__upper_id,
+    ACTIONS(481), 1,
       sym_integer,
-    ACTIONS(137), 1,
+    ACTIONS(489), 1,
       sym_super,
-    ACTIONS(317), 1,
-      sym__upper_id,
-    ACTIONS(571), 1,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    STATE(705), 1,
+    STATE(419), 1,
       sym_simpleId,
-    STATE(715), 1,
+    STATE(517), 1,
       sym_bool,
-    STATE(720), 1,
+    STATE(535), 1,
       sym_varName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1462), 1,
+    STATE(1467), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1759), 1,
+    STATE(1776), 1,
       sym_moduleInstantiation,
-    STATE(1762), 1,
+    STATE(1796), 1,
       sym_aggId,
-    STATE(1954), 1,
+    STATE(1854), 1,
       sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(1958), 1,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(2001), 1,
       sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(131), 2,
+    ACTIONS(483), 2,
       sym_float,
       sym_string,
-    ACTIONS(133), 2,
+    ACTIONS(485), 2,
       sym_false,
       sym_true,
-    ACTIONS(135), 2,
+    ACTIONS(487), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -35016,7 +35387,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(742), 11,
+    STATE(554), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -35041,55 +35412,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [648] = 26,
+  [666] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(319), 1,
+    ACTIONS(295), 1,
       sym__lower_id,
-    ACTIONS(329), 1,
+    ACTIONS(305), 1,
       anon_sym_LBRACK,
-    ACTIONS(331), 1,
+    ACTIONS(307), 1,
       sym__upper_id,
-    ACTIONS(333), 1,
+    ACTIONS(309), 1,
       sym_integer,
-    ACTIONS(341), 1,
+    ACTIONS(317), 1,
       sym_super,
-    ACTIONS(575), 1,
+    ACTIONS(577), 1,
       anon_sym_LPAREN,
-    STATE(421), 1,
+    STATE(420), 1,
       sym_simpleId,
-    STATE(587), 1,
+    STATE(425), 1,
       sym_varName,
-    STATE(590), 1,
+    STATE(427), 1,
       sym_bool,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
     STATE(1460), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1759), 1,
-      sym_moduleInstantiation,
-    STATE(1786), 1,
+    STATE(1764), 1,
       sym_aggId,
-    STATE(1814), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1827), 1,
       sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(1999), 1,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(2000), 1,
       sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(335), 2,
+    ACTIONS(311), 2,
       sym_float,
       sym_string,
-    ACTIONS(337), 2,
+    ACTIONS(313), 2,
       sym_false,
       sym_true,
-    ACTIONS(339), 2,
+    ACTIONS(315), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -35098,7 +35471,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(557), 11,
+    STATE(445), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -35123,55 +35496,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [756] = 26,
+  [777] = 27,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(35), 1,
+    ACTIONS(109), 1,
       sym__lower_id,
-    ACTIONS(51), 1,
+    ACTIONS(125), 1,
       anon_sym_LBRACK,
-    ACTIONS(57), 1,
+    ACTIONS(127), 1,
       sym__upper_id,
-    ACTIONS(59), 1,
+    ACTIONS(129), 1,
       sym_integer,
-    ACTIONS(67), 1,
+    ACTIONS(137), 1,
       sym_super,
-    ACTIONS(577), 1,
+    ACTIONS(565), 1,
       anon_sym_LPAREN,
-    STATE(872), 1,
+    STATE(705), 1,
       sym_simpleId,
-    STATE(1022), 1,
+    STATE(732), 1,
       sym_bool,
-    STATE(1031), 1,
+    STATE(735), 1,
       sym_varName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1463), 1,
+    STATE(1457), 1,
       sym_aritylessPredicateExpr,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
     STATE(1759), 1,
-      sym_moduleInstantiation,
-    STATE(1799), 1,
       sym_aggId,
-    STATE(1837), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1889), 1,
       sym_typeExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
-    STATE(1998), 1,
+    STATE(1895), 1,
       sym_annotName,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(61), 2,
+    ACTIONS(131), 2,
       sym_float,
       sym_string,
-    ACTIONS(63), 2,
+    ACTIONS(133), 2,
       sym_false,
       sym_true,
-    ACTIONS(65), 2,
+    ACTIONS(135), 2,
       sym_result,
       sym_this,
     ACTIONS(27), 5,
@@ -35180,7 +35555,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(968), 11,
+    STATE(717), 11,
       sym_call_or_unqual_agg_expr,
       sym_qualified_expr,
       sym_super_ref,
@@ -35205,7 +35580,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_sum,
       anon_sym_any,
       anon_sym_unique,
-  [864] = 7,
+  [888] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -35217,9 +35592,9 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(579), 13,
-      ts_builtin_sym_end,
+    ACTIONS(581), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -35231,7 +35606,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 24,
+    ACTIONS(579), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -35256,7 +35631,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [922] = 19,
+  [946] = 19,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -35273,15 +35648,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_implies,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(201), 1,
+    STATE(308), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(309), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(311), 1,
       sym_compop,
-    STATE(1206), 1,
+    STATE(1213), 1,
       sym_direction,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -35298,13 +35673,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(594), 5,
+    ACTIONS(590), 5,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(590), 14,
+    ACTIONS(592), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -35319,7 +35694,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1004] = 7,
+  [1028] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -35331,9 +35706,60 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(579), 13,
+    ACTIONS(581), 13,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_DASH,
+      anon_sym_PERCENT,
+      sym_qldoc,
+      anon_sym_COLON_COLON,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(579), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_asc,
+      anon_sym_desc,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [1086] = 7,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(583), 1,
+      anon_sym_LPAREN,
+    ACTIONS(585), 1,
+      anon_sym_LBRACK,
+    ACTIONS(587), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    ACTIONS(581), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -35345,7 +35771,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 24,
+    ACTIONS(579), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -35370,7 +35796,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1062] = 19,
+  [1144] = 19,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -35387,15 +35813,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
     ACTIONS(624), 1,
       anon_sym_implies,
-    STATE(340), 1,
-      sym_compop,
-    STATE(345), 1,
-      sym_mulop,
-    STATE(348), 1,
+    STATE(271), 1,
       sym_addop,
-    STATE(1205), 1,
+    STATE(272), 1,
+      sym_mulop,
+    STATE(274), 1,
+      sym_compop,
+    STATE(1209), 1,
       sym_direction,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -35412,13 +35838,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(594), 5,
-      ts_builtin_sym_end,
+    ACTIONS(590), 5,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(590), 14,
+    ACTIONS(592), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -35433,7 +35859,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1144] = 7,
+  [1226] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -35445,7 +35871,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(579), 13,
+    ACTIONS(581), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -35459,7 +35885,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 24,
+    ACTIONS(579), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -35484,37 +35910,37 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1202] = 7,
+  [1284] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(583), 1,
-      anon_sym_LPAREN,
-    ACTIONS(585), 1,
-      anon_sym_LBRACK,
-    ACTIONS(587), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    ACTIONS(579), 13,
+    STATE(302), 1,
+      sym_compop,
+    STATE(303), 1,
+      sym_mulop,
+    STATE(304), 1,
+      sym_addop,
+    ACTIONS(628), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
+      anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
       anon_sym_PERCENT,
       sym_qldoc,
-      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 24,
+    ACTIONS(630), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -35526,8 +35952,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -35535,37 +35960,37 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1260] = 8,
+  [1341] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(583), 1,
-      anon_sym_LPAREN,
-    ACTIONS(628), 1,
-      anon_sym_LT,
-    ACTIONS(631), 1,
-      anon_sym_DOT,
-    ACTIONS(587), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    ACTIONS(579), 12,
+    STATE(302), 1,
+      sym_compop,
+    STATE(303), 1,
+      sym_mulop,
+    STATE(304), 1,
+      sym_addop,
+    ACTIONS(632), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
+      anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
       anon_sym_PERCENT,
       sym_qldoc,
-      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 23,
+    ACTIONS(634), 24,
       anon_sym_module,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -35577,8 +36002,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -35586,38 +36010,36 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1319] = 8,
+  [1398] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(583), 1,
-      anon_sym_LPAREN,
-    ACTIONS(628), 1,
-      anon_sym_LT,
-    ACTIONS(631), 1,
-      anon_sym_DOT,
-    ACTIONS(587), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    ACTIONS(579), 12,
+    STATE(308), 1,
+      sym_addop,
+    STATE(309), 1,
+      sym_mulop,
+    STATE(311), 1,
+      sym_compop,
+    ACTIONS(632), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
+      anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
       anon_sym_PERCENT,
       sym_qldoc,
-      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 23,
+    ACTIONS(634), 24,
       anon_sym_module,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -35629,7 +36051,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -35637,144 +36060,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1378] = 18,
+  [1455] = 15,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(638), 1,
-      anon_sym_as,
     ACTIONS(640), 1,
-      anon_sym_or,
-    ACTIONS(642), 1,
       anon_sym_instanceof,
-    ACTIONS(644), 1,
-      anon_sym_in,
-    ACTIONS(646), 1,
-      anon_sym_and,
-    ACTIONS(648), 1,
-      anon_sym_implies,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
-      sym_addop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-    ACTIONS(634), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(636), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [1457] = 14,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
     ACTIONS(642), 1,
-      anon_sym_instanceof,
-    ACTIONS(644), 1,
       anon_sym_in,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
-      sym_addop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-    ACTIONS(650), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(652), 19,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [1528] = 15,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(642), 1,
-      anon_sym_instanceof,
     ACTIONS(644), 1,
-      anon_sym_in,
-    ACTIONS(646), 1,
       anon_sym_and,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
+    STATE(332), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    STATE(333), 1,
+      sym_mulop,
+    STATE(334), 1,
+      sym_compop,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -35788,13 +36093,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(654), 5,
-      ts_builtin_sym_end,
+    ACTIONS(638), 5,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(656), 18,
+    ACTIONS(636), 18,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -35813,30 +36118,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1601] = 17,
+  [1528] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(616), 1,
-      anon_sym_or,
-    ACTIONS(618), 1,
+    ACTIONS(640), 1,
       anon_sym_instanceof,
-    ACTIONS(620), 1,
+    ACTIONS(642), 1,
       anon_sym_in,
-    ACTIONS(622), 1,
-      anon_sym_and,
-    ACTIONS(624), 1,
-      anon_sym_implies,
-    STATE(340), 1,
-      sym_compop,
-    STATE(345), 1,
-      sym_mulop,
-    STATE(348), 1,
+    STATE(332), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    STATE(333), 1,
+      sym_mulop,
+    STATE(334), 1,
+      sym_compop,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -35850,22 +36149,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 5,
-      ts_builtin_sym_end,
+    ACTIONS(648), 5,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(660), 16,
+    ACTIONS(646), 19,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -35873,49 +36175,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1678] = 9,
+  [1599] = 16,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(262), 1,
+    ACTIONS(640), 1,
+      anon_sym_instanceof,
+    ACTIONS(642), 1,
+      anon_sym_in,
+    ACTIONS(644), 1,
+      anon_sym_and,
+    ACTIONS(654), 1,
+      anon_sym_or,
+    STATE(332), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(333), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(334), 1,
       sym_compop,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(664), 11,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+    ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
+    ACTIONS(652), 5,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(662), 23,
+    ACTIONS(650), 17,
       anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
       anon_sym_implies,
       anon_sym_order,
       anon_sym_boolean,
@@ -35925,32 +36234,38 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1739] = 7,
+  [1674] = 11,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    STATE(262), 1,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(642), 1,
+      anon_sym_in,
+    STATE(332), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(333), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(334), 1,
       sym_compop,
-    ACTIONS(668), 13,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(658), 9,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(666), 24,
+    ACTIONS(656), 22,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -35963,10 +36278,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_select,
       anon_sym_class,
       anon_sym_instanceof,
-      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_SLASH,
       anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
@@ -35975,20 +36288,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1796] = 7,
+  [1739] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    STATE(262), 1,
+    STATE(308), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(309), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(311), 1,
       sym_compop,
-    ACTIONS(672), 13,
+    ACTIONS(628), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -36000,12 +36313,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(670), 24,
+    ACTIONS(630), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -36017,7 +36329,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36025,18 +36338,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1853] = 7,
+  [1796] = 9,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    STATE(308), 1,
       sym_addop,
-    ACTIONS(672), 13,
+    STATE(309), 1,
+      sym_mulop,
+    STATE(311), 1,
+      sym_compop,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(660), 11,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -36045,17 +36363,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(670), 24,
+    ACTIONS(662), 23,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -36066,8 +36381,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36075,24 +36390,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1910] = 14,
+  [1857] = 17,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(600), 1,
-      anon_sym_instanceof,
-    ACTIONS(602), 1,
-      anon_sym_in,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(201), 1,
+    ACTIONS(640), 1,
+      anon_sym_instanceof,
+    ACTIONS(642), 1,
+      anon_sym_in,
+    ACTIONS(644), 1,
+      anon_sym_and,
+    ACTIONS(654), 1,
+      anon_sym_or,
+    ACTIONS(668), 1,
+      anon_sym_implies,
+    STATE(332), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(333), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(334), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36106,25 +36427,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(676), 5,
+    ACTIONS(666), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(674), 19,
+    ACTIONS(664), 16,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36132,32 +36450,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [1981] = 18,
+  [1934] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(678), 1,
-      anon_sym_as,
-    ACTIONS(680), 1,
-      anon_sym_or,
-    ACTIONS(682), 1,
+    ACTIONS(640), 1,
       anon_sym_instanceof,
-    ACTIONS(684), 1,
+    ACTIONS(642), 1,
       anon_sym_in,
-    ACTIONS(686), 1,
-      anon_sym_and,
-    ACTIONS(688), 1,
-      anon_sym_implies,
-    STATE(262), 1,
+    STATE(332), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(333), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(334), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36171,20 +36481,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(634), 5,
+    ACTIONS(672), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(636), 15,
+    ACTIONS(670), 19,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
@@ -36193,45 +36507,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2060] = 14,
+  [2005] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(618), 1,
-      anon_sym_instanceof,
-    ACTIONS(620), 1,
-      anon_sym_in,
-    STATE(340), 1,
-      sym_compop,
-    STATE(345), 1,
-      sym_mulop,
-    STATE(348), 1,
-      sym_addop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
+    ACTIONS(583), 1,
+      anon_sym_LPAREN,
+    ACTIONS(674), 1,
+      anon_sym_DOT,
+    ACTIONS(587), 2,
       anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(581), 12,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
+      anon_sym_DASH,
+      anon_sym_PERCENT,
       sym_qldoc,
+      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(692), 19,
+    ACTIONS(579), 24,
       anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
       anon_sym_newtype,
@@ -36239,8 +36543,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_SLASH,
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_boolean,
@@ -36250,45 +36557,38 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2131] = 14,
+  [2062] = 9,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(682), 1,
-      anon_sym_instanceof,
-    ACTIONS(684), 1,
-      anon_sym_in,
-    STATE(262), 1,
+    STATE(332), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(333), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(334), 1,
       sym_compop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(660), 11,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(676), 5,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+      anon_sym_PLUS,
+      anon_sym_DASH,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(674), 19,
+    ACTIONS(662), 23,
       anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
       anon_sym_or,
@@ -36297,6 +36597,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
       anon_sym_order,
@@ -36307,24 +36609,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2202] = 14,
+  [2123] = 18,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(600), 1,
-      anon_sym_instanceof,
-    ACTIONS(602), 1,
-      anon_sym_in,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(201), 1,
+    ACTIONS(640), 1,
+      anon_sym_instanceof,
+    ACTIONS(642), 1,
+      anon_sym_in,
+    ACTIONS(644), 1,
+      anon_sym_and,
+    ACTIONS(654), 1,
+      anon_sym_or,
+    ACTIONS(668), 1,
+      anon_sym_implies,
+    ACTIONS(681), 1,
+      anon_sym_as,
+    STATE(332), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(333), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(334), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36338,25 +36648,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 5,
+    ACTIONS(679), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(692), 19,
+    ACTIONS(677), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36364,30 +36670,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2273] = 17,
+  [2202] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(598), 1,
-      anon_sym_or,
-    ACTIONS(600), 1,
-      anon_sym_instanceof,
-    ACTIONS(602), 1,
-      anon_sym_in,
-    ACTIONS(604), 1,
-      anon_sym_and,
-    ACTIONS(606), 1,
-      anon_sym_implies,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(201), 1,
+    ACTIONS(618), 1,
+      anon_sym_instanceof,
+    ACTIONS(620), 1,
+      anon_sym_in,
+    STATE(271), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(272), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(274), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36401,20 +36701,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 5,
+    ACTIONS(685), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(660), 16,
+    ACTIONS(683), 19,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_boolean,
@@ -36424,36 +36727,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2350] = 8,
+  [2273] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(583), 1,
-      anon_sym_LPAREN,
-    ACTIONS(628), 1,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(687), 1,
+      anon_sym_instanceof,
+    ACTIONS(689), 1,
+      anon_sym_in,
+    STATE(302), 1,
+      sym_compop,
+    STATE(303), 1,
+      sym_mulop,
+    STATE(304), 1,
+      sym_addop,
+    ACTIONS(594), 2,
       anon_sym_LT,
-    ACTIONS(631), 1,
-      anon_sym_DOT,
-    ACTIONS(587), 2,
+      anon_sym_GT,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
-    ACTIONS(579), 12,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_DASH,
-      anon_sym_PERCENT,
+    ACTIONS(672), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       sym_qldoc,
-      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 23,
+    ACTIONS(670), 19,
       anon_sym_module,
-      anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
       anon_sym_or,
@@ -36462,11 +36774,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_SLASH,
       anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
@@ -36475,30 +36784,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2409] = 17,
+  [2344] = 17,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(640), 1,
-      anon_sym_or,
-    ACTIONS(642), 1,
+    ACTIONS(687), 1,
       anon_sym_instanceof,
-    ACTIONS(644), 1,
+    ACTIONS(689), 1,
       anon_sym_in,
-    ACTIONS(646), 1,
+    ACTIONS(691), 1,
+      anon_sym_or,
+    ACTIONS(693), 1,
       anon_sym_and,
-    ACTIONS(648), 1,
+    ACTIONS(695), 1,
       anon_sym_implies,
-    STATE(283), 1,
+    STATE(302), 1,
       sym_compop,
-    STATE(290), 1,
+    STATE(303), 1,
       sym_mulop,
-    STATE(291), 1,
+    STATE(304), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36512,13 +36821,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 5,
+    ACTIONS(666), 5,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(660), 16,
+    ACTIONS(664), 16,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -36535,56 +36844,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2486] = 14,
+  [2421] = 9,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(618), 1,
-      anon_sym_instanceof,
-    ACTIONS(620), 1,
-      anon_sym_in,
-    STATE(340), 1,
+    STATE(302), 1,
       sym_compop,
-    STATE(345), 1,
+    STATE(303), 1,
       sym_mulop,
-    STATE(348), 1,
+    STATE(304), 1,
       sym_addop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(660), 11,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(676), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
+      anon_sym_PLUS,
+      anon_sym_DASH,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(674), 19,
+    ACTIONS(662), 23,
       anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36592,18 +36896,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2557] = 7,
+  [2482] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    STATE(201), 1,
+    STATE(332), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(333), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(334), 1,
       sym_compop,
-    ACTIONS(668), 13,
+    ACTIONS(632), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -36617,11 +36921,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(666), 24,
+    ACTIONS(634), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -36633,8 +36938,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36642,20 +36946,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2614] = 11,
+  [2539] = 11,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(620), 1,
+    ACTIONS(689), 1,
       anon_sym_in,
-    STATE(340), 1,
+    STATE(302), 1,
       sym_compop,
-    STATE(345), 1,
+    STATE(303), 1,
       sym_mulop,
-    STATE(348), 1,
+    STATE(304), 1,
       sym_addop,
     ACTIONS(608), 2,
       anon_sym_PLUS,
@@ -36663,7 +36967,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(694), 9,
+    ACTIONS(658), 9,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -36673,11 +36977,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(696), 22,
+    ACTIONS(656), 22,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -36687,8 +36992,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36696,28 +37000,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2679] = 16,
+  [2604] = 16,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(616), 1,
-      anon_sym_or,
-    ACTIONS(618), 1,
+    ACTIONS(687), 1,
       anon_sym_instanceof,
-    ACTIONS(620), 1,
+    ACTIONS(689), 1,
       anon_sym_in,
-    ACTIONS(622), 1,
+    ACTIONS(691), 1,
+      anon_sym_or,
+    ACTIONS(693), 1,
       anon_sym_and,
-    STATE(340), 1,
+    STATE(302), 1,
       sym_compop,
-    STATE(345), 1,
+    STATE(303), 1,
       sym_mulop,
-    STATE(348), 1,
+    STATE(304), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36731,23 +37035,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(698), 5,
+    ACTIONS(652), 5,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(700), 17,
+    ACTIONS(650), 17,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
       anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36755,24 +37059,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2754] = 14,
+  [2679] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(642), 1,
+    ACTIONS(687), 1,
       anon_sym_instanceof,
-    ACTIONS(644), 1,
+    ACTIONS(689), 1,
       anon_sym_in,
-    STATE(283), 1,
+    STATE(302), 1,
       sym_compop,
-    STATE(290), 1,
+    STATE(303), 1,
       sym_mulop,
-    STATE(291), 1,
+    STATE(304), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36786,13 +37090,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 5,
+    ACTIONS(648), 5,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(692), 19,
+    ACTIONS(646), 19,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -36812,24 +37116,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2825] = 14,
+  [2750] = 15,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(618), 1,
+    ACTIONS(687), 1,
       anon_sym_instanceof,
-    ACTIONS(620), 1,
+    ACTIONS(689), 1,
       anon_sym_in,
-    STATE(340), 1,
+    ACTIONS(693), 1,
+      anon_sym_and,
+    STATE(302), 1,
       sym_compop,
-    STATE(345), 1,
+    STATE(303), 1,
       sym_mulop,
-    STATE(348), 1,
+    STATE(304), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36843,23 +37149,72 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(650), 5,
+    ACTIONS(638), 5,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(652), 19,
+    ACTIONS(636), 18,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_implies,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [2823] = 7,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    STATE(271), 1,
+      sym_addop,
+    STATE(272), 1,
+      sym_mulop,
+    STATE(274), 1,
+      sym_compop,
+    ACTIONS(632), 13,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(634), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_SLASH,
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_boolean,
@@ -36869,28 +37224,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2896] = 16,
+  [2880] = 15,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(640), 1,
-      anon_sym_or,
-    ACTIONS(642), 1,
+    ACTIONS(600), 1,
       anon_sym_instanceof,
-    ACTIONS(644), 1,
+    ACTIONS(602), 1,
       anon_sym_in,
-    ACTIONS(646), 1,
+    ACTIONS(604), 1,
       anon_sym_and,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    STATE(308), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    STATE(309), 1,
+      sym_mulop,
+    STATE(311), 1,
+      sym_compop,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -36904,23 +37257,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(698), 5,
+    ACTIONS(638), 5,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(700), 17,
+    ACTIONS(636), 18,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_as,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
       anon_sym_implies,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -36928,38 +37282,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [2971] = 9,
+  [2953] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
+    ACTIONS(600), 1,
+      anon_sym_instanceof,
+    ACTIONS(602), 1,
+      anon_sym_in,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(201), 1,
+    STATE(308), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(309), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(311), 1,
       sym_compop,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(664), 11,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+    ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
+    ACTIONS(685), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(662), 23,
+    ACTIONS(683), 19,
       anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
       anon_sym_newtype,
@@ -36967,8 +37328,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
       anon_sym_asc,
@@ -36980,53 +37339,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3032] = 11,
+  [3024] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
+    ACTIONS(600), 1,
+      anon_sym_instanceof,
+    ACTIONS(602), 1,
+      anon_sym_in,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(644), 1,
-      anon_sym_in,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
+    STATE(308), 1,
       sym_addop,
+    STATE(309), 1,
+      sym_mulop,
+    STATE(311), 1,
+      sym_compop,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
     ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(694), 9,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
+    ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
+    ACTIONS(648), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(696), 22,
+    ACTIONS(646), 19,
       anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -37034,47 +37396,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3097] = 7,
+  [3095] = 16,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    STATE(340), 1,
-      sym_compop,
-    STATE(345), 1,
-      sym_mulop,
-    STATE(348), 1,
+    ACTIONS(598), 1,
+      anon_sym_or,
+    ACTIONS(600), 1,
+      anon_sym_instanceof,
+    ACTIONS(602), 1,
+      anon_sym_in,
+    ACTIONS(604), 1,
+      anon_sym_and,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    STATE(308), 1,
       sym_addop,
-    ACTIONS(672), 13,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    STATE(309), 1,
+      sym_mulop,
+    STATE(311), 1,
+      sym_compop,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(652), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(670), 24,
+    ACTIONS(650), 17,
       anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
       anon_sym_implies,
-      anon_sym_SLASH,
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_boolean,
@@ -37084,7 +37455,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3154] = 11,
+  [3170] = 11,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -37093,11 +37464,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_in,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(201), 1,
+    STATE(308), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(309), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(311), 1,
       sym_compop,
     ACTIONS(608), 2,
       anon_sym_PLUS,
@@ -37105,9 +37476,9 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(694), 9,
+    ACTIONS(658), 9,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -37115,7 +37486,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(696), 22,
+    ACTIONS(656), 22,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -37138,47 +37509,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3219] = 15,
+  [3235] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(618), 1,
-      anon_sym_instanceof,
-    ACTIONS(620), 1,
-      anon_sym_in,
-    ACTIONS(622), 1,
-      anon_sym_and,
-    STATE(340), 1,
-      sym_compop,
-    STATE(345), 1,
-      sym_mulop,
-    STATE(348), 1,
+    STATE(271), 1,
       sym_addop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    STATE(272), 1,
+      sym_mulop,
+    STATE(274), 1,
+      sym_compop,
+    ACTIONS(628), 13,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(654), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(656), 18,
+    ACTIONS(630), 24,
       anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
       anon_sym_newtype,
@@ -37186,7 +37545,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
       anon_sym_implies,
+      anon_sym_SLASH,
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_boolean,
@@ -37196,57 +37559,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3292] = 15,
+  [3292] = 9,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(682), 1,
-      anon_sym_instanceof,
-    ACTIONS(684), 1,
-      anon_sym_in,
-    ACTIONS(686), 1,
-      anon_sym_and,
-    STATE(262), 1,
+    STATE(271), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(272), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(274), 1,
       sym_compop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(660), 11,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(654), 5,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+      anon_sym_PLUS,
+      anon_sym_DASH,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(656), 18,
+    ACTIONS(662), 23,
       anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
       anon_sym_implies,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -37254,20 +37611,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3365] = 7,
+  [3353] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
+    STATE(332), 1,
       sym_addop,
-    ACTIONS(668), 13,
-      ts_builtin_sym_end,
+    STATE(333), 1,
+      sym_mulop,
+    STATE(334), 1,
+      sym_compop,
+    ACTIONS(628), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -37279,7 +37636,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(666), 24,
+    ACTIONS(630), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -37304,24 +37661,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3422] = 14,
+  [3410] = 17,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(682), 1,
+    ACTIONS(598), 1,
+      anon_sym_or,
+    ACTIONS(600), 1,
       anon_sym_instanceof,
-    ACTIONS(684), 1,
+    ACTIONS(602), 1,
       anon_sym_in,
-    STATE(262), 1,
+    ACTIONS(604), 1,
+      anon_sym_and,
+    ACTIONS(606), 1,
+      anon_sym_implies,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    STATE(308), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(309), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(311), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -37335,25 +37698,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(650), 5,
+    ACTIONS(666), 5,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(652), 19,
+    ACTIONS(664), 16,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_as,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -37361,28 +37721,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3493] = 16,
+  [3487] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(680), 1,
-      anon_sym_or,
-    ACTIONS(682), 1,
+    ACTIONS(687), 1,
       anon_sym_instanceof,
-    ACTIONS(684), 1,
+    ACTIONS(689), 1,
       anon_sym_in,
-    ACTIONS(686), 1,
-      anon_sym_and,
-    STATE(262), 1,
-      sym_addop,
-    STATE(263), 1,
-      sym_mulop,
-    STATE(271), 1,
+    STATE(302), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    STATE(303), 1,
+      sym_mulop,
+    STATE(304), 1,
+      sym_addop,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -37396,21 +37752,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(698), 5,
+    ACTIONS(685), 5,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(700), 17,
+    ACTIONS(683), 19,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_and,
       anon_sym_implies,
       anon_sym_order,
       anon_sym_boolean,
@@ -37420,50 +37778,60 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3568] = 8,
+  [3558] = 18,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(583), 1,
-      anon_sym_LPAREN,
-    ACTIONS(628), 1,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(687), 1,
+      anon_sym_instanceof,
+    ACTIONS(689), 1,
+      anon_sym_in,
+    ACTIONS(691), 1,
+      anon_sym_or,
+    ACTIONS(693), 1,
+      anon_sym_and,
+    ACTIONS(695), 1,
+      anon_sym_implies,
+    ACTIONS(697), 1,
+      anon_sym_as,
+    STATE(302), 1,
+      sym_compop,
+    STATE(303), 1,
+      sym_mulop,
+    STATE(304), 1,
+      sym_addop,
+    ACTIONS(594), 2,
       anon_sym_LT,
-    ACTIONS(631), 1,
-      anon_sym_DOT,
-    ACTIONS(587), 2,
+      anon_sym_GT,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
-    ACTIONS(579), 12,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_DASH,
-      anon_sym_PERCENT,
+    ACTIONS(679), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       sym_qldoc,
-      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 23,
+    ACTIONS(677), 15,
       anon_sym_module,
-      anon_sym_GT,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -37471,89 +37839,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3627] = 11,
+  [3637] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
+    ACTIONS(600), 1,
+      anon_sym_instanceof,
+    ACTIONS(602), 1,
+      anon_sym_in,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(684), 1,
-      anon_sym_in,
-    STATE(262), 1,
+    STATE(308), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(309), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(311), 1,
       sym_compop,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
     ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(694), 9,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+    ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(696), 22,
-      anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [3692] = 7,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    STATE(340), 1,
-      sym_compop,
-    STATE(345), 1,
-      sym_mulop,
-    STATE(348), 1,
-      sym_addop,
-    ACTIONS(668), 13,
+    ACTIONS(672), 5,
       ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(666), 24,
+    ACTIONS(670), 19,
       anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
       anon_sym_newtype,
@@ -37561,11 +37885,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_SLASH,
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_boolean,
@@ -37575,38 +37896,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3749] = 9,
+  [3708] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(340), 1,
-      sym_compop,
-    STATE(345), 1,
-      sym_mulop,
-    STATE(348), 1,
+    ACTIONS(618), 1,
+      anon_sym_instanceof,
+    ACTIONS(620), 1,
+      anon_sym_in,
+    STATE(271), 1,
       sym_addop,
+    STATE(272), 1,
+      sym_mulop,
+    STATE(274), 1,
+      sym_compop,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(664), 11,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
+    ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
+    ACTIONS(672), 5,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(662), 23,
+    ACTIONS(670), 19,
       anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
       anon_sym_newtype,
@@ -37614,8 +37942,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
       anon_sym_asc,
@@ -37627,35 +37953,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3810] = 9,
+  [3779] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
-      sym_addop,
-    ACTIONS(610), 2,
+    ACTIONS(583), 1,
+      anon_sym_LPAREN,
+    ACTIONS(674), 1,
+      anon_sym_DOT,
+    ACTIONS(587), 2,
+      anon_sym_PLUS,
       anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(664), 11,
+    ACTIONS(581), 12,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_PERCENT,
       sym_qldoc,
+      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(662), 23,
+    ACTIONS(579), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -37671,6 +37994,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_SLASH,
       anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
@@ -37679,32 +38003,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3871] = 7,
+  [3836] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    STATE(201), 1,
-      sym_addop,
-    STATE(202), 1,
-      sym_mulop,
-    STATE(207), 1,
-      sym_compop,
-    ACTIONS(672), 13,
+    ACTIONS(583), 1,
+      anon_sym_LPAREN,
+    ACTIONS(674), 1,
+      anon_sym_DOT,
+    ACTIONS(587), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    ACTIONS(581), 12,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
       anon_sym_DASH,
-      anon_sym_STAR,
       anon_sym_PERCENT,
       sym_qldoc,
+      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(670), 24,
+    ACTIONS(579), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -37729,30 +38053,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [3928] = 17,
+  [3893] = 17,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(680), 1,
+    ACTIONS(616), 1,
       anon_sym_or,
-    ACTIONS(682), 1,
+    ACTIONS(618), 1,
       anon_sym_instanceof,
-    ACTIONS(684), 1,
+    ACTIONS(620), 1,
       anon_sym_in,
-    ACTIONS(686), 1,
+    ACTIONS(622), 1,
       anon_sym_and,
-    ACTIONS(688), 1,
+    ACTIONS(624), 1,
       anon_sym_implies,
-    STATE(262), 1,
+    STATE(271), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(272), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(274), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -37766,22 +38090,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 5,
+    ACTIONS(666), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(660), 16,
+    ACTIONS(664), 16,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -37789,24 +38113,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4005] = 14,
+  [3970] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(642), 1,
+    ACTIONS(640), 1,
       anon_sym_instanceof,
-    ACTIONS(644), 1,
+    ACTIONS(642), 1,
       anon_sym_in,
-    STATE(283), 1,
-      sym_compop,
-    STATE(290), 1,
-      sym_mulop,
-    STATE(291), 1,
+    STATE(332), 1,
       sym_addop,
-    ACTIONS(592), 2,
+    STATE(333), 1,
+      sym_mulop,
+    STATE(334), 1,
+      sym_compop,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -37820,13 +38144,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(676), 5,
-      ts_builtin_sym_end,
+    ACTIONS(685), 5,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(674), 19,
+    ACTIONS(683), 19,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -37846,57 +38170,49 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4076] = 15,
+  [4041] = 7,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(600), 1,
-      anon_sym_instanceof,
-    ACTIONS(602), 1,
-      anon_sym_in,
-    ACTIONS(604), 1,
-      anon_sym_and,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    STATE(201), 1,
-      sym_addop,
-    STATE(202), 1,
-      sym_mulop,
-    STATE(207), 1,
-      sym_compop,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
+    ACTIONS(583), 1,
+      anon_sym_LPAREN,
+    ACTIONS(674), 1,
+      anon_sym_DOT,
+    ACTIONS(587), 2,
       anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(581), 12,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(654), 5,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+      anon_sym_DASH,
+      anon_sym_PERCENT,
       sym_qldoc,
+      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(656), 18,
+    ACTIONS(579), 24,
       anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
       anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_SLASH,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -37904,24 +38220,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4149] = 14,
+  [4098] = 15,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(682), 1,
+    ACTIONS(618), 1,
       anon_sym_instanceof,
-    ACTIONS(684), 1,
+    ACTIONS(620), 1,
       anon_sym_in,
-    STATE(262), 1,
+    ACTIONS(622), 1,
+      anon_sym_and,
+    STATE(271), 1,
       sym_addop,
-    STATE(263), 1,
+    STATE(272), 1,
       sym_mulop,
-    STATE(271), 1,
+    STATE(274), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -37935,25 +38253,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 5,
+    ACTIONS(638), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(692), 19,
+    ACTIONS(636), 18,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_and,
       anon_sym_implies,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -37961,24 +38278,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4220] = 14,
+  [4171] = 14,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(600), 1,
-      anon_sym_instanceof,
-    ACTIONS(602), 1,
-      anon_sym_in,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(201), 1,
+    ACTIONS(618), 1,
+      anon_sym_instanceof,
+    ACTIONS(620), 1,
+      anon_sym_in,
+    STATE(271), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(272), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(274), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -37992,13 +38309,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(650), 5,
+    ACTIONS(648), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(652), 19,
+    ACTIONS(646), 19,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -38018,28 +38335,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4291] = 16,
+  [4242] = 16,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(598), 1,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(616), 1,
       anon_sym_or,
-    ACTIONS(600), 1,
+    ACTIONS(618), 1,
       anon_sym_instanceof,
-    ACTIONS(602), 1,
+    ACTIONS(620), 1,
       anon_sym_in,
-    ACTIONS(604), 1,
+    ACTIONS(622), 1,
       anon_sym_and,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    STATE(201), 1,
+    STATE(271), 1,
       sym_addop,
-    STATE(202), 1,
+    STATE(272), 1,
       sym_mulop,
-    STATE(207), 1,
+    STATE(274), 1,
       sym_compop,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -38053,13 +38370,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(698), 5,
+    ACTIONS(652), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(700), 17,
+    ACTIONS(650), 17,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -38077,34 +38394,42 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4366] = 5,
+  [4317] = 11,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(706), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(702), 14,
-      ts_builtin_sym_end,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(620), 1,
+      anon_sym_in,
+    STATE(271), 1,
+      sym_addop,
+    STATE(272), 1,
+      sym_mulop,
+    STATE(274), 1,
+      sym_compop,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(658), 9,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(704), 24,
+    ACTIONS(656), 22,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38112,11 +38437,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_select,
       anon_sym_class,
       anon_sym_instanceof,
-      anon_sym_in,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38124,14 +38448,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4418] = 5,
+  [4382] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
+    ACTIONS(703), 1,
+      anon_sym_LT,
     ACTIONS(706), 1,
       anon_sym_COLON_COLON,
-    ACTIONS(702), 14,
+    ACTIONS(699), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -38146,9 +38472,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(704), 24,
+    ACTIONS(701), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
@@ -38171,14 +38496,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4470] = 5,
+  [4436] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
+    ACTIONS(703), 1,
+      anon_sym_LT,
     ACTIONS(706), 1,
       anon_sym_COLON_COLON,
-    ACTIONS(702), 14,
+    ACTIONS(699), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -38193,9 +38520,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(704), 24,
+    ACTIONS(701), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
@@ -38218,16 +38544,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4522] = 5,
+  [4490] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
+    ACTIONS(703), 1,
+      anon_sym_LT,
     ACTIONS(706), 1,
       anon_sym_COLON_COLON,
-    ACTIONS(702), 14,
+    ACTIONS(699), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -38240,11 +38568,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(704), 24,
+    ACTIONS(701), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38256,8 +38584,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38265,12 +38592,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4574] = 4,
+  [4544] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(710), 14,
+    ACTIONS(703), 1,
+      anon_sym_LT,
+    ACTIONS(706), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(699), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -38285,9 +38616,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(708), 24,
+    ACTIONS(701), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
@@ -38310,12 +38640,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4623] = 4,
+  [4598] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(714), 14,
+    ACTIONS(710), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -38330,7 +38660,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(712), 24,
+    ACTIONS(708), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -38355,12 +38685,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4672] = 4,
+  [4647] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(716), 14,
+    ACTIONS(712), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -38375,7 +38705,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(718), 24,
+    ACTIONS(714), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -38400,14 +38730,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4721] = 4,
+  [4696] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(720), 14,
-      ts_builtin_sym_end,
+    ACTIONS(718), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -38420,11 +38750,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(722), 24,
+    ACTIONS(716), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38436,8 +38767,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38445,14 +38775,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4770] = 4,
+  [4745] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(724), 14,
-      ts_builtin_sym_end,
+    ACTIONS(722), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -38465,11 +38795,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(726), 24,
+    ACTIONS(720), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38481,8 +38812,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38490,14 +38820,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4819] = 4,
+  [4794] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(720), 14,
-      ts_builtin_sym_end,
+    ACTIONS(726), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -38510,7 +38840,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(722), 24,
+    ACTIONS(724), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -38535,7 +38865,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4868] = 4,
+  [4843] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -38560,6 +38890,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38571,8 +38902,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38580,14 +38910,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4917] = 4,
+  [4892] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(732), 14,
-      ts_builtin_sym_end,
+    ACTIONS(734), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -38600,11 +38930,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(734), 24,
+    ACTIONS(732), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38616,8 +38947,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38625,7 +38955,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [4966] = 4,
+  [4941] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -38670,7 +39000,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5015] = 4,
+  [4990] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -38715,16 +39045,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5064] = 4,
+  [5039] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(744), 14,
-      ts_builtin_sym_end,
+    ACTIONS(748), 1,
+      anon_sym_DOT,
+    ACTIONS(746), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -38735,11 +39066,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(746), 24,
+    ACTIONS(744), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38751,8 +39083,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38760,14 +39091,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5113] = 4,
+  [5090] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(724), 14,
-      ts_builtin_sym_end,
+    ACTIONS(752), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -38780,7 +39111,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(726), 24,
+    ACTIONS(750), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -38805,12 +39136,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5162] = 4,
+  [5139] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(728), 14,
+    ACTIONS(754), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -38825,12 +39156,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(730), 24,
+    ACTIONS(756), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38842,7 +39172,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38850,12 +39181,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5211] = 4,
+  [5188] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(748), 14,
+    ACTIONS(758), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -38870,7 +39201,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(750), 24,
+    ACTIONS(760), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -38895,12 +39226,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5260] = 4,
+  [5237] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(752), 14,
+    ACTIONS(762), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -38915,7 +39246,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(754), 24,
+    ACTIONS(764), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -38940,14 +39271,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5309] = 4,
+  [5286] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(756), 14,
-      ts_builtin_sym_end,
+    ACTIONS(768), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -38960,11 +39291,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(758), 24,
+    ACTIONS(766), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -38976,8 +39308,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -38985,12 +39316,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5358] = 4,
+  [5335] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(760), 14,
+    ACTIONS(770), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39005,7 +39336,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(762), 24,
+    ACTIONS(772), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39030,12 +39361,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5407] = 4,
+  [5384] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(764), 14,
+    ACTIONS(774), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39050,7 +39381,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(766), 24,
+    ACTIONS(776), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39075,14 +39406,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5456] = 4,
+  [5433] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(780), 8,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      sym_dbtype,
+      sym__upper_id,
+      sym_float,
+      sym_string,
+    ACTIONS(778), 30,
+      anon_sym_not,
+      anon_sym_if,
+      sym_specialId,
+      anon_sym_exists,
+      anon_sym_forall,
+      anon_sym_forex,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      anon_sym_avg,
+      anon_sym_concat,
+      anon_sym_strictconcat,
+      anon_sym_count,
+      anon_sym_max,
+      anon_sym_min,
+      anon_sym_rank,
+      anon_sym_strictcount,
+      anon_sym_strictsum,
+      anon_sym_sum,
+      anon_sym_any,
+      anon_sym_unique,
+      sym__lower_id,
+      sym_integer,
+      sym_false,
+      sym_result,
+      sym_super,
+      sym_this,
+      sym_true,
+  [5480] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(732), 14,
-      ts_builtin_sym_end,
+    ACTIONS(784), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39095,7 +39470,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(734), 24,
+    ACTIONS(782), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39120,12 +39495,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5505] = 4,
+  [5529] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(736), 14,
+    ACTIONS(786), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39140,12 +39515,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(738), 24,
+    ACTIONS(788), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -39157,7 +39531,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -39165,12 +39540,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5554] = 4,
+  [5578] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(768), 14,
+    ACTIONS(790), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39185,7 +39560,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(770), 24,
+    ACTIONS(792), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39210,12 +39585,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5603] = 4,
+  [5627] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(772), 14,
+    ACTIONS(794), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39230,7 +39605,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(774), 24,
+    ACTIONS(796), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39255,14 +39630,60 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5652] = 4,
+  [5676] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(776), 14,
-      ts_builtin_sym_end,
+    ACTIONS(748), 1,
+      anon_sym_DOT,
+    ACTIONS(800), 13,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(798), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [5727] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(804), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39275,11 +39696,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(778), 24,
+    ACTIONS(802), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -39291,8 +39713,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -39300,14 +39721,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5701] = 4,
+  [5776] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(780), 14,
-      ts_builtin_sym_end,
+    ACTIONS(808), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39320,11 +39741,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(782), 24,
+    ACTIONS(806), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -39336,8 +39758,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -39345,14 +39766,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5750] = 4,
+  [5825] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(784), 14,
-      ts_builtin_sym_end,
+    ACTIONS(712), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39365,11 +39786,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(786), 24,
+    ACTIONS(714), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -39381,8 +39803,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -39390,12 +39811,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5799] = 4,
+  [5874] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(788), 14,
+    ACTIONS(810), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39410,7 +39831,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(790), 24,
+    ACTIONS(812), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39435,12 +39856,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5848] = 4,
+  [5923] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(792), 14,
+    ACTIONS(814), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39455,7 +39876,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(794), 24,
+    ACTIONS(816), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39480,12 +39901,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5897] = 4,
+  [5972] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(796), 14,
+    ACTIONS(710), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39500,7 +39921,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(798), 24,
+    ACTIONS(708), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39525,14 +39946,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5946] = 4,
+  [6021] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(740), 14,
-      ts_builtin_sym_end,
+    ACTIONS(820), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39545,7 +39966,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(742), 24,
+    ACTIONS(818), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39570,14 +39991,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [5995] = 4,
+  [6070] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(744), 14,
-      ts_builtin_sym_end,
+    ACTIONS(824), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39590,7 +40011,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(746), 24,
+    ACTIONS(822), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39615,14 +40036,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6044] = 4,
+  [6119] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(800), 14,
-      ts_builtin_sym_end,
+    ACTIONS(828), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39635,11 +40056,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(802), 24,
+    ACTIONS(826), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -39651,8 +40073,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -39660,12 +40081,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6093] = 4,
+  [6168] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(748), 14,
+    ACTIONS(830), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39680,7 +40101,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(750), 24,
+    ACTIONS(832), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39705,12 +40126,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6142] = 4,
+  [6217] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(804), 14,
+    ACTIONS(834), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39725,11 +40146,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(806), 24,
+    ACTIONS(836), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -39741,8 +40163,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -39750,60 +40171,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6191] = 5,
-    ACTIONS(3), 1,
+  [6266] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(812), 1,
-      anon_sym_DOT,
-    ACTIONS(808), 13,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(840), 8,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
       anon_sym_PLUS,
       anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(810), 24,
-      anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      sym_float,
+      sym_string,
+    ACTIONS(838), 30,
+      anon_sym_not,
+      anon_sym_if,
+      sym_specialId,
+      anon_sym_exists,
+      anon_sym_forall,
+      anon_sym_forex,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
+      anon_sym_avg,
+      anon_sym_concat,
+      anon_sym_strictconcat,
+      anon_sym_count,
+      anon_sym_max,
+      anon_sym_min,
+      anon_sym_rank,
+      anon_sym_strictcount,
+      anon_sym_strictsum,
+      anon_sym_sum,
+      anon_sym_any,
+      anon_sym_unique,
       sym__lower_id,
-      sym_predicate,
-  [6242] = 4,
+      sym_integer,
+      sym_false,
+      sym_result,
+      sym_super,
+      sym_this,
+      sym_true,
+  [6313] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(752), 14,
-      ts_builtin_sym_end,
+    ACTIONS(844), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39816,7 +40235,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(754), 24,
+    ACTIONS(842), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -39841,11 +40260,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6291] = 3,
+  [6362] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(816), 8,
+    ACTIONS(848), 8,
       anon_sym_LPAREN,
       anon_sym_LBRACK,
       anon_sym_PLUS,
@@ -39854,7 +40273,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym__upper_id,
       sym_float,
       sym_string,
-    ACTIONS(814), 30,
+    ACTIONS(846), 30,
       anon_sym_not,
       anon_sym_if,
       sym_specialId,
@@ -39885,59 +40304,58 @@ static const uint16_t ts_small_parse_table[] = {
       sym_super,
       sym_this,
       sym_true,
-  [6338] = 4,
-    ACTIONS(3), 1,
+  [6409] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(756), 14,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(852), 8,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
       anon_sym_PLUS,
       anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(758), 24,
-      anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_order,
+      sym_float,
+      sym_string,
+    ACTIONS(850), 30,
+      anon_sym_not,
+      anon_sym_if,
+      sym_specialId,
+      anon_sym_exists,
+      anon_sym_forall,
+      anon_sym_forex,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
+      anon_sym_avg,
+      anon_sym_concat,
+      anon_sym_strictconcat,
+      anon_sym_count,
+      anon_sym_max,
+      anon_sym_min,
+      anon_sym_rank,
+      anon_sym_strictcount,
+      anon_sym_strictsum,
+      anon_sym_sum,
+      anon_sym_any,
+      anon_sym_unique,
       sym__lower_id,
-      sym_predicate,
-  [6387] = 4,
+      sym_integer,
+      sym_false,
+      sym_result,
+      sym_super,
+      sym_this,
+      sym_true,
+  [6456] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(710), 14,
-      ts_builtin_sym_end,
+    ACTIONS(834), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -39950,11 +40368,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(708), 24,
+    ACTIONS(836), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -39966,8 +40385,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -39975,12 +40393,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6436] = 4,
+  [6505] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(760), 14,
+    ACTIONS(844), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -39995,7 +40413,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(762), 24,
+    ACTIONS(842), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -40020,16 +40438,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6485] = 4,
+  [6554] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(764), 14,
+    ACTIONS(581), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(858), 1,
+      anon_sym_LT,
+    ACTIONS(854), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -40040,9 +40461,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(766), 24,
+    ACTIONS(856), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
@@ -40065,12 +40485,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6534] = 4,
+  [6607] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(818), 14,
+    ACTIONS(828), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -40085,11 +40505,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(820), 24,
+    ACTIONS(826), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40101,8 +40522,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40110,16 +40530,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6583] = 4,
+  [6656] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(822), 14,
+    ACTIONS(581), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(858), 1,
+      anon_sym_LT,
+    ACTIONS(854), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -40130,9 +40553,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(824), 24,
+    ACTIONS(856), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
@@ -40155,59 +40577,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6632] = 4,
+  [6709] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(768), 14,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(770), 24,
-      anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [6681] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(826), 14,
-      ts_builtin_sym_end,
+    ACTIONS(726), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40220,12 +40597,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(828), 24,
+    ACTIONS(724), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40237,7 +40613,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40245,14 +40622,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6730] = 4,
+  [6758] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(830), 14,
-      ts_builtin_sym_end,
+    ACTIONS(722), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40265,7 +40642,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(832), 24,
+    ACTIONS(720), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -40290,14 +40667,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6779] = 4,
+  [6807] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(796), 14,
-      ts_builtin_sym_end,
+    ACTIONS(830), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40310,7 +40687,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(798), 24,
+    ACTIONS(832), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -40335,59 +40712,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6828] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(834), 14,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(836), 24,
-      anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [6877] = 4,
+  [6856] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(800), 14,
-      ts_builtin_sym_end,
+    ACTIONS(728), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40400,7 +40732,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(802), 24,
+    ACTIONS(730), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -40425,14 +40757,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6926] = 4,
+  [6905] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(714), 14,
-      ts_builtin_sym_end,
+    ACTIONS(863), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40445,11 +40777,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(712), 24,
+    ACTIONS(861), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40461,8 +40794,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40470,14 +40802,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [6975] = 4,
+  [6954] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(804), 14,
-      ts_builtin_sym_end,
+    ACTIONS(718), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40490,12 +40822,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(806), 24,
+    ACTIONS(716), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40507,7 +40838,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40515,14 +40847,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7024] = 4,
+  [7003] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(838), 14,
-      ts_builtin_sym_end,
+    ACTIONS(867), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40535,7 +40867,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(840), 24,
+    ACTIONS(865), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -40560,16 +40892,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7073] = 4,
+  [7052] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(842), 14,
-      ts_builtin_sym_end,
+    ACTIONS(869), 1,
+      anon_sym_DOT,
+    ACTIONS(746), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -40580,7 +40913,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(844), 24,
+    ACTIONS(744), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -40605,14 +40938,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7122] = 4,
+  [7103] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(846), 14,
-      ts_builtin_sym_end,
+    ACTIONS(873), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40625,11 +40958,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(848), 24,
+    ACTIONS(871), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40641,8 +40975,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40650,14 +40983,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7171] = 4,
+  [7152] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(850), 14,
-      ts_builtin_sym_end,
+    ACTIONS(877), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40670,11 +41003,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(852), 24,
+    ACTIONS(875), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40686,8 +41020,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40695,14 +41028,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7220] = 4,
+  [7201] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(792), 14,
-      ts_builtin_sym_end,
+    ACTIONS(881), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40715,7 +41048,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(794), 24,
+    ACTIONS(879), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -40740,14 +41073,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7269] = 4,
+  [7250] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(854), 14,
-      ts_builtin_sym_end,
+    ACTIONS(885), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40760,11 +41093,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(856), 24,
+    ACTIONS(883), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40776,8 +41110,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40785,14 +41118,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7318] = 4,
+  [7299] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(858), 14,
-      ts_builtin_sym_end,
+    ACTIONS(889), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -40805,11 +41138,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(860), 24,
+    ACTIONS(887), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40821,8 +41155,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40830,19 +41163,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7367] = 6,
+  [7348] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(866), 1,
-      anon_sym_LT,
-    ACTIONS(862), 13,
-      ts_builtin_sym_end,
+    ACTIONS(734), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -40853,8 +41183,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(864), 23,
+    ACTIONS(732), 24,
       anon_sym_module,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
@@ -40877,12 +41208,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7420] = 4,
+  [7397] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(871), 14,
+    ACTIONS(893), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -40897,11 +41228,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(869), 24,
+    ACTIONS(891), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40913,8 +41245,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40922,12 +41253,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7469] = 4,
+  [7446] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(875), 14,
+    ACTIONS(897), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -40942,11 +41273,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(873), 24,
+    ACTIONS(895), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -40958,8 +41290,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -40967,17 +41298,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7518] = 5,
+  [7495] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(812), 1,
-      anon_sym_DOT,
-    ACTIONS(877), 13,
+    ACTIONS(710), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -40988,11 +41318,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(879), 24,
+    ACTIONS(708), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41004,8 +41335,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41013,14 +41343,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7569] = 4,
+  [7544] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(881), 14,
-      ts_builtin_sym_end,
+    ACTIONS(752), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41033,7 +41363,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(883), 24,
+    ACTIONS(750), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41058,14 +41388,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7618] = 4,
+  [7593] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(885), 14,
-      ts_builtin_sym_end,
+    ACTIONS(901), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41078,11 +41408,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(887), 24,
+    ACTIONS(899), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41094,8 +41425,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41103,14 +41433,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7667] = 4,
+  [7642] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(875), 14,
-      ts_builtin_sym_end,
+    ACTIONS(736), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41123,11 +41453,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(873), 24,
+    ACTIONS(738), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41139,8 +41470,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41148,12 +41478,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7716] = 4,
+  [7691] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(885), 14,
+    ACTIONS(740), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -41168,11 +41498,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(887), 24,
+    ACTIONS(742), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41184,8 +41515,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41193,12 +41523,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7765] = 4,
+  [7740] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(871), 14,
+    ACTIONS(824), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -41213,11 +41543,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(869), 24,
+    ACTIONS(822), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41229,8 +41560,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41238,14 +41568,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7814] = 4,
+  [7789] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(881), 14,
+    ACTIONS(820), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41258,11 +41588,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(883), 24,
+    ACTIONS(818), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41274,8 +41605,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41283,17 +41613,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7863] = 5,
+  [7838] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(889), 1,
-      anon_sym_DOT,
-    ACTIONS(877), 13,
+    ACTIONS(754), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -41304,11 +41633,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(879), 24,
+    ACTIONS(756), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41320,8 +41650,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41329,12 +41658,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7914] = 4,
+  [7887] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(854), 14,
+    ACTIONS(758), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -41349,11 +41678,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(856), 24,
+    ACTIONS(760), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41365,8 +41695,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41374,12 +41703,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [7963] = 4,
+  [7936] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(830), 14,
+    ACTIONS(762), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -41394,11 +41723,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(832), 24,
+    ACTIONS(764), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41410,8 +41740,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41419,14 +41748,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8012] = 4,
+  [7985] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(772), 14,
-      ts_builtin_sym_end,
+    ACTIONS(770), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41439,7 +41768,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(774), 24,
+    ACTIONS(772), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41464,12 +41793,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8061] = 4,
+  [8034] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(822), 14,
+    ACTIONS(774), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -41484,11 +41813,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(824), 24,
+    ACTIONS(776), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41500,8 +41830,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41509,14 +41838,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8110] = 4,
+  [8083] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(776), 14,
-      ts_builtin_sym_end,
+    ACTIONS(786), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41529,7 +41858,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(778), 24,
+    ACTIONS(788), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41554,19 +41883,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8159] = 6,
+  [8132] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(866), 1,
-      anon_sym_LT,
-    ACTIONS(862), 13,
+    ACTIONS(814), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -41577,8 +41903,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(864), 23,
+    ACTIONS(816), 24,
       anon_sym_module,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
@@ -41601,12 +41928,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8212] = 4,
+  [8181] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(716), 14,
+    ACTIONS(810), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -41621,7 +41948,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(718), 24,
+    ACTIONS(812), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41646,12 +41973,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8261] = 4,
+  [8230] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(780), 14,
+    ACTIONS(794), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -41666,7 +41993,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(782), 24,
+    ACTIONS(796), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41691,12 +42018,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8310] = 4,
+  [8279] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(784), 14,
+    ACTIONS(790), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -41711,7 +42038,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(786), 24,
+    ACTIONS(792), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41736,12 +42063,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8359] = 4,
+  [8328] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(788), 14,
+    ACTIONS(712), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -41756,7 +42083,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(790), 24,
+    ACTIONS(714), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41781,14 +42108,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8408] = 4,
+  [8377] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(858), 14,
+    ACTIONS(808), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41801,7 +42128,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(860), 24,
+    ACTIONS(806), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41826,17 +42153,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8457] = 5,
+  [8426] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(891), 1,
-      anon_sym_DOT,
-    ACTIONS(808), 13,
-      ts_builtin_sym_end,
+    ACTIONS(790), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -41847,7 +42173,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(810), 24,
+    ACTIONS(792), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41872,12 +42198,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8508] = 4,
+  [8475] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(710), 14,
+    ACTIONS(804), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -41892,7 +42218,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(708), 24,
+    ACTIONS(802), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -41917,17 +42243,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8557] = 5,
+  [8524] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(889), 1,
-      anon_sym_DOT,
-    ACTIONS(808), 13,
+    ACTIONS(794), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -41938,11 +42263,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(810), 24,
+    ACTIONS(796), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -41954,8 +42280,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -41963,14 +42288,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8608] = 4,
+  [8573] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(850), 14,
+    ACTIONS(873), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -41983,7 +42308,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(852), 24,
+    ACTIONS(871), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42008,14 +42333,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8657] = 4,
+  [8622] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(846), 14,
+    ACTIONS(877), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42028,7 +42353,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(848), 24,
+    ACTIONS(875), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42053,12 +42378,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8706] = 4,
+  [8671] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(842), 14,
+    ACTIONS(768), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -42073,12 +42398,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(844), 24,
+    ACTIONS(766), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42090,7 +42414,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42098,12 +42423,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8755] = 4,
+  [8720] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(838), 14,
+    ACTIONS(810), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -42118,7 +42443,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(840), 24,
+    ACTIONS(812), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42143,14 +42468,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8804] = 4,
+  [8769] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(822), 14,
-      ts_builtin_sym_end,
+    ACTIONS(814), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42163,7 +42488,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(824), 24,
+    ACTIONS(816), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42188,14 +42513,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8853] = 4,
+  [8818] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(881), 14,
-      ts_builtin_sym_end,
+    ACTIONS(784), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42208,12 +42533,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(883), 24,
+    ACTIONS(782), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42225,7 +42549,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42233,16 +42558,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8902] = 4,
+  [8867] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(834), 14,
+    ACTIONS(903), 1,
+      anon_sym_DOT,
+    ACTIONS(800), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -42253,7 +42579,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(836), 24,
+    ACTIONS(798), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42278,14 +42604,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [8951] = 4,
+  [8918] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(788), 14,
+    ACTIONS(784), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42298,11 +42624,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(790), 24,
+    ACTIONS(782), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42314,8 +42641,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42323,16 +42649,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9000] = 4,
+  [8967] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(818), 14,
+    ACTIONS(581), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(858), 1,
+      anon_sym_LT,
+    ACTIONS(854), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -42343,9 +42672,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(820), 24,
+    ACTIONS(856), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
@@ -42368,14 +42696,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9049] = 4,
+  [9020] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(792), 14,
+    ACTIONS(768), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42388,7 +42716,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(794), 24,
+    ACTIONS(766), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42413,16 +42741,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9098] = 4,
+  [9069] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(784), 14,
+    ACTIONS(869), 1,
+      anon_sym_DOT,
+    ACTIONS(800), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -42433,7 +42762,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(786), 24,
+    ACTIONS(798), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42458,14 +42787,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9147] = 4,
+  [9120] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(804), 14,
+    ACTIONS(881), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42478,7 +42807,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(806), 24,
+    ACTIONS(879), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42503,12 +42832,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9196] = 4,
+  [9169] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(818), 14,
+    ACTIONS(885), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -42523,7 +42852,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(820), 24,
+    ACTIONS(883), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42548,12 +42877,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9245] = 4,
+  [9218] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(834), 14,
+    ACTIONS(726), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -42568,12 +42897,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(836), 24,
+    ACTIONS(724), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42585,7 +42913,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42593,12 +42922,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9294] = 4,
+  [9267] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(800), 14,
+    ACTIONS(804), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -42618,7 +42947,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42630,7 +42958,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42638,12 +42967,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9343] = 4,
+  [9316] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(714), 14,
+    ACTIONS(889), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -42658,7 +42987,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(712), 24,
+    ACTIONS(887), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42683,12 +43012,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9392] = 4,
+  [9365] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(838), 14,
+    ACTIONS(722), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -42703,12 +43032,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(840), 24,
+    ACTIONS(720), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42720,7 +43048,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42728,14 +43057,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9441] = 4,
+  [9414] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(842), 14,
-      ts_builtin_sym_end,
+    ACTIONS(808), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42748,12 +43077,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(844), 24,
+    ACTIONS(806), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42765,7 +43093,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42773,12 +43102,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9490] = 4,
+  [9463] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(796), 14,
+    ACTIONS(712), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -42793,12 +43122,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(798), 24,
+    ACTIONS(714), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42810,7 +43138,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42818,12 +43147,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9539] = 4,
+  [9512] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(826), 14,
+    ACTIONS(820), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -42838,12 +43167,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(828), 24,
+    ACTIONS(818), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -42855,7 +43183,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -42863,14 +43192,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9588] = 4,
+  [9561] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(716), 14,
+    ACTIONS(786), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42883,7 +43212,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(718), 24,
+    ACTIONS(788), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42908,14 +43237,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9637] = 4,
+  [9610] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(720), 14,
+    ACTIONS(774), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42928,7 +43257,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(722), 24,
+    ACTIONS(776), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42953,14 +43282,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9686] = 4,
+  [9659] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(724), 14,
+    ACTIONS(770), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -42973,7 +43302,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(726), 24,
+    ACTIONS(772), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -42998,14 +43327,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9735] = 4,
+  [9708] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(846), 14,
-      ts_builtin_sym_end,
+    ACTIONS(824), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43018,12 +43347,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(848), 24,
+    ACTIONS(822), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43035,7 +43363,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43043,12 +43372,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9784] = 4,
+  [9757] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(728), 14,
+    ACTIONS(828), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43063,12 +43392,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(730), 24,
+    ACTIONS(826), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43080,7 +43408,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43088,12 +43417,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9833] = 4,
+  [9806] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(732), 14,
+    ACTIONS(844), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43108,12 +43437,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(734), 24,
+    ACTIONS(842), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43125,7 +43453,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43133,14 +43462,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9882] = 4,
+  [9855] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(736), 14,
+    ACTIONS(762), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43153,7 +43482,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(738), 24,
+    ACTIONS(764), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -43178,14 +43507,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9931] = 4,
+  [9904] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(740), 14,
+    ACTIONS(758), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43198,7 +43527,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(742), 24,
+    ACTIONS(760), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -43223,14 +43552,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [9980] = 4,
+  [9953] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(744), 14,
+    ACTIONS(754), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43243,7 +43572,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(746), 24,
+    ACTIONS(756), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -43268,14 +43597,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10029] = 4,
+  [10002] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(850), 14,
-      ts_builtin_sym_end,
+    ACTIONS(834), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43288,12 +43617,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(852), 24,
+    ACTIONS(836), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43305,7 +43633,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43313,12 +43642,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10078] = 4,
+  [10051] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(780), 14,
+    ACTIONS(830), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43333,7 +43662,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(782), 24,
+    ACTIONS(832), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -43358,14 +43687,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10127] = 4,
+  [10100] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(776), 14,
+    ACTIONS(718), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43378,7 +43707,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(778), 24,
+    ACTIONS(716), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -43403,14 +43732,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10176] = 4,
+  [10149] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(858), 14,
-      ts_builtin_sym_end,
+    ACTIONS(867), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43423,7 +43752,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(860), 24,
+    ACTIONS(865), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -43448,14 +43777,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10225] = 4,
+  [10198] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(748), 14,
+    ACTIONS(867), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43468,12 +43797,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(750), 24,
+    ACTIONS(865), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43485,7 +43813,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43493,12 +43822,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10274] = 4,
+  [10247] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(752), 14,
+    ACTIONS(728), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43513,12 +43842,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(754), 24,
+    ACTIONS(730), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43530,7 +43858,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43538,19 +43867,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10323] = 6,
+  [10296] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(866), 1,
-      anon_sym_LT,
-    ACTIONS(862), 13,
+    ACTIONS(752), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -43561,8 +43887,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(864), 23,
+    ACTIONS(750), 24,
       anon_sym_module,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_as,
@@ -43585,16 +43912,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10376] = 4,
+  [10345] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(830), 14,
+    ACTIONS(905), 1,
+      anon_sym_DOT,
+    ACTIONS(746), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -43605,12 +43933,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(832), 24,
+    ACTIONS(744), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43622,7 +43949,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43630,12 +43958,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10425] = 4,
+  [10396] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(756), 14,
+    ACTIONS(863), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43650,12 +43978,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(758), 24,
+    ACTIONS(861), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43667,7 +43994,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43675,12 +44003,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10474] = 4,
+  [10445] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(760), 14,
+    ACTIONS(734), 14,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(732), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_asc,
+      anon_sym_desc,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [10494] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(873), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43695,12 +44068,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(762), 24,
+    ACTIONS(871), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43712,7 +44084,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43720,12 +44093,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10523] = 4,
+  [10543] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(764), 14,
+    ACTIONS(877), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43740,12 +44113,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(766), 24,
+    ACTIONS(875), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43757,7 +44129,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43765,102 +44138,104 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10572] = 3,
-    ACTIONS(3), 2,
+  [10592] = 4,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(895), 8,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
+    ACTIONS(752), 14,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-      sym_float,
-      sym_string,
-    ACTIONS(893), 30,
-      anon_sym_not,
-      anon_sym_if,
-      sym_specialId,
-      anon_sym_exists,
-      anon_sym_forall,
-      anon_sym_forex,
+    ACTIONS(750), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-      anon_sym_avg,
-      anon_sym_concat,
-      anon_sym_strictconcat,
-      anon_sym_count,
-      anon_sym_max,
-      anon_sym_min,
-      anon_sym_rank,
-      anon_sym_strictcount,
-      anon_sym_strictsum,
-      anon_sym_sum,
-      anon_sym_any,
-      anon_sym_unique,
       sym__lower_id,
-      sym_integer,
-      sym_false,
-      sym_result,
-      sym_super,
-      sym_this,
-      sym_true,
-  [10619] = 3,
-    ACTIONS(3), 2,
+      sym_predicate,
+  [10641] = 4,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(899), 8,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
+    ACTIONS(881), 14,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-      sym_float,
-      sym_string,
-    ACTIONS(897), 30,
-      anon_sym_not,
-      anon_sym_if,
-      sym_specialId,
-      anon_sym_exists,
-      anon_sym_forall,
-      anon_sym_forex,
+    ACTIONS(879), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-      anon_sym_avg,
-      anon_sym_concat,
-      anon_sym_strictconcat,
-      anon_sym_count,
-      anon_sym_max,
-      anon_sym_min,
-      anon_sym_rank,
-      anon_sym_strictcount,
-      anon_sym_strictsum,
-      anon_sym_sum,
-      anon_sym_any,
-      anon_sym_unique,
       sym__lower_id,
-      sym_integer,
-      sym_false,
-      sym_result,
-      sym_super,
-      sym_this,
-      sym_true,
-  [10666] = 4,
+      sym_predicate,
+  [10690] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(768), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43873,12 +44248,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(770), 24,
+    ACTIONS(766), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43890,7 +44264,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43898,14 +44273,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10715] = 4,
+  [10739] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(772), 14,
+    ACTIONS(734), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -43918,7 +44293,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(774), 24,
+    ACTIONS(732), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -43943,12 +44318,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10764] = 4,
+  [10788] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(776), 14,
+    ACTIONS(885), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -43963,12 +44338,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(778), 24,
+    ACTIONS(883), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -43980,7 +44354,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -43988,14 +44363,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10813] = 4,
+  [10837] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(772), 14,
+    ACTIONS(784), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44008,7 +44383,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(774), 24,
+    ACTIONS(782), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44033,12 +44408,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10862] = 4,
+  [10886] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(780), 14,
+    ACTIONS(889), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -44053,12 +44428,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(782), 24,
+    ACTIONS(887), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44070,7 +44444,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44078,14 +44453,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10911] = 4,
+  [10935] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(784), 14,
+    ACTIONS(901), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44098,12 +44473,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(786), 24,
+    ACTIONS(899), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44115,7 +44489,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44123,12 +44498,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [10960] = 4,
+  [10984] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(788), 14,
+    ACTIONS(893), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -44143,12 +44518,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(790), 24,
+    ACTIONS(891), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44160,7 +44534,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44168,56 +44543,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11009] = 3,
-    ACTIONS(3), 2,
+  [11033] = 5,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(903), 8,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
+    ACTIONS(905), 1,
+      anon_sym_DOT,
+    ACTIONS(800), 13,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-      sym_float,
-      sym_string,
-    ACTIONS(901), 30,
-      anon_sym_not,
-      anon_sym_if,
-      sym_specialId,
-      anon_sym_exists,
-      anon_sym_forall,
-      anon_sym_forex,
+    ACTIONS(798), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-      anon_sym_avg,
-      anon_sym_concat,
-      anon_sym_strictconcat,
-      anon_sym_count,
-      anon_sym_max,
-      anon_sym_min,
-      anon_sym_rank,
-      anon_sym_strictcount,
-      anon_sym_strictsum,
-      anon_sym_sum,
-      anon_sym_any,
-      anon_sym_unique,
       sym__lower_id,
-      sym_integer,
-      sym_false,
-      sym_result,
-      sym_super,
-      sym_this,
-      sym_true,
-  [11056] = 4,
+      sym_predicate,
+  [11084] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(768), 14,
+    ACTIONS(897), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -44232,7 +44609,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(770), 24,
+    ACTIONS(895), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44257,12 +44634,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11105] = 4,
+  [11133] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(854), 14,
+    ACTIONS(804), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -44277,12 +44654,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(856), 24,
+    ACTIONS(802), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44294,7 +44670,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44302,17 +44679,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11154] = 5,
+  [11182] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(905), 1,
-      anon_sym_DOT,
-    ACTIONS(808), 13,
+    ACTIONS(901), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -44323,12 +44699,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(810), 24,
+    ACTIONS(899), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44340,7 +44715,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44348,19 +44724,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11205] = 6,
+  [11231] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(866), 1,
-      anon_sym_LT,
-    ACTIONS(862), 13,
+    ACTIONS(736), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -44371,8 +44744,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(864), 23,
+    ACTIONS(738), 24,
       anon_sym_module,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
@@ -44395,12 +44769,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11258] = 4,
+  [11280] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(858), 14,
+    ACTIONS(740), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -44415,7 +44789,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(860), 24,
+    ACTIONS(742), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44440,14 +44814,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11307] = 4,
+  [11329] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(850), 14,
+    ACTIONS(897), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44460,7 +44834,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(852), 24,
+    ACTIONS(895), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44485,16 +44859,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11356] = 4,
+  [11378] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(846), 14,
+    ACTIONS(903), 1,
+      anon_sym_DOT,
+    ACTIONS(746), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -44505,11 +44880,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(848), 24,
+    ACTIONS(744), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44521,8 +44897,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44530,14 +44905,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11405] = 4,
+  [11429] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(710), 14,
+    ACTIONS(867), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44550,7 +44925,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(708), 24,
+    ACTIONS(865), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44575,12 +44950,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11454] = 4,
+  [11478] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(826), 14,
+    ACTIONS(808), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -44595,7 +44970,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(828), 24,
+    ACTIONS(806), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44620,14 +44995,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11503] = 4,
+  [11527] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(842), 14,
+    ACTIONS(863), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44640,11 +45015,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(844), 24,
+    ACTIONS(861), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44656,8 +45032,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44665,14 +45040,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11552] = 4,
+  [11576] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(822), 14,
+    ACTIONS(820), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44685,12 +45060,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(824), 24,
+    ACTIONS(818), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44702,7 +45076,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44710,14 +45085,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11601] = 4,
+  [11625] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(838), 14,
+    ACTIONS(824), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44730,7 +45105,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(840), 24,
+    ACTIONS(822), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44755,14 +45130,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11650] = 4,
+  [11674] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(714), 14,
+    ACTIONS(740), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44775,11 +45150,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(712), 24,
+    ACTIONS(742), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44791,8 +45167,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44800,14 +45175,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11699] = 4,
+  [11723] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(830), 14,
+    ACTIONS(736), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44820,7 +45195,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(832), 24,
+    ACTIONS(738), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -44845,14 +45220,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11748] = 4,
+  [11772] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(764), 14,
+    ACTIONS(901), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44865,11 +45240,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(766), 24,
+    ACTIONS(899), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44881,8 +45257,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44890,14 +45265,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11797] = 4,
+  [11821] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(760), 14,
+    ACTIONS(897), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44910,11 +45285,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(762), 24,
+    ACTIONS(895), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44926,8 +45302,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44935,14 +45310,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11846] = 4,
+  [11870] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(756), 14,
+    ACTIONS(893), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -44955,11 +45330,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(758), 24,
+    ACTIONS(891), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -44971,8 +45347,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -44980,14 +45355,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11895] = 4,
+  [11919] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(752), 14,
+    ACTIONS(718), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45000,11 +45375,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(754), 24,
+    ACTIONS(716), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45016,8 +45392,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45025,14 +45400,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11944] = 4,
+  [11968] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(748), 14,
+    ACTIONS(828), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45045,7 +45420,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(750), 24,
+    ACTIONS(826), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45070,14 +45445,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [11993] = 4,
+  [12017] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(834), 14,
+    ACTIONS(722), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45090,11 +45465,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(836), 24,
+    ACTIONS(720), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45106,8 +45482,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45115,17 +45490,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12042] = 5,
+  [12066] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(891), 1,
-      anon_sym_DOT,
-    ACTIONS(877), 13,
+    ACTIONS(726), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -45136,7 +45510,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(879), 24,
+    ACTIONS(724), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45161,14 +45535,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12093] = 4,
+  [12115] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(744), 14,
+    ACTIONS(844), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45181,7 +45555,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(746), 24,
+    ACTIONS(842), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45206,14 +45580,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12142] = 4,
+  [12164] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(740), 14,
+    ACTIONS(834), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45226,7 +45600,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(742), 24,
+    ACTIONS(836), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45251,14 +45625,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12191] = 4,
+  [12213] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(736), 14,
+    ACTIONS(830), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45271,7 +45645,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(738), 24,
+    ACTIONS(832), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45296,14 +45670,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12240] = 4,
+  [12262] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(732), 14,
+    ACTIONS(728), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45316,7 +45690,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(734), 24,
+    ACTIONS(730), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45341,14 +45715,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12289] = 4,
+  [12311] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(854), 14,
+    ACTIONS(863), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45361,12 +45735,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(856), 24,
+    ACTIONS(861), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45378,7 +45751,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45386,12 +45760,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12338] = 4,
+  [12360] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(728), 14,
+    ACTIONS(754), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45406,7 +45780,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(730), 24,
+    ACTIONS(756), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45431,12 +45805,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12387] = 4,
+  [12409] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(724), 14,
+    ACTIONS(758), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45451,7 +45825,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(726), 24,
+    ACTIONS(760), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45476,14 +45850,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12436] = 4,
+  [12458] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(720), 14,
+    ACTIONS(893), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45496,7 +45870,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(722), 24,
+    ACTIONS(891), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45521,17 +45895,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12485] = 5,
+  [12507] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(905), 1,
-      anon_sym_DOT,
-    ACTIONS(877), 13,
+    ACTIONS(873), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -45542,12 +45915,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(879), 24,
+    ACTIONS(871), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45559,7 +45931,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45567,14 +45940,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12536] = 4,
+  [12556] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(716), 14,
+    ACTIONS(877), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45587,7 +45960,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(718), 24,
+    ACTIONS(875), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45612,14 +45985,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12585] = 4,
+  [12605] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(881), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45632,12 +46005,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(883), 24,
+    ACTIONS(879), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45649,7 +46021,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45657,14 +46030,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12634] = 4,
+  [12654] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(885), 14,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -45677,12 +46050,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(887), 24,
+    ACTIONS(883), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45694,7 +46066,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45702,16 +46075,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12683] = 4,
+  [12703] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(826), 14,
+    ACTIONS(581), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(858), 1,
+      anon_sym_LT,
+    ACTIONS(854), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -45722,9 +46098,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(828), 24,
+    ACTIONS(856), 23,
       anon_sym_module,
-      anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
       anon_sym_or,
@@ -45747,12 +46122,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12732] = 4,
+  [12756] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(875), 14,
+    ACTIONS(710), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45767,12 +46142,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(873), 24,
+    ACTIONS(708), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45784,7 +46158,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45792,12 +46167,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12781] = 4,
+  [12805] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(871), 14,
+    ACTIONS(762), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45812,12 +46187,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(869), 24,
+    ACTIONS(764), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -45829,7 +46203,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -45837,12 +46212,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12830] = 4,
+  [12854] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(796), 14,
+    ACTIONS(814), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45857,7 +46232,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(798), 24,
+    ACTIONS(816), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45882,12 +46257,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12879] = 4,
+  [12903] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(800), 14,
+    ACTIONS(810), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45902,7 +46277,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(802), 24,
+    ACTIONS(812), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45927,12 +46302,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12928] = 4,
+  [12952] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(804), 14,
+    ACTIONS(794), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45947,7 +46322,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(806), 24,
+    ACTIONS(796), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -45972,12 +46347,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [12977] = 4,
+  [13001] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(792), 14,
+    ACTIONS(790), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -45992,7 +46367,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(794), 24,
+    ACTIONS(792), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46017,12 +46392,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13026] = 4,
+  [13050] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(818), 14,
+    ACTIONS(770), 14,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -46037,7 +46412,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(820), 24,
+    ACTIONS(772), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46062,14 +46437,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13075] = 4,
+  [13099] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(871), 14,
-      ts_builtin_sym_end,
+    ACTIONS(786), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -46082,12 +46457,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(869), 24,
+    ACTIONS(788), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46099,7 +46473,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46107,14 +46482,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13124] = 4,
+  [13148] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(875), 14,
-      ts_builtin_sym_end,
+    ACTIONS(774), 14,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_DOT,
       anon_sym_BANG_EQ,
@@ -46127,12 +46502,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(873), 24,
+    ACTIONS(776), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46144,7 +46518,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46152,12 +46527,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13173] = 4,
+  [13197] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(885), 14,
+    ACTIONS(889), 14,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -46177,7 +46552,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46189,7 +46563,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46197,7 +46572,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13222] = 4,
+  [13246] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -46241,7 +46616,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13270] = 4,
+  [13294] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -46285,14 +46660,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13318] = 4,
+  [13342] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(917), 13,
+    ACTIONS(915), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -46304,7 +46679,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(915), 24,
+    ACTIONS(917), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46329,14 +46704,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13366] = 4,
+  [13390] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(911), 13,
+    ACTIONS(919), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -46348,11 +46723,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(913), 24,
+    ACTIONS(921), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46364,8 +46740,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46373,12 +46748,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13414] = 4,
+  [13438] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(921), 13,
+    ACTIONS(925), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -46392,12 +46767,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(919), 24,
+    ACTIONS(923), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46409,7 +46783,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46417,14 +46792,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13462] = 4,
+  [13486] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(923), 13,
-      ts_builtin_sym_end,
+    ACTIONS(929), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -46436,7 +46811,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(925), 24,
+    ACTIONS(927), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46461,14 +46836,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13510] = 4,
+  [13534] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(927), 13,
-      ts_builtin_sym_end,
+    ACTIONS(911), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -46480,12 +46855,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(929), 24,
+    ACTIONS(913), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46497,7 +46871,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46505,7 +46880,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13558] = 4,
+  [13582] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -46529,7 +46904,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46541,7 +46915,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46549,12 +46924,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13606] = 4,
+  [13630] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(931), 13,
+    ACTIONS(935), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -46568,7 +46943,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(933), 24,
+    ACTIONS(937), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46593,12 +46968,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13654] = 4,
+  [13678] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(923), 13,
+    ACTIONS(909), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -46612,12 +46987,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(925), 24,
+    ACTIONS(907), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46629,7 +47003,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46637,14 +47012,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13702] = 4,
+  [13726] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(937), 13,
+    ACTIONS(939), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -46656,7 +47031,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(935), 24,
+    ACTIONS(941), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46681,14 +47056,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13750] = 4,
+  [13774] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(941), 13,
+    ACTIONS(915), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -46700,11 +47075,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(939), 24,
+    ACTIONS(917), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -46716,8 +47092,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -46725,7 +47100,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13798] = 4,
+  [13822] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -46769,14 +47144,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13846] = 4,
+  [13870] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(949), 13,
+    ACTIONS(919), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -46788,7 +47163,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(947), 24,
+    ACTIONS(921), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46813,12 +47188,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13894] = 4,
+  [13918] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(953), 13,
+    ACTIONS(949), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -46832,51 +47207,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(951), 24,
-      anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [13942] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(921), 13,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(919), 24,
+    ACTIONS(947), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46901,12 +47232,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [13990] = 4,
+  [13966] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(957), 13,
+    ACTIONS(953), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -46920,7 +47251,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(955), 24,
+    ACTIONS(951), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46945,12 +47276,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14038] = 4,
+  [14014] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(941), 13,
+    ACTIONS(953), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -46964,7 +47295,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(939), 24,
+    ACTIONS(951), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -46989,12 +47320,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14086] = 4,
+  [14062] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(911), 13,
+    ACTIONS(949), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -47008,12 +47339,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(913), 24,
+    ACTIONS(947), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47025,7 +47355,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47033,12 +47364,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14134] = 4,
+  [14110] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(953), 13,
+    ACTIONS(955), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -47052,7 +47383,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(951), 24,
+    ACTIONS(957), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47077,12 +47408,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14182] = 4,
+  [14158] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(961), 13,
+    ACTIONS(911), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -47096,7 +47427,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(959), 24,
+    ACTIONS(913), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47121,12 +47452,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14230] = 4,
+  [14206] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(965), 13,
+    ACTIONS(955), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -47140,11 +47471,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(963), 24,
+    ACTIONS(957), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47156,8 +47488,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47165,14 +47496,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14278] = 4,
+  [14254] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(969), 13,
+    ACTIONS(925), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47184,12 +47515,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(967), 24,
+    ACTIONS(923), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47201,7 +47531,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47209,12 +47540,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14326] = 4,
+  [14302] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(957), 13,
+    ACTIONS(959), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -47228,7 +47559,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(955), 24,
+    ACTIONS(961), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47253,14 +47584,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14374] = 4,
+  [14350] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(937), 13,
-      ts_builtin_sym_end,
+    ACTIONS(915), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47272,7 +47603,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(935), 24,
+    ACTIONS(917), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47297,12 +47628,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14422] = 4,
+  [14398] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(917), 13,
+    ACTIONS(963), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -47316,7 +47647,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(915), 24,
+    ACTIONS(965), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47341,7 +47672,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14470] = 4,
+  [14446] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -47385,14 +47716,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14518] = 4,
+  [14494] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(941), 13,
-      ts_builtin_sym_end,
+    ACTIONS(939), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47404,7 +47735,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(939), 24,
+    ACTIONS(941), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47429,56 +47760,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14566] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(969), 13,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(967), 24,
-      anon_sym_module,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_instanceof,
-      anon_sym_in,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [14614] = 4,
+  [14542] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(943), 13,
+    ACTIONS(963), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -47492,11 +47779,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(945), 24,
+    ACTIONS(965), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47508,8 +47796,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47517,14 +47804,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14662] = 4,
+  [14590] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(961), 13,
-      ts_builtin_sym_end,
+    ACTIONS(959), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47536,11 +47823,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(959), 24,
+    ACTIONS(961), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47552,8 +47840,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47561,12 +47848,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14710] = 4,
+  [14638] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(931), 13,
+    ACTIONS(955), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -47580,7 +47867,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(933), 24,
+    ACTIONS(957), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47605,12 +47892,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14758] = 4,
+  [14686] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(909), 13,
+    ACTIONS(963), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -47624,11 +47911,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(907), 24,
+    ACTIONS(965), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47640,8 +47928,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47649,14 +47936,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14806] = 4,
+  [14734] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(957), 13,
+    ACTIONS(931), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47668,7 +47955,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(955), 24,
+    ACTIONS(933), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47693,14 +47980,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14854] = 4,
+  [14782] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(921), 13,
+    ACTIONS(967), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47712,7 +47999,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(919), 24,
+    ACTIONS(969), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47737,14 +48024,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14902] = 4,
+  [14830] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(953), 13,
-      ts_builtin_sym_end,
+    ACTIONS(967), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47756,12 +48043,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(951), 24,
+    ACTIONS(969), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47773,7 +48059,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47781,12 +48068,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14950] = 4,
+  [14878] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(953), 13,
+    ACTIONS(931), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -47800,7 +48087,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(951), 24,
+    ACTIONS(933), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47825,14 +48112,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [14998] = 4,
+  [14926] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(957), 13,
-      ts_builtin_sym_end,
+    ACTIONS(935), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47844,12 +48131,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(955), 24,
+    ACTIONS(937), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -47861,7 +48147,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -47869,14 +48156,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15046] = 4,
+  [14974] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(923), 13,
+    ACTIONS(909), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47888,7 +48175,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(925), 24,
+    ACTIONS(907), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47913,12 +48200,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15094] = 4,
+  [15022] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(937), 13,
+    ACTIONS(939), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -47932,7 +48219,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(935), 24,
+    ACTIONS(941), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -47957,14 +48244,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15142] = 4,
+  [15070] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(917), 13,
-      ts_builtin_sym_end,
+    ACTIONS(943), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -47976,7 +48263,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(915), 24,
+    ACTIONS(945), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48001,14 +48288,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15190] = 4,
+  [15118] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(931), 13,
+    ACTIONS(953), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48020,7 +48307,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(933), 24,
+    ACTIONS(951), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48045,14 +48332,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15238] = 4,
+  [15166] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(927), 13,
+    ACTIONS(949), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48064,7 +48351,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(929), 24,
+    ACTIONS(947), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48089,12 +48376,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15286] = 4,
+  [15214] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(921), 13,
+    ACTIONS(935), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -48108,7 +48395,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(919), 24,
+    ACTIONS(937), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48133,14 +48420,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15334] = 4,
+  [15262] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(949), 13,
-      ts_builtin_sym_end,
+    ACTIONS(909), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48152,7 +48439,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(947), 24,
+    ACTIONS(907), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48177,14 +48464,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15382] = 4,
+  [15310] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(965), 13,
-      ts_builtin_sym_end,
+    ACTIONS(939), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48196,12 +48483,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(963), 24,
+    ACTIONS(941), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -48213,7 +48499,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -48221,14 +48508,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15430] = 4,
+  [15358] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(941), 13,
+    ACTIONS(955), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48240,7 +48527,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(939), 24,
+    ACTIONS(957), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48265,12 +48552,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15478] = 4,
+  [15406] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(943), 13,
+    ACTIONS(919), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48284,7 +48571,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(945), 24,
+    ACTIONS(921), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48309,12 +48596,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15526] = 4,
+  [15454] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(911), 13,
+    ACTIONS(935), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48328,7 +48615,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(913), 24,
+    ACTIONS(937), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48353,12 +48640,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15574] = 4,
+  [15502] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(937), 13,
+    ACTIONS(967), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48372,7 +48659,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(935), 24,
+    ACTIONS(969), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48397,14 +48684,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15622] = 4,
+  [15550] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(949), 13,
-      ts_builtin_sym_end,
+    ACTIONS(915), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48416,7 +48703,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(947), 24,
+    ACTIONS(917), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48441,14 +48728,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15670] = 4,
+  [15598] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(917), 13,
+    ACTIONS(929), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48460,7 +48747,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(915), 24,
+    ACTIONS(927), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48485,12 +48772,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15718] = 4,
+  [15646] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(965), 13,
+    ACTIONS(967), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -48504,11 +48791,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(963), 24,
+    ACTIONS(969), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -48520,8 +48808,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -48529,14 +48816,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15766] = 4,
+  [15694] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(927), 13,
-      ts_builtin_sym_end,
+    ACTIONS(953), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48548,11 +48835,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(929), 24,
+    ACTIONS(951), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -48564,8 +48852,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -48573,12 +48860,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15814] = 4,
+  [15742] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(923), 13,
+    ACTIONS(931), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48592,7 +48879,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(925), 24,
+    ACTIONS(933), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48617,12 +48904,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15862] = 4,
+  [15790] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(909), 13,
+    ACTIONS(949), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48636,11 +48923,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(907), 24,
+    ACTIONS(947), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -48652,8 +48940,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_asc,
-      anon_sym_desc,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -48661,12 +48948,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15910] = 4,
+  [15838] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(909), 13,
+    ACTIONS(925), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -48680,7 +48967,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(907), 24,
+    ACTIONS(923), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48705,12 +48992,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [15958] = 4,
+  [15886] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(949), 13,
+    ACTIONS(925), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48724,7 +49011,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(947), 24,
+    ACTIONS(923), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48749,14 +49036,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [16006] = 4,
+  [15934] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(961), 13,
-      ts_builtin_sym_end,
+    ACTIONS(959), 13,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48768,12 +49055,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(959), 24,
+    ACTIONS(961), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -48785,7 +49071,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -48793,12 +49080,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [16054] = 4,
+  [15982] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(969), 13,
+    ACTIONS(911), 13,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_EQ,
@@ -48812,7 +49099,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(967), 24,
+    ACTIONS(913), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48837,12 +49124,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [16102] = 4,
+  [16030] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(965), 13,
+    ACTIONS(943), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48856,12 +49143,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(963), 24,
+    ACTIONS(945), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
@@ -48873,7 +49159,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-      anon_sym_order,
+      anon_sym_asc,
+      anon_sym_desc,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -48881,14 +49168,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [16150] = 4,
+  [16078] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(969), 13,
+    ACTIONS(929), 13,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
@@ -48900,7 +49187,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(967), 24,
+    ACTIONS(927), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48925,12 +49212,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [16198] = 4,
+  [16126] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(927), 13,
+    ACTIONS(963), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48944,7 +49231,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(929), 24,
+    ACTIONS(965), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -48969,12 +49256,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [16246] = 4,
+  [16174] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(961), 13,
+    ACTIONS(959), 13,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(961), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [16222] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(919), 13,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_EQ,
@@ -48988,7 +49319,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(959), 24,
+    ACTIONS(921), 24,
       anon_sym_module,
       anon_sym_LT,
       anon_sym_GT,
@@ -49013,7 +49344,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [16294] = 25,
+  [16270] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(929), 13,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(927), 24,
+      anon_sym_module,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_instanceof,
+      anon_sym_in,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_SLASH,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [16318] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49044,39 +49419,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(684), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [16382] = 25,
+  [16411] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49107,39 +49485,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(991), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(667), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [16470] = 25,
+  [16504] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49170,39 +49551,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(993), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [16558] = 25,
+  [16597] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49233,39 +49617,108 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(995), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(665), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(667), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+    STATE(1250), 6,
+      sym_module,
+      sym_importDirective,
+      sym_classlessPredicate,
+      sym_datatype,
+      sym_select,
+      sym_dataclass,
+  [16690] = 27,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(971), 1,
+      anon_sym_module,
+    ACTIONS(975), 1,
+      anon_sym_import,
+    ACTIONS(977), 1,
+      anon_sym_newtype,
+    ACTIONS(979), 1,
+      anon_sym_from,
+    ACTIONS(981), 1,
+      anon_sym_where,
+    ACTIONS(983), 1,
+      anon_sym_select,
+    ACTIONS(985), 1,
+      anon_sym_class,
+    ACTIONS(987), 1,
+      sym_qldoc,
+    ACTIONS(989), 1,
+      sym_predicate,
+    ACTIONS(997), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1668), 1,
       sym_simpleId,
+    STATE(1750), 1,
+      sym_typeExpr,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
+      sym_moduleMember,
+      aux_sym_ql_repeat1,
+    STATE(703), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [16646] = 25,
+  [16783] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49294,104 +49747,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(997), 1,
+    ACTIONS(999), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [16734] = 25,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(999), 1,
-      ts_builtin_sym_end,
-    ACTIONS(1001), 1,
-      sym__lower_id,
-    ACTIONS(1004), 1,
-      anon_sym_module,
-    ACTIONS(1007), 1,
-      anon_sym_import,
-    ACTIONS(1010), 1,
-      anon_sym_newtype,
-    ACTIONS(1013), 1,
-      anon_sym_from,
-    ACTIONS(1016), 1,
-      anon_sym_where,
-    ACTIONS(1019), 1,
-      anon_sym_select,
-    ACTIONS(1022), 1,
-      anon_sym_class,
-    ACTIONS(1025), 1,
-      sym_qldoc,
-    ACTIONS(1031), 1,
-      sym_dbtype,
-    ACTIONS(1034), 1,
-      sym__upper_id,
-    ACTIONS(1037), 1,
-      sym_predicate,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1756), 1,
-      sym_typeExpr,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(668), 2,
-      sym_moduleMember,
-      aux_sym_ql_repeat1,
-    STATE(702), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(1028), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-    STATE(1220), 6,
-      sym_module,
-      sym_importDirective,
-      sym_classlessPredicate,
-      sym_datatype,
-      sym_select,
-      sym_dataclass,
-  [16822] = 25,
+  [16876] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49420,41 +49813,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1040), 1,
+    ACTIONS(1001), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(671), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(665), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [16910] = 25,
+  [16969] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49483,41 +49879,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1042), 1,
+    ACTIONS(1003), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(684), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [16998] = 25,
+  [17062] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49546,41 +49945,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1044), 1,
+    ACTIONS(1005), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17086] = 25,
+  [17155] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49609,41 +50011,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1046), 1,
+    ACTIONS(1007), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(688), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17174] = 25,
+  [17248] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49672,41 +50077,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1048), 1,
+    ACTIONS(1009), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(700), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17262] = 25,
+  [17341] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49735,41 +50143,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1050), 1,
+    ACTIONS(1011), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(698), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17350] = 25,
+  [17434] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49798,41 +50209,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1052), 1,
+    ACTIONS(1013), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(694), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17438] = 25,
+  [17527] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49861,41 +50275,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1054), 1,
+    ACTIONS(1015), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(695), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17526] = 25,
+  [17620] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49924,41 +50341,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1056), 1,
+    ACTIONS(1017), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(671), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17614] = 25,
+  [17713] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -49987,41 +50407,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1058), 1,
+    ACTIONS(1019), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(689), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17702] = 25,
+  [17806] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50050,41 +50473,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1060), 1,
+    ACTIONS(1021), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(672), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17790] = 25,
+  [17899] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50113,41 +50539,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1062), 1,
+    ACTIONS(1023), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(675), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17878] = 25,
+  [17992] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50176,41 +50605,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1064), 1,
+    ACTIONS(1025), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [17966] = 25,
+  [18085] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50239,41 +50671,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1066), 1,
+    ACTIONS(1027), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(680), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18054] = 25,
+  [18178] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50302,41 +50737,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1068), 1,
+    ACTIONS(1029), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(681), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(678), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18142] = 25,
+  [18271] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50365,41 +50803,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1070), 1,
+    ACTIONS(1031), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18230] = 25,
+  [18364] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50428,41 +50869,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1072), 1,
+    ACTIONS(1033), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(682), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18318] = 25,
+  [18457] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50491,41 +50935,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1074), 1,
+    ACTIONS(1035), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(674), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18406] = 25,
+  [18550] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50554,41 +51001,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1076), 1,
+    ACTIONS(1037), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(673), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(676), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18494] = 25,
+  [18643] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50617,41 +51067,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1078), 1,
+    ACTIONS(1039), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(681), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18582] = 25,
+  [18736] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50680,91 +51133,97 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1080), 1,
+    ACTIONS(1041), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(694), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18670] = 25,
+  [18829] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
+    ACTIONS(1043), 1,
+      ts_builtin_sym_end,
+    ACTIONS(1045), 1,
       sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(971), 1,
+    ACTIONS(1048), 1,
       anon_sym_module,
-    ACTIONS(975), 1,
+    ACTIONS(1051), 1,
       anon_sym_import,
-    ACTIONS(977), 1,
+    ACTIONS(1054), 1,
       anon_sym_newtype,
-    ACTIONS(979), 1,
+    ACTIONS(1057), 1,
       anon_sym_from,
-    ACTIONS(981), 1,
+    ACTIONS(1060), 1,
       anon_sym_where,
-    ACTIONS(983), 1,
+    ACTIONS(1063), 1,
       anon_sym_select,
-    ACTIONS(985), 1,
+    ACTIONS(1066), 1,
       anon_sym_class,
-    ACTIONS(987), 1,
+    ACTIONS(1069), 1,
       sym_qldoc,
-    ACTIONS(989), 1,
+    ACTIONS(1075), 1,
+      sym_dbtype,
+    ACTIONS(1078), 1,
+      sym__upper_id,
+    ACTIONS(1081), 1,
       sym_predicate,
-    ACTIONS(1082), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1788), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(679), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(690), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
-    STATE(703), 2,
+    STATE(702), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(1072), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -50777,7 +51236,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18758] = 25,
+  [18922] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50808,39 +51267,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(1084), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(685), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(693), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [18846] = 25,
+  [19015] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50871,102 +51333,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(1086), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
-      sym_typeExpr,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(697), 2,
-      sym_moduleMember,
-      aux_sym_ql_repeat1,
-    STATE(703), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
+    STATE(1668), 1,
       sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-    STATE(1230), 6,
-      sym_module,
-      sym_importDirective,
-      sym_classlessPredicate,
-      sym_datatype,
-      sym_select,
-      sym_dataclass,
-  [18934] = 25,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(11), 1,
-      anon_sym_module,
-    ACTIONS(13), 1,
-      anon_sym_import,
-    ACTIONS(15), 1,
-      anon_sym_newtype,
-    ACTIONS(17), 1,
-      anon_sym_from,
-    ACTIONS(19), 1,
-      anon_sym_where,
-    ACTIONS(21), 1,
-      anon_sym_select,
-    ACTIONS(23), 1,
-      anon_sym_class,
-    ACTIONS(25), 1,
-      sym_qldoc,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(33), 1,
-      sym_predicate,
-    ACTIONS(1088), 1,
-      ts_builtin_sym_end,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1756), 1,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(668), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(664), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
-    STATE(702), 2,
+    STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1220), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19022] = 25,
+  [19108] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -50995,41 +51397,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1090), 1,
+    ACTIONS(1088), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19110] = 25,
+  [19201] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -51058,41 +51463,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1092), 1,
+    ACTIONS(1090), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19198] = 25,
+  [19294] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -51121,52 +51529,121 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(989), 1,
       sym_predicate,
-    ACTIONS(1094), 1,
+    ACTIONS(1092), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(692), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(668), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+    STATE(1250), 6,
+      sym_module,
+      sym_importDirective,
+      sym_classlessPredicate,
+      sym_datatype,
+      sym_select,
+      sym_dataclass,
+  [19387] = 27,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(971), 1,
+      anon_sym_module,
+    ACTIONS(975), 1,
+      anon_sym_import,
+    ACTIONS(977), 1,
+      anon_sym_newtype,
+    ACTIONS(979), 1,
+      anon_sym_from,
+    ACTIONS(981), 1,
+      anon_sym_where,
+    ACTIONS(983), 1,
+      anon_sym_select,
+    ACTIONS(985), 1,
+      anon_sym_class,
+    ACTIONS(987), 1,
+      sym_qldoc,
+    ACTIONS(989), 1,
+      sym_predicate,
+    ACTIONS(1094), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1668), 1,
       sym_simpleId,
+    STATE(1750), 1,
+      sym_typeExpr,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(686), 2,
+      sym_moduleMember,
+      aux_sym_ql_repeat1,
+    STATE(703), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19286] = 25,
+  [19480] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(999), 1,
+    ACTIONS(1043), 1,
       anon_sym_RBRACE,
-    ACTIONS(1001), 1,
+    ACTIONS(1045), 1,
       sym__lower_id,
-    ACTIONS(1031), 1,
+    ACTIONS(1075), 1,
       sym_dbtype,
-    ACTIONS(1034), 1,
+    ACTIONS(1078), 1,
       sym__upper_id,
     ACTIONS(1096), 1,
       anon_sym_module,
@@ -51186,39 +51663,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_qldoc,
     ACTIONS(1120), 1,
       sym_predicate,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(1028), 5,
+    ACTIONS(1072), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19374] = 25,
+  [19573] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -51249,88 +51729,94 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(1123), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(677), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19462] = 25,
+  [19666] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(9), 1,
       sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(971), 1,
+    ACTIONS(11), 1,
       anon_sym_module,
-    ACTIONS(975), 1,
+    ACTIONS(13), 1,
       anon_sym_import,
-    ACTIONS(977), 1,
+    ACTIONS(15), 1,
       anon_sym_newtype,
-    ACTIONS(979), 1,
+    ACTIONS(17), 1,
       anon_sym_from,
-    ACTIONS(981), 1,
+    ACTIONS(19), 1,
       anon_sym_where,
-    ACTIONS(983), 1,
+    ACTIONS(21), 1,
       anon_sym_select,
-    ACTIONS(985), 1,
+    ACTIONS(23), 1,
       anon_sym_class,
-    ACTIONS(987), 1,
+    ACTIONS(25), 1,
       sym_qldoc,
-    ACTIONS(989), 1,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(33), 1,
       sym_predicate,
     ACTIONS(1125), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
+      ts_builtin_sym_end,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1788), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(670), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(690), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
-    STATE(703), 2,
+    STATE(702), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
@@ -51344,7 +51830,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19550] = 25,
+  [19759] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -51375,39 +51861,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(1127), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(701), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(697), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19638] = 25,
+  [19852] = 27,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -51438,39 +51927,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_predicate,
     ACTIONS(1129), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(697), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(663), 2,
       sym_moduleMember,
       aux_sym_ql_repeat1,
     STATE(703), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1230), 6,
+    STATE(1250), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19726] = 21,
+  [19945] = 23,
     ACTIONS(9), 1,
       sym__lower_id,
     ACTIONS(11), 1,
@@ -51493,39 +51985,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym__upper_id,
     ACTIONS(33), 1,
       sym_predicate,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1756), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1788), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1201), 2,
+    STATE(1199), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1382), 6,
+    STATE(1260), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19802] = 21,
+  [20026] = 23,
     ACTIONS(9), 1,
       sym__lower_id,
     ACTIONS(29), 1,
@@ -51548,39 +52043,42 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_class,
     ACTIONS(989), 1,
       sym_predicate,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1757), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1750), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1201), 2,
+    STATE(1199), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-    STATE(1386), 6,
+    STATE(1259), 6,
       sym_module,
       sym_importDirective,
       sym_classlessPredicate,
       sym_datatype,
       sym_select,
       sym_dataclass,
-  [19878] = 6,
+  [20107] = 6,
     ACTIONS(583), 1,
       anon_sym_LPAREN,
     ACTIONS(585), 1,
@@ -51591,13 +52089,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(581), 5,
+    ACTIONS(579), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(579), 21,
+    ACTIONS(581), 21,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51619,19 +52117,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PERCENT,
       anon_sym_COLON_COLON,
-  [19923] = 4,
+  [20152] = 5,
+    ACTIONS(703), 1,
+      anon_sym_LT,
     ACTIONS(706), 1,
       anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(704), 5,
-      anon_sym_LT,
+    ACTIONS(701), 4,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(702), 22,
+    ACTIONS(699), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51654,50 +52153,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [19962] = 3,
-    ACTIONS(3), 2,
+  [20193] = 21,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(730), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_DOT,
-      anon_sym_SLASH,
-    ACTIONS(728), 22,
-      anon_sym_COMMA,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1131), 1,
       anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [19998] = 3,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(770), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [20265] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(806), 5,
+    ACTIONS(816), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(804), 22,
+    ACTIONS(814), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51720,19 +52237,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20034] = 5,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(866), 1,
-      anon_sym_LT,
+  [20301] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1137), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [20373] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(864), 3,
+    ACTIONS(750), 5,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(862), 22,
+    ACTIONS(752), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51755,17 +52321,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20074] = 3,
+  [20409] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1139), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(786), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [20481] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(734), 5,
+    ACTIONS(766), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(732), 22,
+    ACTIONS(768), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51788,17 +52405,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20110] = 3,
+  [20517] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(860), 5,
+    ACTIONS(782), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(858), 22,
+    ACTIONS(784), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51821,17 +52438,222 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20146] = 3,
+  [20553] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1141), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [20625] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1143), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(708), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [20697] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1145), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(713), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [20769] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1147), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(747), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [20841] = 4,
+    ACTIONS(1149), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(738), 5,
+    ACTIONS(798), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
-      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(736), 22,
+    ACTIONS(800), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51854,17 +52676,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20182] = 3,
+  [20879] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(742), 5,
+    ACTIONS(756), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(740), 22,
+    ACTIONS(754), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51887,17 +52709,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20218] = 3,
+  [20915] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(746), 5,
+    ACTIONS(802), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(744), 22,
+    ACTIONS(804), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51920,55 +52742,50 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20254] = 8,
-    ACTIONS(583), 1,
-      anon_sym_LPAREN,
-    ACTIONS(628), 1,
-      anon_sym_LT,
-    ACTIONS(631), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1131), 1,
-      anon_sym_DOT,
+  [20951] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(587), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    ACTIONS(581), 3,
+    ACTIONS(891), 5,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(579), 18,
+    ACTIONS(893), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
+      anon_sym_as,
       anon_sym_EQ,
       anon_sym_or,
+      anon_sym_RPAREN,
       anon_sym_select,
       anon_sym_instanceof,
       anon_sym_then,
       anon_sym_else,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_DOT_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
+      anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_COLON_COLON,
-  [20300] = 3,
+  [20987] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(869), 5,
+    ACTIONS(887), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(871), 22,
+    ACTIONS(889), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -51991,17 +52808,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20336] = 3,
+  [21023] = 5,
+    ACTIONS(581), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(858), 1,
+      anon_sym_LT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(873), 5,
-      anon_sym_LT,
+    ACTIONS(856), 3,
       anon_sym_GT,
       anon_sym_in,
-      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(875), 22,
+    ACTIONS(854), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52024,17 +52843,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20372] = 3,
+  [21063] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1151), 1,
+      sym__lower_id,
+    ACTIONS(1154), 1,
+      anon_sym_RBRACE,
+    ACTIONS(1156), 1,
+      sym_qldoc,
+    ACTIONS(1162), 1,
+      sym_dbtype,
+    ACTIONS(1165), 1,
+      sym__upper_id,
+    ACTIONS(1168), 1,
+      sym_predicate,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(1159), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [21135] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(750), 5,
+    ACTIONS(760), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(748), 22,
+    ACTIONS(758), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52057,17 +52927,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20408] = 3,
+  [21171] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(754), 5,
+    ACTIONS(883), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(752), 22,
+    ACTIONS(885), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52090,17 +52960,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20444] = 3,
+  [21207] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(758), 5,
+    ACTIONS(879), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(756), 22,
+    ACTIONS(881), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52123,17 +52993,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20480] = 3,
+  [21243] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(887), 5,
+    ACTIONS(895), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(885), 22,
+    ACTIONS(897), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52156,17 +53026,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20516] = 3,
+  [21279] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(883), 5,
+    ACTIONS(899), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(881), 22,
+    ACTIONS(901), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52189,18 +53059,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20552] = 4,
-    ACTIONS(1134), 1,
-      anon_sym_DOT,
+  [21315] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(879), 4,
+    ACTIONS(738), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(877), 22,
+    ACTIONS(736), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52223,17 +53092,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20590] = 3,
+  [21351] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(762), 5,
+    ACTIONS(875), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(760), 22,
+    ACTIONS(877), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52256,50 +53125,54 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20626] = 3,
+  [21387] = 7,
+    ACTIONS(583), 1,
+      anon_sym_LPAREN,
+    ACTIONS(674), 1,
+      anon_sym_RPAREN,
+    ACTIONS(858), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(766), 5,
+    ACTIONS(587), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    ACTIONS(579), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
-      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(764), 22,
+    ACTIONS(581), 18,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-      anon_sym_as,
       anon_sym_EQ,
       anon_sym_or,
-      anon_sym_RPAREN,
       anon_sym_select,
       anon_sym_instanceof,
       anon_sym_then,
       anon_sym_else,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_DOT_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
       anon_sym_DASH,
-      anon_sym_STAR,
       anon_sym_PERCENT,
-  [20662] = 3,
+      anon_sym_COLON_COLON,
+  [21431] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(770), 5,
+    ACTIONS(724), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(768), 22,
+    ACTIONS(726), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52322,17 +53195,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20698] = 3,
+  [21467] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(726), 5,
+    ACTIONS(742), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(724), 22,
+    ACTIONS(740), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52355,17 +53228,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20734] = 3,
+  [21503] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(722), 5,
+    ACTIONS(720), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(720), 22,
+    ACTIONS(722), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52388,17 +53261,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20770] = 3,
+  [21539] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(852), 5,
+    ACTIONS(716), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(850), 22,
+    ACTIONS(718), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52421,17 +53294,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20806] = 3,
+  [21575] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1171), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(767), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [21647] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(848), 5,
+    ACTIONS(764), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(846), 22,
+    ACTIONS(762), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52454,17 +53378,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20842] = 3,
+  [21683] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1173), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [21755] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(718), 5,
+    ACTIONS(826), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(716), 22,
+    ACTIONS(828), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52487,17 +53462,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20878] = 3,
+  [21791] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(828), 5,
+    ACTIONS(832), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(826), 22,
+    ACTIONS(830), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52520,17 +53495,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20914] = 3,
+  [21827] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(798), 5,
+    ACTIONS(836), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(796), 22,
+    ACTIONS(834), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52553,17 +53528,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20950] = 3,
+  [21863] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(844), 5,
+    ACTIONS(842), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(842), 22,
+    ACTIONS(844), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52586,17 +53561,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [20986] = 3,
+  [21899] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(840), 5,
+    ACTIONS(772), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(838), 22,
+    ACTIONS(770), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52619,17 +53594,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21022] = 3,
+  [21935] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(774), 5,
+    ACTIONS(708), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(772), 22,
+    ACTIONS(710), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52652,17 +53627,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21058] = 3,
+  [21971] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(778), 5,
+    ACTIONS(806), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(776), 22,
+    ACTIONS(808), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52685,17 +53660,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21094] = 3,
+  [22007] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(782), 5,
+    ACTIONS(776), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(780), 22,
+    ACTIONS(774), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52718,183 +53693,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21130] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(786), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_DOT,
-      anon_sym_SLASH,
-    ACTIONS(784), 22,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21166] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(790), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_DOT,
-      anon_sym_SLASH,
-    ACTIONS(788), 22,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21202] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(802), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_DOT,
-      anon_sym_SLASH,
-    ACTIONS(800), 22,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21238] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(856), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_DOT,
-      anon_sym_SLASH,
-    ACTIONS(854), 22,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21274] = 4,
-    ACTIONS(1134), 1,
-      anon_sym_DOT,
-    ACTIONS(3), 2,
+  [22043] = 21,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(810), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(808), 22,
-      anon_sym_COMMA,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1175), 1,
       anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21312] = 3,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [22115] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(708), 5,
+    ACTIONS(871), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(710), 22,
+    ACTIONS(873), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52917,17 +53777,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21348] = 3,
+  [22151] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(712), 5,
+    ACTIONS(714), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(714), 22,
+    ACTIONS(712), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52950,17 +53810,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21384] = 3,
+  [22187] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(824), 5,
+    ACTIONS(818), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(822), 22,
+    ACTIONS(820), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -52983,17 +53843,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21420] = 3,
+  [22223] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(832), 5,
+    ACTIONS(865), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(830), 22,
+    ACTIONS(867), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -53016,83 +53876,69 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21456] = 3,
-    ACTIONS(3), 2,
+  [22259] = 21,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(836), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_DOT,
-      anon_sym_SLASH,
-    ACTIONS(834), 22,
-      anon_sym_COMMA,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1177), 1,
       anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21492] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(820), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(758), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [22331] = 4,
+    ACTIONS(1149), 1,
       anon_sym_DOT,
-      anon_sym_SLASH,
-    ACTIONS(818), 22,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21528] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(794), 5,
+    ACTIONS(744), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
-      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(792), 22,
+    ACTIONS(746), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -53115,49 +53961,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [21564] = 13,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-    ACTIONS(654), 9,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_or,
-      anon_sym_select,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-  [21619] = 19,
+  [22369] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53168,34 +53972,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1142), 1,
-      anon_sym_RBRACE,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    STATE(1388), 1,
+    ACTIONS(1179), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(786), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(738), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53205,42 +54012,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [21686] = 6,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(670), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(672), 19,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [21727] = 19,
+  [22441] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53251,34 +54023,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1148), 1,
+    ACTIONS(1181), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(777), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53288,7 +54063,40 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [21794] = 19,
+  [22513] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(822), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_DOT,
+      anon_sym_SLASH,
+    ACTIONS(824), 22,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [22549] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53299,34 +54107,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1150), 1,
+    ACTIONS(1183), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53336,7 +54147,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [21861] = 19,
+  [22621] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53347,34 +54158,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1152), 1,
+    ACTIONS(1185), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(796), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53384,7 +54198,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [21928] = 19,
+  [22693] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53395,34 +54209,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1154), 1,
+    ACTIONS(1187), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(762), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53432,7 +54249,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [21995] = 19,
+  [22765] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53443,34 +54260,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1156), 1,
+    ACTIONS(1189), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(754), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(766), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53480,16 +54300,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [22062] = 3,
+  [22837] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(907), 4,
+    ACTIONS(788), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(909), 22,
+    ACTIONS(786), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -53512,7 +54333,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [22097] = 19,
+  [22873] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53523,34 +54344,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1158), 1,
+    ACTIONS(1191), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53560,16 +54384,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [22164] = 3,
+  [22945] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(959), 4,
+    ACTIONS(812), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(961), 22,
+    ACTIONS(810), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -53592,16 +54417,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [22199] = 3,
+  [22981] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(925), 4,
+    ACTIONS(796), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(923), 22,
+    ACTIONS(794), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -53624,16 +54450,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [22234] = 3,
+  [23017] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(967), 4,
+    ACTIONS(792), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(969), 22,
+    ACTIONS(790), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -53656,7 +54483,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [22269] = 19,
+  [23053] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53667,34 +54494,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1160), 1,
+    ACTIONS(1193), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(798), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53704,130 +54534,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [22336] = 12,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-    ACTIONS(650), 10,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_or,
-      anon_sym_select,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-  [22389] = 14,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-    ACTIONS(698), 8,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_select,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-  [22446] = 10,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(696), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(694), 15,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [22495] = 19,
+  [23125] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -53838,34 +54545,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1164), 1,
+    ACTIONS(1195), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(774), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -53875,152 +54585,109 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [22562] = 6,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(666), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(668), 19,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [22603] = 8,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(662), 3,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-    ACTIONS(664), 17,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-  [22648] = 12,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
+  [23197] = 21,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-    ACTIONS(676), 10,
-      anon_sym_COMMA,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1197), 1,
       anon_sym_RBRACE,
-      anon_sym_or,
-      anon_sym_select,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-  [22701] = 3,
-    ACTIONS(3), 2,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(771), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [23269] = 21,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(947), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(949), 22,
-      anon_sym_COMMA,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1199), 1,
       anon_sym_RBRACE,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_select,
-      anon_sym_instanceof,
-      anon_sym_then,
-      anon_sym_else,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [22736] = 19,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(772), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [23341] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54031,34 +54698,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1166), 1,
+    ACTIONS(1201), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54068,7 +54738,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [22803] = 19,
+  [23413] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54079,34 +54749,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1168), 1,
+    ACTIONS(1203), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(784), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54116,7 +54789,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [22870] = 19,
+  [23485] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54127,34 +54800,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1170), 1,
+    ACTIONS(1205), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54164,16 +54840,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [22937] = 3,
+  [23557] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(915), 4,
+    ACTIONS(730), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(917), 22,
+    ACTIONS(728), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -54196,16 +54873,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [22972] = 3,
+  [23593] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(935), 4,
+    ACTIONS(861), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
+      anon_sym_DOT,
       anon_sym_SLASH,
-    ACTIONS(937), 22,
+    ACTIONS(863), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -54228,7 +54906,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [23007] = 19,
+  [23629] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54239,34 +54917,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1172), 1,
+    ACTIONS(1207), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(777), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54276,7 +54957,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23074] = 19,
+  [23701] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54287,34 +54968,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1174), 1,
+    ACTIONS(1209), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(779), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(780), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54324,7 +55008,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23141] = 19,
+  [23773] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54335,34 +55019,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1176), 1,
+    ACTIONS(1211), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54372,7 +55059,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23208] = 19,
+  [23845] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54383,34 +55070,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1178), 1,
+    ACTIONS(1213), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(755), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54420,7 +55110,40 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23275] = 19,
+  [23917] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(732), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_DOT,
+      anon_sym_SLASH,
+    ACTIONS(734), 22,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [23953] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54431,34 +55154,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1180), 1,
+    ACTIONS(1215), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(756), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54468,7 +55194,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23342] = 19,
+  [24025] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54479,34 +55205,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1182), 1,
+    ACTIONS(1217), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(785), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(784), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54516,7 +55245,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23409] = 19,
+  [24097] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54527,34 +55256,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1184), 1,
+    ACTIONS(1219), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(772), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(757), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54564,7 +55296,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23476] = 19,
+  [24169] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54575,34 +55307,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1186), 1,
+    ACTIONS(1221), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54612,7 +55347,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23543] = 19,
+  [24241] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54623,34 +55358,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1188), 1,
+    ACTIONS(1223), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54660,7 +55398,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23610] = 19,
+  [24313] = 21,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
@@ -54671,34 +55409,88 @@ static const uint16_t ts_small_parse_table[] = {
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1144), 1,
+    ACTIONS(1133), 1,
       sym_qldoc,
-    ACTIONS(1146), 1,
+    ACTIONS(1135), 1,
       sym_predicate,
-    ACTIONS(1190), 1,
+    ACTIONS(1225), 1,
       anon_sym_RBRACE,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1517), 1,
+    STATE(1499), 1,
       sym_typeExpr,
-    STATE(1596), 1,
+    STATE(1653), 1,
       sym_className,
-    STATE(1868), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
-    STATE(799), 2,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(783), 2,
       sym_classMember,
       aux_sym_dataclass_repeat2,
-    STATE(870), 2,
+    STATE(830), 2,
       sym_annotation,
       aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
+    STATE(1438), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [24385] = 21,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1133), 1,
+      sym_qldoc,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    ACTIONS(1227), 1,
+      anon_sym_RBRACE,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
       sym_simpleId,
-    STATE(1433), 3,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(723), 2,
+      sym_classMember,
+      aux_sym_dataclass_repeat2,
+    STATE(830), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1438), 3,
       sym_charpred,
       sym_memberPredicate,
       sym_field,
@@ -54708,16 +55500,115 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [23677] = 3,
+  [24457] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(913), 4,
+    ACTIONS(947), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(911), 22,
+    ACTIONS(949), 22,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [24492] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(961), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(959), 22,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [24527] = 6,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(634), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(632), 19,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [24568] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(937), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(935), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -54740,23 +55631,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [23712] = 12,
+  [24603] = 12,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -54770,7 +55661,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 10,
+    ACTIONS(685), 10,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_or,
@@ -54781,16 +55672,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_implies,
       anon_sym_RBRACK,
       anon_sym_DOT_DOT,
-  [23765] = 3,
+  [24656] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(929), 4,
+    ACTIONS(969), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(927), 22,
+    ACTIONS(967), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -54813,16 +55704,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [23800] = 3,
+  [24691] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(933), 4,
+    ACTIONS(945), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(931), 22,
+    ACTIONS(943), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -54845,77 +55736,125 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [23835] = 19,
-    ACTIONS(3), 1,
+  [24726] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1192), 1,
+    ACTIONS(941), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(939), 22,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [23902] = 15,
-    ACTIONS(612), 1,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [24761] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(927), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(929), 22,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [24796] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(907), 4,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_in,
-    ACTIONS(1140), 1,
+      anon_sym_SLASH,
+    ACTIONS(909), 22,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
       anon_sym_and,
-    ACTIONS(1162), 1,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [24831] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -54929,7 +55868,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 7,
+    ACTIONS(666), 7,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_select,
@@ -54937,64 +55876,53 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_DOT_DOT,
-  [23961] = 19,
-    ACTIONS(3), 1,
+  [24890] = 8,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1196), 1,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(662), 3,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+    ACTIONS(660), 17,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(802), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24028] = 3,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+  [24935] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(955), 4,
+    ACTIONS(933), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(957), 22,
+    ACTIONS(931), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -55017,7 +55945,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [24063] = 3,
+  [24970] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
@@ -55049,400 +55977,80 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [24098] = 19,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1198), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24165] = 19,
-    ACTIONS(3), 1,
+  [25005] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1200), 1,
+    ACTIONS(921), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(919), 22,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(803), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24232] = 19,
-    ACTIONS(3), 1,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [25040] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1202), 1,
+    ACTIONS(913), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(911), 22,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24299] = 19,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1204), 1,
-      sym__lower_id,
-    ACTIONS(1207), 1,
-      anon_sym_RBRACE,
-    ACTIONS(1209), 1,
-      sym_qldoc,
-    ACTIONS(1215), 1,
-      sym_dbtype,
-    ACTIONS(1218), 1,
-      sym__upper_id,
-    ACTIONS(1221), 1,
-      sym_predicate,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(1212), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24366] = 19,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1224), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(811), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24433] = 19,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1226), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(791), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24500] = 19,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1228), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24567] = 19,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1230), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24634] = 3,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [25075] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(939), 4,
+    ACTIONS(917), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(941), 22,
+    ACTIONS(915), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -55465,29 +56073,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [24669] = 3,
+  [25110] = 6,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(945), 4,
+    ACTIONS(630), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(943), 22,
+    ACTIONS(628), 19,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-      anon_sym_as,
       anon_sym_EQ,
       anon_sym_or,
-      anon_sym_RPAREN,
       anon_sym_select,
       anon_sym_instanceof,
       anon_sym_then,
       anon_sym_else,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_DOT_DOT,
       anon_sym_BANG_EQ,
@@ -55497,112 +56108,180 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [24704] = 19,
-    ACTIONS(3), 1,
+  [25151] = 10,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1232), 1,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(656), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(658), 15,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(809), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24771] = 19,
-    ACTIONS(3), 1,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [25200] = 14,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1234), 1,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(652), 8,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(759), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24838] = 3,
+      anon_sym_select,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_implies,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+  [25257] = 12,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(648), 10,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_or,
+      anon_sym_select,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+  [25310] = 12,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(672), 10,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_or,
+      anon_sym_select,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+  [25363] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(963), 4,
+    ACTIONS(923), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(965), 22,
+    ACTIONS(925), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -55625,64 +56304,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [24873] = 19,
-    ACTIONS(3), 1,
+  [25398] = 13,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1236), 1,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(638), 9,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [24940] = 3,
+      anon_sym_or,
+      anon_sym_select,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_implies,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+  [25453] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(919), 4,
+    ACTIONS(965), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(921), 22,
+    ACTIONS(963), 22,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       anon_sym_as,
@@ -55705,112 +56378,46 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [24975] = 19,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1238), 1,
-      anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(799), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [25042] = 19,
-    ACTIONS(3), 1,
+  [25488] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(1144), 1,
-      sym_qldoc,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    ACTIONS(1240), 1,
+    ACTIONS(957), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(955), 22,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(780), 2,
-      sym_classMember,
-      aux_sym_dataclass_repeat2,
-    STATE(870), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1433), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [25109] = 9,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_select,
+      anon_sym_instanceof,
+      anon_sym_then,
+      anon_sym_else,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [25523] = 8,
     ACTIONS(583), 1,
       anon_sym_LPAREN,
-    ACTIONS(628), 1,
-      anon_sym_LT,
-    ACTIONS(631), 1,
+    ACTIONS(674), 1,
       anon_sym_DOT,
-    ACTIONS(862), 1,
+    ACTIONS(854), 1,
       sym__upper_id,
-    ACTIONS(864), 1,
+    ACTIONS(856), 1,
       sym__lower_id,
     ACTIONS(3), 2,
       sym_line_comment,
@@ -55818,7 +56425,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(579), 9,
+    ACTIONS(581), 9,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_RPAREN,
@@ -55828,7 +56435,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PERCENT,
       anon_sym_COLON_COLON,
-    ACTIONS(581), 9,
+    ACTIONS(579), 10,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_as,
       anon_sym_or,
@@ -55838,16 +56446,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_implies,
       anon_sym_SLASH,
       anon_sym_order,
-  [25155] = 9,
+  [25567] = 8,
     ACTIONS(583), 1,
       anon_sym_LPAREN,
-    ACTIONS(628), 1,
-      anon_sym_LT,
-    ACTIONS(631), 1,
+    ACTIONS(674), 1,
       anon_sym_DOT,
-    ACTIONS(862), 1,
+    ACTIONS(854), 1,
       sym__upper_id,
-    ACTIONS(864), 1,
+    ACTIONS(856), 1,
       sym__lower_id,
     ACTIONS(3), 2,
       sym_line_comment,
@@ -55855,7 +56461,8 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(581), 8,
+    ACTIONS(579), 9,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_as,
       anon_sym_or,
@@ -55864,7 +56471,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_implies,
       anon_sym_SLASH,
-    ACTIONS(579), 10,
+    ACTIONS(581), 10,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_RPAREN,
@@ -55875,7 +56482,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PERCENT,
       anon_sym_COLON_COLON,
-  [25201] = 6,
+  [25611] = 6,
     ACTIONS(583), 1,
       anon_sym_LPAREN,
     ACTIONS(585), 1,
@@ -55886,12 +56493,12 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(581), 4,
+    ACTIONS(579), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(579), 16,
+    ACTIONS(581), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -55908,7 +56515,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_COLON_COLON,
-  [25240] = 6,
+  [25650] = 17,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1239), 1,
+      anon_sym_or,
+    ACTIONS(1241), 1,
+      anon_sym_instanceof,
+    ACTIONS(1243), 1,
+      anon_sym_in,
+    ACTIONS(1245), 1,
+      anon_sym_and,
+    ACTIONS(1247), 1,
+      anon_sym_implies,
+    STATE(287), 1,
+      sym_addop,
+    STATE(288), 1,
+      sym_mulop,
+    STATE(290), 1,
+      sym_compop,
+    STATE(1778), 1,
+      sym_direction,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(590), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(1249), 2,
+      anon_sym_asc,
+      anon_sym_desc,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [25711] = 6,
     ACTIONS(583), 1,
       anon_sym_LPAREN,
     ACTIONS(585), 1,
@@ -55919,13 +56570,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(581), 5,
+    ACTIONS(579), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(579), 15,
+    ACTIONS(581), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -55941,71 +56592,61 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_order,
       anon_sym_COLON_COLON,
-  [25279] = 17,
+  [25750] = 12,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1242), 1,
-      anon_sym_or,
-    ACTIONS(1244), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1246), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1248), 1,
-      anon_sym_and,
-    ACTIONS(1250), 1,
-      anon_sym_implies,
-    STATE(223), 1,
-      sym_addop,
-    STATE(233), 1,
-      sym_mulop,
-    STATE(235), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(1770), 1,
-      sym_direction,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(594), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
     ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(1252), 2,
-      anon_sym_asc,
-      anon_sym_desc,
     ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [25340] = 8,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
+    ACTIONS(685), 7,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_PIPE,
+  [25800] = 6,
+    STATE(354), 1,
       sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(662), 4,
+    ACTIONS(630), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
-    ACTIONS(664), 13,
+      anon_sym_SLASH,
+    ACTIONS(628), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -56018,38 +56659,40 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
       anon_sym_order,
-  [25382] = 18,
+  [25838] = 18,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1254), 1,
+    ACTIONS(1253), 1,
       anon_sym_COMMA,
-    ACTIONS(1256), 1,
+    ACTIONS(1255), 1,
       anon_sym_RBRACK,
-    ACTIONS(1258), 1,
+    ACTIONS(1257), 1,
       anon_sym_DOT_DOT,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
-    STATE(1627), 1,
+    STATE(1610), 1,
       aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56063,31 +56706,144 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [25444] = 16,
+  [25900] = 13,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1260), 1,
-      anon_sym_as,
-    ACTIONS(1262), 1,
+    ACTIONS(670), 1,
       anon_sym_or,
-    ACTIONS(1264), 1,
+    ACTIONS(1259), 1,
       anon_sym_instanceof,
-    ACTIONS(1266), 1,
+    ACTIONS(1261), 1,
       anon_sym_in,
-    ACTIONS(1268), 1,
+    STATE(354), 1,
+      sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(672), 6,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_RPAREN,
       anon_sym_and,
-    ACTIONS(1270), 1,
       anon_sym_implies,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
+      anon_sym_order,
+  [25952] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(581), 7,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_DOT,
+      sym_qldoc,
+      anon_sym_COLON_COLON,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(579), 16,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [25986] = 18,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1263), 1,
+      anon_sym_COMMA,
+    ACTIONS(1265), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1267), 1,
+      anon_sym_DOT_DOT,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
       sym_mulop,
-    STATE(315), 1,
+    STATE(211), 1,
+      sym_compop,
+    STATE(1634), 1,
+      aux_sym_aggregate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [26048] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1259), 1,
+      anon_sym_instanceof,
+    ACTIONS(1261), 1,
+      anon_sym_in,
+    ACTIONS(1269), 1,
+      anon_sym_as,
+    ACTIONS(1271), 1,
+      anon_sym_or,
+    ACTIONS(1273), 1,
+      anon_sym_and,
+    ACTIONS(1275), 1,
+      anon_sym_implies,
+    STATE(354), 1,
       sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56096,7 +56852,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(634), 3,
+    ACTIONS(679), 3,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_order,
@@ -56105,12 +56861,53 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [25502] = 4,
+  [26106] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(666), 4,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_RPAREN,
+      anon_sym_PIPE,
+  [26162] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(579), 7,
+    ACTIONS(581), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
       anon_sym_DOT,
@@ -56118,7 +56915,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(581), 16,
+    ACTIONS(579), 16,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -56135,25 +56932,117 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [25536] = 13,
+  [26196] = 18,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(692), 1,
-      anon_sym_or,
-    ACTIONS(1264), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1266), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    STATE(305), 1,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1283), 1,
+      anon_sym_COMMA,
+    ACTIONS(1285), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1287), 1,
+      anon_sym_DOT_DOT,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
       sym_compop,
-    STATE(310), 1,
+    STATE(1626), 1,
+      aux_sym_aggregate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [26258] = 18,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1289), 1,
+      anon_sym_COMMA,
+    ACTIONS(1291), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1293), 1,
+      anon_sym_DOT_DOT,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
       sym_mulop,
-    STATE(315), 1,
+    STATE(211), 1,
+      sym_compop,
+    STATE(1673), 1,
+      aux_sym_aggregate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [26320] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1259), 1,
+      anon_sym_instanceof,
+    ACTIONS(1261), 1,
+      anon_sym_in,
+    ACTIONS(1271), 1,
+      anon_sym_or,
+    ACTIONS(1273), 1,
+      anon_sym_and,
+    ACTIONS(1275), 1,
+      anon_sym_implies,
+    STATE(354), 1,
       sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56167,32 +57056,85 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 6,
+    ACTIONS(666), 4,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_RPAREN,
-      anon_sym_and,
-      anon_sym_implies,
       anon_sym_order,
-  [25588] = 13,
+  [26376] = 17,
+    ACTIONS(9), 1,
+      sym__lower_id,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1135), 1,
+      sym_predicate,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1499), 1,
+      sym_typeExpr,
+    STATE(1653), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1901), 1,
+      sym_varDecl,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    STATE(1199), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    STATE(1437), 3,
+      sym_charpred,
+      sym_memberPredicate,
+      sym_field,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [26436] = 18,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1244), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1246), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1248), 1,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    STATE(223), 1,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1295), 1,
+      anon_sym_COMMA,
+    ACTIONS(1297), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1299), 1,
+      anon_sym_DOT_DOT,
+    STATE(209), 1,
       sym_addop,
-    STATE(233), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(235), 1,
+    STATE(211), 1,
       sym_compop,
+    STATE(1717), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56206,30 +57148,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(654), 6,
-      anon_sym_COMMA,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25640] = 12,
+  [26498] = 12,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1244), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1246), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    STATE(223), 1,
-      sym_addop,
-    STATE(233), 1,
-      sym_mulop,
-    STATE(235), 1,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56243,113 +57178,107 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(650), 7,
+    ACTIONS(672), 7,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25690] = 14,
+      anon_sym_PIPE,
+  [26548] = 8,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1242), 1,
-      anon_sym_or,
-    ACTIONS(1244), 1,
-      anon_sym_instanceof,
-    ACTIONS(1246), 1,
-      anon_sym_in,
-    ACTIONS(1248), 1,
-      anon_sym_and,
-    STATE(223), 1,
+    STATE(354), 1,
       sym_addop,
-    STATE(233), 1,
+    STATE(357), 1,
       sym_mulop,
-    STATE(235), 1,
+    STATE(358), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(662), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+    ACTIONS(660), 13,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(698), 5,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25744] = 10,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_order,
+  [26590] = 8,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1246), 1,
-      anon_sym_in,
-    STATE(223), 1,
-      sym_addop,
-    STATE(233), 1,
-      sym_mulop,
-    STATE(235), 1,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(696), 2,
+    ACTIONS(662), 3,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(694), 12,
+      anon_sym_in,
+    ACTIONS(660), 14,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
       anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_PIPE,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25790] = 6,
-    STATE(223), 1,
-      sym_addop,
-    STATE(233), 1,
-      sym_mulop,
-    STATE(235), 1,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+  [26632] = 6,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(666), 4,
+    ACTIONS(630), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(668), 16,
+    ACTIONS(628), 16,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
       anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_PIPE,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -56357,65 +57286,69 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25828] = 8,
+  [26670] = 18,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(223), 1,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1301), 1,
+      anon_sym_COMMA,
+    ACTIONS(1303), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1305), 1,
+      anon_sym_DOT_DOT,
+    STATE(209), 1,
       sym_addop,
-    STATE(233), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(235), 1,
+    STATE(211), 1,
       sym_compop,
+    STATE(1692), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(662), 3,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-    ACTIONS(664), 14,
-      anon_sym_COMMA,
+    ACTIONS(596), 4,
       anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25870] = 15,
+  [26732] = 13,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1242), 1,
+    ACTIONS(683), 1,
       anon_sym_or,
-    ACTIONS(1244), 1,
+    ACTIONS(1259), 1,
       anon_sym_instanceof,
-    ACTIONS(1246), 1,
+    ACTIONS(1261), 1,
       anon_sym_in,
-    ACTIONS(1248), 1,
-      anon_sym_and,
-    ACTIONS(1250), 1,
-      anon_sym_implies,
-    STATE(223), 1,
+    STATE(354), 1,
       sym_addop,
-    STATE(233), 1,
+    STATE(357), 1,
       sym_mulop,
-    STATE(235), 1,
+    STATE(358), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56429,28 +57362,44 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 4,
+    ACTIONS(685), 6,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_RPAREN,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25926] = 12,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_order,
+  [26784] = 18,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1244), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1246), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    STATE(223), 1,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1307), 1,
+      anon_sym_COMMA,
+    ACTIONS(1309), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1311), 1,
+      anon_sym_DOT_DOT,
+    STATE(209), 1,
       sym_addop,
-    STATE(233), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(235), 1,
+    STATE(211), 1,
       sym_compop,
+    STATE(1737), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56464,75 +57413,95 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 7,
-      anon_sym_COMMA,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_asc,
-      anon_sym_desc,
-  [25976] = 12,
+  [26846] = 10,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1261), 1,
       anon_sym_in,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    STATE(354), 1,
       sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
     ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(656), 3,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+    ACTIONS(658), 11,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(690), 7,
+      anon_sym_order,
+  [26892] = 6,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(634), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(632), 16,
       anon_sym_COMMA,
       anon_sym_as,
+      anon_sym_EQ,
       anon_sym_or,
       anon_sym_RPAREN,
+      anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
       anon_sym_PIPE,
-  [26026] = 15,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+  [26930] = 14,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1259), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1261), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1271), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1273), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    STATE(354), 1,
       sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56546,32 +57515,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 4,
+    ACTIONS(652), 5,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_RPAREN,
-      anon_sym_PIPE,
-  [26082] = 14,
+      anon_sym_implies,
+      anon_sym_order,
+  [26984] = 13,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(656), 1,
+    ACTIONS(646), 1,
       anon_sym_or,
-    ACTIONS(1264), 1,
+    ACTIONS(1259), 1,
       anon_sym_instanceof,
-    ACTIONS(1266), 1,
+    ACTIONS(1261), 1,
       anon_sym_in,
-    ACTIONS(1268), 1,
-      anon_sym_and,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
+    STATE(354), 1,
       sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56585,18 +57553,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(654), 5,
+    ACTIONS(648), 6,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_RPAREN,
+      anon_sym_and,
       anon_sym_implies,
       anon_sym_order,
-  [26136] = 7,
+  [27036] = 6,
     ACTIONS(583), 1,
       anon_sym_LPAREN,
-    ACTIONS(628), 1,
-      anon_sym_LT,
-    ACTIONS(631), 1,
+    ACTIONS(674), 1,
       anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
@@ -56604,11 +57571,12 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(587), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    ACTIONS(581), 3,
+    ACTIONS(579), 4,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(579), 15,
+    ACTIONS(581), 15,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -56624,23 +57592,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_asc,
       anon_sym_desc,
       anon_sym_COLON_COLON,
-  [26176] = 12,
+  [27074] = 12,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1241), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1243), 1,
       anon_sym_in,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    STATE(287), 1,
       sym_addop,
+    STATE(288), 1,
+      sym_mulop,
+    STATE(290), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56654,33 +57622,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(676), 7,
+    ACTIONS(672), 7,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_PIPE,
-  [26226] = 13,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27124] = 14,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(674), 1,
+    ACTIONS(636), 1,
       anon_sym_or,
-    ACTIONS(1264), 1,
+    ACTIONS(1259), 1,
       anon_sym_instanceof,
-    ACTIONS(1266), 1,
+    ACTIONS(1261), 1,
       anon_sym_in,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
+    ACTIONS(1273), 1,
+      anon_sym_and,
+    STATE(354), 1,
       sym_addop,
+    STATE(357), 1,
+      sym_mulop,
+    STATE(358), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56694,161 +57664,67 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(676), 6,
+    ACTIONS(638), 5,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_RPAREN,
-      anon_sym_and,
       anon_sym_implies,
       anon_sym_order,
-  [26278] = 18,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1280), 1,
-      anon_sym_COMMA,
-    ACTIONS(1282), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1284), 1,
-      anon_sym_DOT_DOT,
-    STATE(270), 1,
+  [27178] = 6,
+    STATE(354), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(357), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(358), 1,
       sym_compop,
-    STATE(1646), 1,
-      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(634), 5,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [26340] = 18,
-    ACTIONS(612), 1,
+      anon_sym_or,
+      anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(632), 15,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
       anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
       anon_sym_implies,
-    ACTIONS(1286), 1,
-      anon_sym_COMMA,
-    ACTIONS(1288), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1290), 1,
-      anon_sym_DOT_DOT,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    STATE(1667), 1,
-      aux_sym_aggregate_repeat1,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [26402] = 13,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(652), 1,
-      anon_sym_or,
-    ACTIONS(1264), 1,
-      anon_sym_instanceof,
-    ACTIONS(1266), 1,
-      anon_sym_in,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-    ACTIONS(650), 6,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_RPAREN,
-      anon_sym_and,
-      anon_sym_implies,
       anon_sym_order,
-  [26454] = 14,
+  [27216] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1262), 1,
+    ACTIONS(1239), 1,
       anon_sym_or,
-    ACTIONS(1264), 1,
+    ACTIONS(1241), 1,
       anon_sym_instanceof,
-    ACTIONS(1266), 1,
+    ACTIONS(1243), 1,
       anon_sym_in,
-    ACTIONS(1268), 1,
+    ACTIONS(1245), 1,
       anon_sym_and,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
+    ACTIONS(1247), 1,
+      anon_sym_implies,
+    STATE(287), 1,
       sym_addop,
+    STATE(288), 1,
+      sym_mulop,
+    STATE(290), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -56862,81 +57738,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(698), 5,
+    ACTIONS(666), 4,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_RPAREN,
-      anon_sym_implies,
-      anon_sym_order,
-  [26508] = 18,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27272] = 8,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1292), 1,
-      anon_sym_COMMA,
-    ACTIONS(1294), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1296), 1,
-      anon_sym_DOT_DOT,
-    STATE(270), 1,
+    STATE(287), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(288), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(290), 1,
       sym_compop,
-    STATE(1642), 1,
-      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+    ACTIONS(662), 3,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+    ACTIONS(660), 14,
+      anon_sym_COMMA,
       anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [26570] = 6,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27314] = 6,
+    STATE(287), 1,
       sym_addop,
+    STATE(288), 1,
+      sym_mulop,
+    STATE(290), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(666), 4,
+    ACTIONS(630), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(668), 16,
+    ACTIONS(628), 16,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
       anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_PIPE,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -56944,26 +57807,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-  [26608] = 8,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27352] = 10,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    STATE(255), 1,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(662), 3,
+    ACTIONS(656), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_in,
-    ACTIONS(664), 14,
+    ACTIONS(658), 12,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -56976,72 +57845,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-  [26650] = 18,
+  [27398] = 10,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1243), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1298), 1,
-      anon_sym_COMMA,
-    ACTIONS(1300), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1302), 1,
-      anon_sym_DOT_DOT,
-    STATE(270), 1,
+    STATE(287), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(288), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(290), 1,
       sym_compop,
-    STATE(1691), 1,
-      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
     ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [26712] = 6,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(670), 5,
+    ACTIONS(656), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(672), 15,
+    ACTIONS(658), 12,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -57049,164 +57879,65 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [26750] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(579), 7,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_DOT,
-      sym_qldoc,
-      anon_sym_COLON_COLON,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(581), 16,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [26784] = 6,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(670), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27444] = 14,
+    ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(672), 16,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
+    ACTIONS(1239), 1,
       anon_sym_or,
-      anon_sym_RPAREN,
+    ACTIONS(1241), 1,
       anon_sym_instanceof,
+    ACTIONS(1243), 1,
+      anon_sym_in,
+    ACTIONS(1245), 1,
       anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-  [26822] = 6,
-    STATE(223), 1,
+    STATE(287), 1,
       sym_addop,
-    STATE(233), 1,
+    STATE(288), 1,
       sym_mulop,
-    STATE(235), 1,
+    STATE(290), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(670), 4,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(672), 16,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [26860] = 10,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1266), 1,
-      anon_sym_in,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
     ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(696), 3,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-    ACTIONS(694), 11,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_order,
-  [26906] = 15,
+    ACTIONS(652), 5,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_implies,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27498] = 12,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1262), 1,
-      anon_sym_or,
-    ACTIONS(1264), 1,
+    ACTIONS(1241), 1,
       anon_sym_instanceof,
-    ACTIONS(1266), 1,
+    ACTIONS(1243), 1,
       anon_sym_in,
-    ACTIONS(1268), 1,
-      anon_sym_and,
-    ACTIONS(1270), 1,
-      anon_sym_implies,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
+    STATE(287), 1,
       sym_addop,
+    STATE(288), 1,
+      sym_mulop,
+    STATE(290), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57220,28 +57951,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(658), 4,
+    ACTIONS(648), 7,
       anon_sym_COMMA,
-      anon_sym_as,
+      anon_sym_or,
       anon_sym_RPAREN,
-      anon_sym_order,
-  [26962] = 12,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27548] = 13,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1244), 1,
+    ACTIONS(1241), 1,
       anon_sym_instanceof,
-    ACTIONS(1246), 1,
+    ACTIONS(1243), 1,
       anon_sym_in,
-    STATE(223), 1,
+    ACTIONS(1245), 1,
+      anon_sym_and,
+    STATE(287), 1,
       sym_addop,
-    STATE(233), 1,
+    STATE(288), 1,
       sym_mulop,
-    STATE(235), 1,
+    STATE(290), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57255,45 +57991,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(676), 7,
+    ACTIONS(638), 6,
       anon_sym_COMMA,
       anon_sym_or,
       anon_sym_RPAREN,
-      anon_sym_and,
       anon_sym_implies,
       anon_sym_asc,
       anon_sym_desc,
-  [27012] = 18,
+  [27600] = 13,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1304), 1,
-      anon_sym_COMMA,
-    ACTIONS(1306), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1308), 1,
-      anon_sym_DOT_DOT,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(1692), 1,
-      aux_sym_aggregate_repeat1,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57307,26 +58030,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [27074] = 6,
-    STATE(305), 1,
-      sym_compop,
-    STATE(310), 1,
-      sym_mulop,
-    STATE(315), 1,
+    ACTIONS(638), 6,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_implies,
+      anon_sym_PIPE,
+  [27652] = 6,
+    STATE(287), 1,
       sym_addop,
+    STATE(288), 1,
+      sym_mulop,
+    STATE(290), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(666), 5,
+    ACTIONS(634), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(668), 15,
+    ACTIONS(632), 16,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -57338,26 +58067,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [27112] = 13,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27690] = 12,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1241), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1243), 1,
       anon_sym_in,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    STATE(287), 1,
       sym_addop,
+    STATE(288), 1,
+      sym_mulop,
+    STATE(290), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57371,80 +58099,73 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(654), 6,
+    ACTIONS(685), 7,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_or,
       anon_sym_RPAREN,
+      anon_sym_and,
       anon_sym_implies,
-      anon_sym_PIPE,
-  [27164] = 10,
+      anon_sym_asc,
+      anon_sym_desc,
+  [27740] = 12,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1272), 1,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
     ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(696), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(694), 12,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+    ACTIONS(648), 7,
       anon_sym_COMMA,
       anon_sym_as,
-      anon_sym_EQ,
       anon_sym_or,
       anon_sym_RPAREN,
-      anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
       anon_sym_PIPE,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [27210] = 18,
+  [27790] = 14,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1310), 1,
-      anon_sym_COMMA,
-    ACTIONS(1312), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1314), 1,
-      anon_sym_DOT_DOT,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    STATE(321), 1,
       sym_compop,
-    STATE(1633), 1,
-      aux_sym_aggregate_repeat1,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57458,23 +58179,72 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [27272] = 12,
+    ACTIONS(652), 5,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_RPAREN,
+      anon_sym_implies,
+      anon_sym_PIPE,
+  [27844] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1317), 1,
+      anon_sym_DOT,
+    STATE(862), 1,
+      aux_sym_qualModuleExpr_repeat1,
+    ACTIONS(1313), 5,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      anon_sym_COLON_COLON,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1315), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [27881] = 17,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1319), 1,
+      anon_sym_COMMA,
+    ACTIONS(1321), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    STATE(1627), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57488,35 +58258,66 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(650), 7,
-      anon_sym_COMMA,
+  [27940] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1317), 1,
+      anon_sym_DOT,
+    STATE(873), 1,
+      aux_sym_qualModuleExpr_repeat1,
+    ACTIONS(1323), 5,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      anon_sym_COLON_COLON,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1325), 15,
+      anon_sym_module,
+      anon_sym_import,
       anon_sym_as,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_PIPE,
-  [27322] = 14,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [27977] = 17,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1319), 1,
+      anon_sym_COMMA,
+    ACTIONS(1327), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    STATE(1654), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57530,41 +58331,65 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-    ACTIONS(698), 5,
+  [28036] = 5,
+    ACTIONS(703), 1,
+      anon_sym_LT,
+    ACTIONS(706), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(701), 3,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(699), 17,
       anon_sym_COMMA,
-      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
       anon_sym_implies,
-      anon_sym_PIPE,
-  [27376] = 17,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [28071] = 17,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1316), 1,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(1318), 1,
+    ACTIONS(1329), 1,
       anon_sym_RBRACK,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
-    STATE(1616), 1,
+    STATE(1642), 1,
       aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57578,35 +58403,65 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [27435] = 17,
+  [28130] = 5,
+    ACTIONS(703), 1,
+      anon_sym_LT,
+    ACTIONS(706), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(701), 4,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(699), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [28165] = 17,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1316), 1,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(1320), 1,
+    ACTIONS(1331), 1,
       anon_sym_RBRACK,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
-    STATE(1619), 1,
+    STATE(1638), 1,
       aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57620,35 +58475,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [27494] = 17,
+  [28224] = 17,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1316), 1,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(1322), 1,
+    ACTIONS(1333), 1,
       anon_sym_RBRACK,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
-    STATE(1623), 1,
+    STATE(1714), 1,
       aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57662,35 +58517,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [27553] = 17,
+  [28283] = 17,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1316), 1,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(1324), 1,
+    ACTIONS(1335), 1,
       anon_sym_RBRACK,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
-    STATE(1615), 1,
+    STATE(1633), 1,
       aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57704,22 +58559,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [27612] = 6,
+  [28342] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1330), 1,
+    ACTIONS(1337), 1,
       anon_sym_DOT,
-    STATE(866), 1,
+    STATE(875), 1,
       aux_sym_qualModuleExpr_repeat1,
-    ACTIONS(1328), 5,
+    ACTIONS(1313), 5,
       anon_sym_RBRACE,
       sym_qldoc,
       anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1326), 15,
+    ACTIONS(1315), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -57735,22 +58590,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [27649] = 6,
+  [28379] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1336), 1,
+    ACTIONS(1343), 1,
       anon_sym_DOT,
-    STATE(865), 1,
+    STATE(871), 1,
       aux_sym_qualModuleExpr_repeat1,
-    ACTIONS(1332), 5,
-      ts_builtin_sym_end,
+    ACTIONS(1341), 5,
+      anon_sym_RBRACE,
       sym_qldoc,
       anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1334), 15,
+    ACTIONS(1339), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -57766,53 +58621,63 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [27686] = 6,
-    ACTIONS(3), 1,
+  [28416] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1269), 1,
+      anon_sym_as,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1342), 1,
-      anon_sym_DOT,
-    STATE(865), 1,
-      aux_sym_qualModuleExpr_repeat1,
-    ACTIONS(1338), 5,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      anon_sym_COLON_COLON,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1340), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [27723] = 6,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(679), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [28473] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1330), 1,
+    ACTIONS(1346), 1,
       anon_sym_DOT,
     STATE(873), 1,
       aux_sym_qualModuleExpr_repeat1,
-    ACTIONS(1332), 5,
-      anon_sym_RBRACE,
+    ACTIONS(1341), 5,
+      ts_builtin_sym_end,
       sym_qldoc,
       anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1334), 15,
+    ACTIONS(1339), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -57828,35 +58693,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [27760] = 17,
+  [28510] = 17,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1316), 1,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(1345), 1,
+    ACTIONS(1349), 1,
       anon_sym_RBRACK,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
-    STATE(1701), 1,
+    STATE(1631), 1,
       aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -57870,18 +58735,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [27819] = 4,
-    ACTIONS(706), 1,
+  [28569] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1337), 1,
+      anon_sym_DOT,
+    STATE(871), 1,
+      aux_sym_qualModuleExpr_repeat1,
+    ACTIONS(1323), 5,
+      anon_sym_RBRACE,
+      sym_qldoc,
       anon_sym_COLON_COLON,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1325), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [28606] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(704), 4,
+    ACTIONS(822), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(702), 17,
+    ACTIONS(824), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -57899,143 +58793,128 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [27852] = 17,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1316), 1,
-      anon_sym_COMMA,
-    ACTIONS(1347), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    STATE(1614), 1,
-      aux_sym_aggregate_repeat1,
-    ACTIONS(3), 2,
+  [28636] = 6,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [27911] = 15,
-    ACTIONS(9), 1,
-      sym__lower_id,
-    ACTIONS(29), 1,
+    ACTIONS(1355), 1,
+      anon_sym_LBRACE,
+    STATE(1214), 1,
+      sym_body,
+    ACTIONS(1351), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
       sym_dbtype,
-    ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(1146), 1,
-      sym_predicate,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1517), 1,
-      sym_typeExpr,
-    STATE(1596), 1,
-      sym_className,
-    STATE(1868), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1201), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    STATE(1435), 3,
-      sym_charpred,
-      sym_memberPredicate,
-      sym_field,
-    ACTIONS(27), 5,
+    ACTIONS(1353), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [27966] = 17,
-    ACTIONS(612), 1,
+      sym__lower_id,
+      sym_predicate,
+  [28672] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(806), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(808), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
       anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
       anon_sym_implies,
-    ACTIONS(1316), 1,
-      anon_sym_COMMA,
-    ACTIONS(1349), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    STATE(1613), 1,
-      aux_sym_aggregate_repeat1,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [28702] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(714), 5,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(712), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+      anon_sym_order,
+  [28732] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(818), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(820), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [28025] = 4,
-    ACTIONS(706), 1,
-      anon_sym_COLON_COLON,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [28762] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(704), 5,
+    ACTIONS(822), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(702), 16,
+    ACTIONS(824), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58052,102 +58931,83 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28058] = 6,
-    ACTIONS(3), 1,
+  [28792] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1351), 1,
-      anon_sym_DOT,
-    STATE(873), 1,
-      aux_sym_qualModuleExpr_repeat1,
-    ACTIONS(1338), 5,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      anon_sym_COLON_COLON,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1340), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [28095] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1260), 1,
-      anon_sym_as,
-    ACTIONS(1272), 1,
+    ACTIONS(871), 4,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_in,
-    ACTIONS(1274), 1,
+      anon_sym_SLASH,
+    ACTIONS(873), 17,
+      anon_sym_COMMA,
+      anon_sym_EQ,
       anon_sym_or,
-    ACTIONS(1276), 1,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
       anon_sym_and,
-    ACTIONS(1278), 1,
       anon_sym_implies,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [28822] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(861), 4,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(634), 2,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(863), 17,
       anon_sym_COMMA,
-      anon_sym_RPAREN,
-    ACTIONS(596), 4,
       anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [28152] = 6,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [28852] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1336), 1,
-      anon_sym_DOT,
-    STATE(864), 1,
-      aux_sym_qualModuleExpr_repeat1,
-    ACTIONS(1328), 5,
-      ts_builtin_sym_end,
+    ACTIONS(1359), 1,
+      anon_sym_COMMA,
+    STATE(884), 1,
+      aux_sym_asExprs_repeat1,
+    ACTIONS(1362), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
-      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1326), 15,
+    ACTIONS(1357), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -58155,17 +59015,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [28189] = 3,
+  [28888] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(726), 5,
+    ACTIONS(826), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(724), 16,
+    ACTIONS(828), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58182,56 +59042,43 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28219] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1354), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1356), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+  [28918] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(730), 4,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(728), 17,
+      anon_sym_COMMA,
       anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [28275] = 3,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [28948] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(770), 4,
+    ACTIONS(832), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(768), 17,
+    ACTIONS(830), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58249,17 +59096,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [28305] = 3,
+  [28978] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(766), 5,
+    ACTIONS(842), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(764), 16,
+    ACTIONS(844), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58276,17 +59123,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28335] = 3,
+  [29008] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(762), 5,
+    ACTIONS(836), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(760), 16,
+    ACTIONS(834), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58303,17 +59150,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28365] = 3,
+  [29038] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(758), 5,
+    ACTIONS(832), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(756), 16,
+    ACTIONS(830), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58330,46 +59177,43 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28395] = 6,
-    ACTIONS(3), 1,
+  [29068] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    STATE(1187), 1,
-      sym_body,
-    ACTIONS(1362), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1358), 15,
-      anon_sym_module,
-      anon_sym_import,
+    ACTIONS(836), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(834), 17,
+      anon_sym_COMMA,
+      anon_sym_EQ,
       anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [28431] = 3,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [29098] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(774), 4,
+    ACTIONS(842), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(772), 17,
+    ACTIONS(844), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58387,47 +59231,44 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [28461] = 6,
-    ACTIONS(3), 1,
+  [29128] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1368), 1,
-      anon_sym_COLON_COLON,
-    STATE(1009), 1,
-      aux_sym_importModuleExpr_repeat1,
-    ACTIONS(1366), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1364), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [28497] = 3,
+    ACTIONS(826), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(828), 17,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [29158] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(754), 5,
+    ACTIONS(730), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(752), 16,
+    ACTIONS(728), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58444,17 +59285,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28527] = 3,
+  [29188] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(750), 5,
+    ACTIONS(861), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(748), 16,
+    ACTIONS(863), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58471,16 +59312,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28557] = 3,
+  [29218] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(778), 4,
+    ACTIONS(818), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(776), 17,
+    ACTIONS(820), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58498,16 +59339,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [28587] = 3,
+  [29248] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(782), 4,
+    ACTIONS(714), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(780), 17,
+    ACTIONS(712), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58525,17 +59366,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [28617] = 3,
+  [29278] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(746), 5,
+    ACTIONS(871), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(744), 16,
+    ACTIONS(873), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58552,17 +59393,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28647] = 3,
+  [29308] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(742), 5,
+    ACTIONS(875), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(740), 16,
+    ACTIONS(877), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58579,17 +59420,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28677] = 3,
+  [29338] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(738), 5,
+    ACTIONS(879), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(736), 16,
+    ACTIONS(881), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58606,17 +59447,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28707] = 3,
+  [29368] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(734), 5,
+    ACTIONS(883), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(732), 16,
+    ACTIONS(885), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58633,17 +59474,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28737] = 3,
+  [29398] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(730), 5,
+    ACTIONS(887), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(728), 16,
+    ACTIONS(889), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58660,16 +59501,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28767] = 3,
+  [29428] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(786), 4,
+    ACTIONS(806), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(784), 17,
+    ACTIONS(808), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58687,16 +59528,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [28797] = 3,
+  [29458] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(790), 4,
+    ACTIONS(802), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(788), 17,
+    ACTIONS(804), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58714,48 +59555,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [28827] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    STATE(1197), 1,
-      sym_body,
-    ACTIONS(1372), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1370), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [28863] = 4,
-    ACTIONS(1374), 1,
-      anon_sym_DOT,
+  [29488] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(810), 4,
+    ACTIONS(879), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(808), 16,
+    ACTIONS(881), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58763,6 +59572,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -58772,57 +59582,71 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [28895] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1376), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1378), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+  [29518] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(883), 4,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(885), 17,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+      anon_sym_asc,
+      anon_sym_desc,
+  [29548] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(891), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(893), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [28951] = 3,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [29578] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(722), 5,
+    ACTIONS(895), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(720), 16,
+    ACTIONS(897), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58839,17 +59663,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [28981] = 3,
+  [29608] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(718), 5,
+    ACTIONS(899), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(716), 16,
+    ACTIONS(901), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58866,17 +59690,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29011] = 3,
+  [29638] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(828), 5,
+    ACTIONS(738), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(826), 16,
+    ACTIONS(736), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58893,17 +59717,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29041] = 3,
+  [29668] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(798), 5,
+    ACTIONS(742), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(796), 16,
+    ACTIONS(740), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -58920,44 +59744,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29071] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1382), 6,
-      anon_sym_RBRACE,
-      anon_sym_DOT,
-      sym_qldoc,
-      anon_sym_COLON_COLON,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1380), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [29103] = 3,
+  [29698] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(708), 4,
+    ACTIONS(887), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(710), 17,
+    ACTIONS(889), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -58975,16 +59771,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [29133] = 3,
+  [29728] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(824), 4,
+    ACTIONS(891), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(822), 17,
+    ACTIONS(893), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59002,16 +59798,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [29163] = 3,
+  [29758] = 4,
+    ACTIONS(1364), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(832), 4,
+    ACTIONS(798), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(830), 17,
+    ACTIONS(800), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59019,7 +59817,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -59029,17 +59826,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [29193] = 3,
+  [29790] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1370), 1,
+      anon_sym_COMMA,
+    STATE(1009), 1,
+      aux_sym_asExprs_repeat1,
+    ACTIONS(1366), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1368), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [29826] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(802), 5,
+    ACTIONS(756), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(800), 16,
+    ACTIONS(754), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59056,17 +59883,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29223] = 3,
+  [29856] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(806), 5,
+    ACTIONS(760), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(804), 16,
+    ACTIONS(758), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59083,17 +59910,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29253] = 3,
+  [29886] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(794), 5,
+    ACTIONS(764), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(792), 16,
+    ACTIONS(762), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59110,17 +59937,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29283] = 3,
+  [29916] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(820), 5,
+    ACTIONS(772), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(818), 16,
+    ACTIONS(770), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59137,17 +59964,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29313] = 3,
+  [29946] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(836), 5,
+    ACTIONS(776), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(834), 16,
+    ACTIONS(774), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59164,17 +59991,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29343] = 3,
+  [29976] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(712), 5,
+    ACTIONS(788), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(714), 16,
+    ACTIONS(786), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59191,16 +60018,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29373] = 3,
+  [30006] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(762), 4,
+    ACTIONS(782), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(760), 17,
+    ACTIONS(784), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59218,17 +60045,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [29403] = 3,
+  [30036] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(840), 5,
+    ACTIONS(792), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(838), 16,
+    ACTIONS(790), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59245,17 +60072,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29433] = 3,
+  [30066] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(844), 5,
+    ACTIONS(796), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(842), 16,
+    ACTIONS(794), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59272,17 +60099,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29463] = 3,
+  [30096] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(848), 5,
+    ACTIONS(812), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(846), 16,
+    ACTIONS(810), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59299,17 +60126,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29493] = 3,
+  [30126] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(852), 5,
+    ACTIONS(816), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(850), 16,
+    ACTIONS(814), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59326,16 +60153,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29523] = 3,
+  [30156] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(758), 4,
+    ACTIONS(766), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(756), 17,
+    ACTIONS(768), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59353,17 +60180,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [29553] = 3,
+  [30186] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(860), 5,
+    ACTIONS(708), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(858), 16,
+    ACTIONS(710), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59380,47 +60207,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29583] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(754), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(752), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [29613] = 5,
-    ACTIONS(579), 1,
+  [30216] = 5,
+    ACTIONS(581), 1,
       anon_sym_COLON_COLON,
-    ACTIONS(866), 1,
+    ACTIONS(858), 1,
       anon_sym_LT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(864), 4,
+    ACTIONS(856), 4,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(862), 15,
+    ACTIONS(854), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -59436,7 +60236,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [29647] = 3,
+  [30250] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
@@ -59445,7 +60245,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(748), 17,
+    ACTIONS(752), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59463,60 +60263,63 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [29677] = 3,
-    ACTIONS(3), 2,
+  [30280] = 6,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(746), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(744), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
+    ACTIONS(1355), 1,
+      anon_sym_LBRACE,
+    STATE(1208), 1,
+      sym_body,
+    ACTIONS(1372), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1374), 15,
+      anon_sym_module,
+      anon_sym_import,
       anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [29707] = 16,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [30316] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1384), 1,
+    ACTIONS(1376), 1,
       anon_sym_RPAREN,
-    ACTIONS(1386), 1,
+    ACTIONS(1378), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -59530,33 +60333,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [29763] = 16,
+  [30372] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1388), 1,
+    ACTIONS(1380), 1,
       anon_sym_RPAREN,
-    ACTIONS(1390), 1,
+    ACTIONS(1382), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -59570,90 +60373,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [29819] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1392), 1,
-      anon_sym_COLON_COLON,
-    STATE(1032), 1,
-      aux_sym_importModuleExpr_repeat1,
-    ACTIONS(1366), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1364), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [29855] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(856), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(854), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [29885] = 16,
+  [30428] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1394), 1,
+    ACTIONS(1384), 1,
       anon_sym_RPAREN,
-    ACTIONS(1396), 1,
+    ACTIONS(1386), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -59667,16 +60413,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [29941] = 3,
+  [30484] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(742), 4,
+    ACTIONS(895), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(740), 17,
+    ACTIONS(897), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59694,88 +60440,73 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [29971] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(738), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
+  [30514] = 16,
+    ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(736), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
       anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [30001] = 4,
-    ACTIONS(1374), 1,
-      anon_sym_DOT,
+    ACTIONS(1388), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1390), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(879), 4,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(877), 16,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [30033] = 16,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [30570] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1398), 1,
+    ACTIONS(1392), 1,
       anon_sym_RPAREN,
-    ACTIONS(1400), 1,
+    ACTIONS(1394), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -59789,16 +60520,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [30089] = 3,
+  [30626] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(883), 4,
+    ACTIONS(899), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(881), 17,
+    ACTIONS(901), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59816,16 +60547,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30119] = 3,
+  [30656] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(887), 4,
+    ACTIONS(738), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(885), 17,
+    ACTIONS(736), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59843,24 +60574,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30149] = 3,
+  [30686] = 4,
+    ACTIONS(1396), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(873), 4,
+    ACTIONS(798), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(875), 17,
+    ACTIONS(800), 15,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -59868,18 +60601,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [30179] = 3,
+      anon_sym_order,
+  [30718] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(869), 4,
+    ACTIONS(742), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(871), 17,
+    ACTIONS(740), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59897,56 +60629,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30209] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1402), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1404), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+  [30748] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [30265] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(734), 4,
+    ACTIONS(756), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(732), 17,
+    ACTIONS(754), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59964,16 +60656,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30295] = 3,
+  [30778] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(730), 4,
+    ACTIONS(732), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(728), 17,
+    ACTIONS(734), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -59991,96 +60683,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30325] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(856), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(854), 16,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [30355] = 16,
+  [30808] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1406), 1,
+    ACTIONS(1398), 1,
       anon_sym_RPAREN,
-    ACTIONS(1408), 1,
+    ACTIONS(1400), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [30411] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -60089,51 +60718,21 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(1410), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
     ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [30465] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(726), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(724), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [30495] = 3,
+  [30864] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(722), 4,
+    ACTIONS(760), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(720), 17,
+    ACTIONS(758), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -60151,57 +60750,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30525] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1412), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1414), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [30581] = 3,
+  [30894] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(770), 5,
+    ACTIONS(782), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(768), 16,
+    ACTIONS(784), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -60218,46 +60777,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [30611] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1418), 1,
-      anon_sym_COMMA,
-    STATE(947), 1,
-      aux_sym_asExprs_repeat1,
-    ACTIONS(1421), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1416), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [30647] = 3,
+  [30924] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(718), 4,
+    ACTIONS(764), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(716), 17,
+    ACTIONS(762), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -60275,46 +60804,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30677] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1427), 1,
-      anon_sym_LBRACE,
-    STATE(1188), 1,
-      sym_body,
-    ACTIONS(1423), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1425), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [30713] = 3,
+  [30954] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(828), 4,
+    ACTIONS(772), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(826), 17,
+    ACTIONS(770), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -60332,109 +60831,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [30743] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1429), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1431), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+  [30984] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(766), 5,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [30799] = 16,
-    ACTIONS(612), 1,
+      anon_sym_or,
+      anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(768), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
       anon_sym_implies,
-    ACTIONS(1433), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1435), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [30855] = 6,
+      anon_sym_order,
+  [31014] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    STATE(1195), 1,
-      sym_body,
-    ACTIONS(1423), 4,
+    ACTIONS(1404), 1,
+      anon_sym_COMMA,
+    STATE(884), 1,
+      aux_sym_asExprs_repeat1,
+    ACTIONS(1406), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1425), 15,
+    ACTIONS(1402), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -60442,17 +60888,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [30891] = 3,
+  [31050] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(774), 5,
+    ACTIONS(750), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(772), 16,
+    ACTIONS(752), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -60469,20 +60915,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [30921] = 3,
+  [31080] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(778), 5,
+    ACTIONS(776), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(776), 16,
+    ACTIONS(774), 17,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -60495,34 +60940,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [30951] = 16,
+      anon_sym_asc,
+      anon_sym_desc,
+  [31110] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1437), 1,
+    ACTIONS(1408), 1,
       anon_sym_RPAREN,
-    ACTIONS(1439), 1,
+    ACTIONS(1410), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -60536,70 +60982,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [31007] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(798), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(796), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [31037] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(802), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(800), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
+  [31166] = 4,
+    ACTIONS(1364), 1,
       anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [31067] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(806), 4,
+    ACTIONS(744), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(804), 17,
+    ACTIONS(746), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -60607,7 +61001,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
-      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -60617,73 +61010,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [31097] = 16,
+  [31198] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1441), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1443), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [31153] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1445), 1,
+    ACTIONS(1412), 1,
       anon_sym_RPAREN,
-    ACTIONS(1447), 1,
+    ACTIONS(1414), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -60697,16 +61050,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [31209] = 3,
+  [31254] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(794), 4,
+    ACTIONS(865), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(792), 17,
+    ACTIONS(867), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -60724,33 +61077,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [31239] = 16,
+  [31284] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1449), 1,
+    ACTIONS(1416), 1,
       anon_sym_RPAREN,
-    ACTIONS(1451), 1,
+    ACTIONS(1418), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -60764,17 +61117,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [31295] = 3,
+  [31340] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(782), 5,
+    ACTIONS(732), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(780), 16,
+    ACTIONS(734), 16,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -60791,20 +61144,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [31325] = 3,
+  [31370] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(786), 5,
+    ACTIONS(716), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(784), 16,
+    ACTIONS(718), 17,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -60817,21 +61169,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [31355] = 3,
+      anon_sym_asc,
+      anon_sym_desc,
+  [31400] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(790), 5,
+    ACTIONS(720), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(788), 16,
+    ACTIONS(722), 17,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -60844,30 +61196,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [31385] = 6,
+      anon_sym_asc,
+      anon_sym_desc,
+  [31430] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    STATE(1182), 1,
-      sym_body,
-    ACTIONS(1455), 4,
+    ACTIONS(1404), 1,
+      anon_sym_COMMA,
+    STATE(950), 1,
+      aux_sym_asExprs_repeat1,
+    ACTIONS(1366), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1453), 15,
+    ACTIONS(1368), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -60875,26 +61228,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [31421] = 4,
-    ACTIONS(1457), 1,
-      anon_sym_DOT,
+  [31466] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(810), 5,
+    ACTIONS(724), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(808), 15,
+    ACTIONS(726), 17,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -60902,17 +61253,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [31453] = 3,
+      anon_sym_asc,
+      anon_sym_desc,
+  [31496] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(820), 4,
+    ACTIONS(788), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(818), 17,
+    ACTIONS(786), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -60930,16 +61282,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [31483] = 3,
+  [31526] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(836), 4,
+    ACTIONS(792), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(834), 17,
+    ACTIONS(790), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -60957,19 +61309,48 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [31513] = 3,
+  [31556] = 4,
+    ACTIONS(1396), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(712), 4,
+    ACTIONS(744), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(714), 17,
+    ACTIONS(746), 15,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [31588] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(865), 5,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(867), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -60982,21 +61363,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [31543] = 3,
+      anon_sym_order,
+  [31618] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(840), 4,
+    ACTIONS(716), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(838), 17,
+    ACTIONS(718), 16,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -61009,21 +61390,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [31573] = 3,
+      anon_sym_order,
+  [31648] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(844), 4,
+    ACTIONS(720), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(842), 17,
+    ACTIONS(722), 16,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -61036,21 +61417,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [31603] = 3,
+      anon_sym_order,
+  [31678] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(848), 4,
+    ACTIONS(724), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(846), 17,
+    ACTIONS(726), 16,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -61063,18 +61444,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [31633] = 3,
+      anon_sym_order,
+  [31708] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(852), 4,
+    ACTIONS(796), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(850), 17,
+    ACTIONS(794), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -61092,16 +61472,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [31663] = 3,
+  [31738] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(860), 4,
+    ACTIONS(812), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(858), 17,
+    ACTIONS(810), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -61119,20 +61499,89 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [31693] = 3,
+  [31768] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1420), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1422), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [31824] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1355), 1,
+      anon_sym_LBRACE,
+    STATE(1212), 1,
+      sym_body,
+    ACTIONS(1424), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1426), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [31860] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(708), 5,
+    ACTIONS(816), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(710), 16,
+    ACTIONS(814), 17,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -61145,20 +61594,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [31723] = 5,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(866), 1,
-      anon_sym_LT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [31890] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(864), 3,
+    ACTIONS(708), 4,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(862), 16,
+    ACTIONS(710), 17,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -61166,6 +61613,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_instanceof,
       anon_sym_and,
       anon_sym_implies,
+      anon_sym_DOT,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
@@ -61175,29 +61623,29 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [31757] = 6,
+  [31920] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1459), 1,
-      anon_sym_COMMA,
-    STATE(979), 1,
-      aux_sym_asExprs_repeat1,
-    ACTIONS(1421), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1432), 1,
+      anon_sym_COLON_COLON,
+    STATE(982), 1,
+      aux_sym_importModuleExpr_repeat1,
+    ACTIONS(1430), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1416), 15,
+    ACTIONS(1428), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -61205,78 +61653,61 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [31793] = 3,
+  [31956] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1434), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1436), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(824), 5,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(822), 16,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [31823] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1464), 1,
-      anon_sym_COMMA,
-    STATE(947), 1,
-      aux_sym_asExprs_repeat1,
-    ACTIONS(1466), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1462), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [31859] = 6,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32012] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
+    ACTIONS(1355), 1,
       anon_sym_LBRACE,
-    STATE(1208), 1,
+    STATE(1191), 1,
       sym_body,
-    ACTIONS(1468), 4,
+    ACTIONS(1438), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1470), 15,
+    ACTIONS(1440), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -61292,24 +61723,133 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [31895] = 6,
+  [32048] = 5,
+    ACTIONS(581), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(858), 1,
+      anon_sym_LT,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(856), 3,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(854), 16,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [32082] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1442), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1444), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32138] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1446), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1448), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32194] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
-      anon_sym_LBRACE,
-    STATE(1185), 1,
-      sym_body,
-    ACTIONS(1372), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1432), 1,
+      anon_sym_COLON_COLON,
+    STATE(991), 1,
+      aux_sym_importModuleExpr_repeat1,
+    ACTIONS(1452), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1370), 15,
+    ACTIONS(1450), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -61322,29 +61862,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [31931] = 15,
+  [32230] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    STATE(255), 1,
+    ACTIONS(1454), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1456), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61353,41 +61897,141 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(1472), 2,
-      anon_sym_COMMA,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32286] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1458), 1,
       anon_sym_RPAREN,
+    ACTIONS(1460), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
     ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [31985] = 16,
+  [32342] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(875), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(877), 17,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [32372] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1474), 1,
+    ACTIONS(1462), 1,
       anon_sym_RPAREN,
-    ACTIONS(1476), 1,
+    ACTIONS(1464), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32428] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61396,26 +62040,29 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
+    ACTIONS(1466), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
     ACTIONS(596), 4,
       anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32041] = 6,
+  [32482] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    STATE(1186), 1,
+    STATE(1188), 1,
       sym_body,
-    ACTIONS(1362), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1351), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1358), 15,
+    ACTIONS(1353), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -61431,33 +62078,63 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [32077] = 16,
+  [32518] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1470), 1,
+      anon_sym_COLON_COLON,
+    STATE(1033), 1,
+      aux_sym_importModuleExpr_repeat1,
+    ACTIONS(1452), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1450), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [32554] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1478), 1,
+    ACTIONS(1472), 1,
       anon_sym_RPAREN,
-    ACTIONS(1480), 1,
+    ACTIONS(1474), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61471,24 +62148,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32133] = 6,
+  [32610] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    STATE(1183), 1,
-      sym_body,
-    ACTIONS(1484), 4,
+    ACTIONS(1480), 1,
+      anon_sym_COLON_COLON,
+    STATE(991), 1,
+      aux_sym_importModuleExpr_repeat1,
+    ACTIONS(1478), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1482), 15,
+    ACTIONS(1476), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -61501,60 +62178,192 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [32169] = 3,
+  [32646] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1483), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1485), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(832), 5,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(830), 16,
-      anon_sym_COMMA,
-      anon_sym_as,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
       anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32702] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1487), 1,
       anon_sym_RPAREN,
+    ACTIONS(1489), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32758] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
       anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-      anon_sym_DOT,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(1491), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
+  [32812] = 16,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1493), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1495), 1,
+      anon_sym_PIPE,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [32199] = 16,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [32868] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1486), 1,
+    ACTIONS(1497), 1,
       anon_sym_RPAREN,
-    ACTIONS(1488), 1,
+    ACTIONS(1499), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61568,33 +62377,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32255] = 16,
+  [32924] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1490), 1,
+    ACTIONS(1501), 1,
       anon_sym_RPAREN,
-    ACTIONS(1492), 1,
+    ACTIONS(1503), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61608,29 +62417,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32311] = 6,
+  [32980] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1498), 1,
-      anon_sym_COMMA,
-    STATE(1008), 1,
-      aux_sym_asExprs_repeat1,
-    ACTIONS(1494), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1507), 6,
+      anon_sym_RBRACE,
+      anon_sym_DOT,
       sym_qldoc,
+      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1496), 15,
+    ACTIONS(1505), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [33012] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1468), 1,
+      anon_sym_LBRACE,
+    STATE(1184), 1,
+      sym_body,
+    ACTIONS(1511), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1509), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -61638,21 +62475,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [32347] = 6,
+  [33048] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1360), 1,
+    ACTIONS(1355), 1,
       anon_sym_LBRACE,
     STATE(1203), 1,
       sym_body,
-    ACTIONS(1502), 4,
+    ACTIONS(1513), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1515), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [33084] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1468), 1,
+      anon_sym_LBRACE,
+    STATE(1196), 1,
+      sym_body,
+    ACTIONS(1519), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1500), 15,
+    ACTIONS(1517), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -61668,33 +62535,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [32383] = 16,
+  [33120] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1504), 1,
+    ACTIONS(1521), 1,
       anon_sym_RPAREN,
-    ACTIONS(1506), 1,
+    ACTIONS(1523), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61708,33 +62575,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32439] = 16,
+  [33176] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1508), 1,
+    ACTIONS(1525), 1,
       anon_sym_RPAREN,
-    ACTIONS(1510), 1,
+    ACTIONS(1527), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61748,33 +62615,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32495] = 16,
+  [33232] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1512), 1,
+    ACTIONS(1529), 1,
       anon_sym_RPAREN,
-    ACTIONS(1514), 1,
+    ACTIONS(1531), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61788,33 +62655,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32551] = 16,
+  [33288] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1516), 1,
+    ACTIONS(1533), 1,
       anon_sym_RPAREN,
-    ACTIONS(1518), 1,
+    ACTIONS(1535), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61828,63 +62695,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32607] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    STATE(1181), 1,
-      sym_body,
-    ACTIONS(1522), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1520), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [32643] = 16,
+  [33344] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1524), 1,
+    ACTIONS(1537), 1,
       anon_sym_RPAREN,
-    ACTIONS(1526), 1,
+    ACTIONS(1539), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61898,33 +62735,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32699] = 16,
+  [33400] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1528), 1,
+    ACTIONS(1541), 1,
       anon_sym_RPAREN,
-    ACTIONS(1530), 1,
+    ACTIONS(1543), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61938,33 +62775,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32755] = 16,
+  [33456] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1532), 1,
+    ACTIONS(1545), 1,
       anon_sym_RPAREN,
-    ACTIONS(1534), 1,
+    ACTIONS(1547), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -61978,21 +62815,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32811] = 6,
+  [33512] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1360), 1,
+    ACTIONS(1370), 1,
+      anon_sym_COMMA,
+    STATE(1030), 1,
+      aux_sym_asExprs_repeat1,
+    ACTIONS(1406), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1402), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [33548] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1355), 1,
       anon_sym_LBRACE,
-    STATE(1196), 1,
+    STATE(1192), 1,
       sym_body,
-    ACTIONS(1538), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1511), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1536), 15,
+    ACTIONS(1509), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -62008,33 +62875,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [32847] = 16,
+  [33584] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1540), 1,
+    ACTIONS(1549), 1,
       anon_sym_RPAREN,
-    ACTIONS(1542), 1,
+    ACTIONS(1551), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62048,49 +62915,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [32903] = 4,
+  [33640] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1382), 6,
-      ts_builtin_sym_end,
-      anon_sym_DOT,
-      sym_qldoc,
-      anon_sym_COLON_COLON,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1380), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [32935] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1548), 1,
+    ACTIONS(1470), 1,
       anon_sym_COLON_COLON,
-    STATE(1005), 1,
+    STATE(989), 1,
       aux_sym_importModuleExpr_repeat1,
-    ACTIONS(1544), 4,
+    ACTIONS(1430), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1546), 15,
+    ACTIONS(1428), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_as,
@@ -62106,73 +62945,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [32971] = 16,
+  [33676] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1551), 1,
-      anon_sym_RPAREN,
     ACTIONS(1553), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [33027] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1555), 1,
       anon_sym_RPAREN,
-    ACTIONS(1557), 1,
+    ACTIONS(1555), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62186,54 +62985,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33083] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1498), 1,
-      anon_sym_COMMA,
-    STATE(979), 1,
-      aux_sym_asExprs_repeat1,
-    ACTIONS(1466), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1462), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [33119] = 6,
+  [33732] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1368), 1,
-      anon_sym_COLON_COLON,
-    STATE(1033), 1,
-      aux_sym_importModuleExpr_repeat1,
-    ACTIONS(1561), 4,
+    ACTIONS(1468), 1,
+      anon_sym_LBRACE,
+    STATE(1200), 1,
+      sym_body,
+    ACTIONS(1559), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1559), 15,
+    ACTIONS(1557), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_as,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -62246,33 +63015,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [33155] = 16,
+  [33768] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1563), 1,
+    ACTIONS(1561), 1,
       anon_sym_RPAREN,
-    ACTIONS(1565), 1,
+    ACTIONS(1563), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62286,21 +63055,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33211] = 6,
+  [33824] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
+    ACTIONS(1355), 1,
       anon_sym_LBRACE,
-    STATE(1210), 1,
+    STATE(1195), 1,
       sym_body,
-    ACTIONS(1455), 4,
+    ACTIONS(1519), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1453), 15,
+    ACTIONS(1517), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -62316,33 +63085,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [33247] = 16,
+  [33860] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1567), 1,
+    ACTIONS(1565), 1,
       anon_sym_RPAREN,
-    ACTIONS(1569), 1,
+    ACTIONS(1567), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62356,21 +63125,78 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33303] = 6,
+  [33916] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(802), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(804), 16,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [33946] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    STATE(1209), 1,
+    STATE(1222), 1,
+      sym_body,
+    ACTIONS(1571), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1569), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [33982] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1355), 1,
+      anon_sym_LBRACE,
+    STATE(1187), 1,
       sym_body,
-    ACTIONS(1484), 4,
+    ACTIONS(1571), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1482), 15,
+    ACTIONS(1569), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -62386,33 +63212,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [33339] = 16,
+  [34018] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1571), 1,
-      anon_sym_RPAREN,
     ACTIONS(1573), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1575), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62426,33 +63252,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33395] = 16,
+  [34074] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1575), 1,
-      anon_sym_RPAREN,
     ACTIONS(1577), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1579), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62466,33 +63292,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33451] = 16,
+  [34130] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1579), 1,
-      anon_sym_RPAREN,
     ACTIONS(1581), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1583), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62506,63 +63332,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33507] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1464), 1,
-      anon_sym_COMMA,
-    STATE(981), 1,
-      aux_sym_asExprs_repeat1,
-    ACTIONS(1494), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1496), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [33543] = 16,
+  [34186] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1583), 1,
-      anon_sym_RPAREN,
     ACTIONS(1585), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1587), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62576,33 +63372,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33599] = 16,
+  [34242] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1587), 1,
-      anon_sym_RPAREN,
     ACTIONS(1589), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1591), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62616,33 +63412,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33655] = 16,
+  [34298] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1591), 1,
-      anon_sym_RPAREN,
     ACTIONS(1593), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1595), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62656,21 +63452,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33711] = 6,
+  [34354] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1468), 1,
+      anon_sym_LBRACE,
+    STATE(1201), 1,
+      sym_body,
+    ACTIONS(1372), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1374), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [34390] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
+    ACTIONS(1355), 1,
       anon_sym_LBRACE,
-    STATE(1192), 1,
+    STATE(1189), 1,
       sym_body,
-    ACTIONS(1502), 4,
+    ACTIONS(1559), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1500), 15,
+    ACTIONS(1557), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -62686,48 +63512,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [33747] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(869), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(871), 16,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [33777] = 6,
+  [34426] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    STATE(1193), 1,
+    STATE(1202), 1,
       sym_body,
-    ACTIONS(1522), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1424), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1520), 15,
+    ACTIONS(1426), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -62743,60 +63542,91 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [33813] = 3,
-    ACTIONS(3), 2,
+  [34462] = 6,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(873), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(875), 16,
+    ACTIONS(1597), 1,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
+    STATE(1030), 1,
+      aux_sym_asExprs_repeat1,
+    ACTIONS(1362), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1357), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
       anon_sym_order,
-  [33843] = 16,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [34498] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1507), 6,
+      ts_builtin_sym_end,
+      anon_sym_DOT,
+      sym_qldoc,
+      anon_sym_COLON_COLON,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1505), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [34530] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1595), 1,
+    ACTIONS(1600), 1,
       anon_sym_RPAREN,
-    ACTIONS(1597), 1,
+    ACTIONS(1602), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62810,24 +63640,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [33899] = 6,
+  [34586] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1427), 1,
-      anon_sym_LBRACE,
-    STATE(1194), 1,
-      sym_body,
-    ACTIONS(1538), 4,
+    ACTIONS(1604), 1,
+      anon_sym_COLON_COLON,
+    STATE(1033), 1,
+      aux_sym_importModuleExpr_repeat1,
+    ACTIONS(1478), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1536), 15,
+    ACTIONS(1476), 15,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -62840,61 +63670,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [33935] = 16,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1599), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1601), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
+  [34622] = 6,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [33991] = 6,
+    ACTIONS(1468), 1,
+      anon_sym_LBRACE,
+    STATE(1221), 1,
+      sym_body,
+    ACTIONS(1438), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1440), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_or,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [34658] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1360), 1,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    STATE(1189), 1,
+    STATE(1219), 1,
       sym_body,
-    ACTIONS(1468), 4,
+    ACTIONS(1513), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1470), 15,
+    ACTIONS(1515), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -62910,33 +63730,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [34027] = 16,
+  [34694] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1603), 1,
+    ACTIONS(1607), 1,
       anon_sym_RPAREN,
-    ACTIONS(1605), 1,
+    ACTIONS(1609), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62950,33 +63770,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34083] = 16,
+  [34750] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1607), 1,
+    ACTIONS(1611), 1,
       anon_sym_RPAREN,
-    ACTIONS(1609), 1,
+    ACTIONS(1613), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -62990,120 +63810,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34139] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(887), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(885), 16,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [34169] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1392), 1,
-      anon_sym_COLON_COLON,
-    STATE(1005), 1,
-      aux_sym_importModuleExpr_repeat1,
-    ACTIONS(1561), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1559), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [34205] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1611), 1,
-      anon_sym_COLON_COLON,
-    STATE(1033), 1,
-      aux_sym_importModuleExpr_repeat1,
-    ACTIONS(1544), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1546), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [34241] = 16,
+  [34806] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1614), 1,
+    ACTIONS(1615), 1,
       anon_sym_RPAREN,
-    ACTIONS(1616), 1,
+    ACTIONS(1617), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63117,33 +63850,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34297] = 16,
+  [34862] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1618), 1,
+    ACTIONS(1619), 1,
       anon_sym_RPAREN,
-    ACTIONS(1620), 1,
+    ACTIONS(1621), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63157,60 +63890,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34353] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(766), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(764), 17,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [34383] = 16,
+  [34918] = 16,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1622), 1,
+    ACTIONS(1623), 1,
       anon_sym_RPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(1625), 1,
       anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63224,88 +63930,69 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34439] = 4,
-    ACTIONS(1457), 1,
-      anon_sym_DOT,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(879), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
+  [34974] = 15,
+    ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(877), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
       anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [34471] = 3,
+    ACTIONS(1627), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(883), 5,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(881), 16,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [34501] = 16,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [35027] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1626), 1,
+    ACTIONS(1629), 1,
       anon_sym_RPAREN,
-    ACTIONS(1628), 1,
-      anon_sym_PIPE,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63319,58 +64006,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34557] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1630), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1632), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [34588] = 15,
+  [35080] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1634), 1,
+    ACTIONS(1631), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63384,31 +64044,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34641] = 15,
+  [35133] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1636), 1,
+    ACTIONS(1633), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63422,31 +64082,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34694] = 15,
+  [35186] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1638), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1635), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63460,31 +64120,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34747] = 15,
+  [35239] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1640), 1,
-      anon_sym_select,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    ACTIONS(1637), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63498,31 +64158,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34800] = 15,
+  [35292] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1642), 1,
-      anon_sym_else,
-    STATE(270), 1,
+    ACTIONS(1639), 1,
+      anon_sym_then,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63536,31 +64196,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34853] = 15,
+  [35345] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1644), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1641), 1,
+      anon_sym_then,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63574,23 +64234,50 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [34906] = 6,
+  [35398] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1650), 1,
-      anon_sym_COMMA,
-    STATE(1048), 1,
-      aux_sym_orderBys_repeat1,
-    ACTIONS(1646), 4,
+    ACTIONS(1647), 1,
+      anon_sym_order,
+    STATE(1316), 1,
+      sym_orderBys,
+    ACTIONS(1645), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1643), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [35433] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1649), 5,
       ts_builtin_sym_end,
       sym_qldoc,
+      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1648), 14,
+    ACTIONS(1651), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -63603,42 +64290,157 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [34941] = 3,
+  [35464] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1653), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(951), 4,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(953), 16,
-      anon_sym_COMMA,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
       anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [35517] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
       anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
+    ACTIONS(1655), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
+  [35570] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1657), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [34970] = 3,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [35623] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1661), 5,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1659), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [35654] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(955), 4,
+    ACTIONS(969), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(957), 16,
+    ACTIONS(967), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -63655,20 +64457,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [34999] = 3,
+  [35683] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(951), 5,
+    ACTIONS(937), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(953), 15,
+    ACTIONS(935), 16,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -63680,61 +64481,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [35028] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1657), 1,
-      anon_sym_order,
-    STATE(1361), 1,
-      sym_orderBys,
-    ACTIONS(1655), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1653), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [35063] = 15,
+      anon_sym_asc,
+      anon_sym_desc,
+  [35712] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1659), 1,
+    ACTIONS(1663), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63748,31 +64521,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35116] = 15,
+  [35765] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1661), 1,
+    ACTIONS(1665), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63786,31 +64559,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35169] = 15,
+  [35818] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1663), 1,
-      anon_sym_RBRACE,
-    STATE(270), 1,
+    ACTIONS(1667), 1,
+      anon_sym_then,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63824,86 +64597,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35222] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1667), 1,
-      anon_sym_COMMA,
-    STATE(1081), 1,
-      aux_sym_orderBys_repeat1,
-    ACTIONS(1669), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1665), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [35257] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(939), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(941), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [35286] = 15,
+  [35871] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1671), 1,
-      anon_sym_else,
-    STATE(270), 1,
+    ACTIONS(1669), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63917,31 +64635,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35339] = 15,
+  [35924] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1673), 1,
-      anon_sym_then,
-    STATE(270), 1,
+    ACTIONS(1671), 1,
+      anon_sym_else,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63955,31 +64673,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35392] = 15,
+  [35977] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1362), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1357), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [36008] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1675), 1,
+    ACTIONS(1673), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -63993,31 +64738,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35445] = 15,
+  [36061] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1677), 1,
+    ACTIONS(1675), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64031,31 +64776,84 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35498] = 15,
+  [36114] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1362), 5,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1357), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [36145] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(941), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(939), 15,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [36174] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1679), 1,
+    ACTIONS(1677), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64069,31 +64867,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35551] = 15,
+  [36227] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1681), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
+    ACTIONS(1679), 1,
+      anon_sym_then,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64107,21 +64905,61 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35604] = 6,
+  [36280] = 17,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1708), 1,
+      sym_signatureExpr,
+    STATE(1716), 1,
+      sym_moduleParam,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [36337] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1657), 1,
-      anon_sym_order,
-    STATE(1374), 1,
-      sym_orderBys,
+    ACTIONS(1689), 1,
+      anon_sym_or,
+    STATE(1070), 1,
+      aux_sym_datatypeBranches_repeat1,
     ACTIONS(1685), 4,
-      anon_sym_RBRACE,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1683), 14,
+    ACTIONS(1687), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -64136,31 +64974,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [35639] = 15,
+  [36372] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1687), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
+    ACTIONS(1692), 1,
+      anon_sym_RBRACE,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64174,31 +65012,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35692] = 15,
+  [36425] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1689), 1,
+    ACTIONS(1694), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64212,60 +65050,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35745] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1695), 1,
-      anon_sym_order,
-    STATE(1379), 1,
-      sym_orderBys,
-    ACTIONS(1691), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1693), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [35780] = 15,
+  [36478] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1697), 1,
+    ACTIONS(1696), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64279,26 +65088,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35833] = 4,
+  [36531] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(702), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
+    ACTIONS(1649), 5,
+      anon_sym_RBRACE,
       sym_qldoc,
+      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(704), 15,
+    ACTIONS(1651), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -64306,18 +65115,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [35864] = 4,
+  [36562] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(702), 5,
-      anon_sym_COMMA,
+    ACTIONS(1698), 1,
+      anon_sym_or,
+    STATE(1075), 1,
+      aux_sym_datatypeBranches_repeat1,
+    ACTIONS(1685), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(704), 15,
+    ACTIONS(1687), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -64325,7 +65137,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -64333,17 +65144,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [35895] = 3,
+  [36597] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(945), 5,
+    ACTIONS(907), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(943), 15,
+    ACTIONS(909), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -64359,31 +65170,69 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [35924] = 15,
+  [36626] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1699), 1,
+    ACTIONS(1701), 1,
       anon_sym_else,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [36679] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1703), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64397,21 +65246,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [35977] = 6,
+  [36732] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1657), 1,
-      anon_sym_order,
-    STATE(1274), 1,
-      sym_orderBys,
-    ACTIONS(1703), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1709), 1,
+      anon_sym_COMMA,
+    STATE(1167), 1,
+      aux_sym_orderBys_repeat1,
+    ACTIONS(1705), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1701), 14,
+    ACTIONS(1707), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -64426,31 +65275,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [36012] = 15,
+  [36767] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1705), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
+    ACTIONS(1711), 1,
+      anon_sym_then,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64464,31 +65313,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36065] = 15,
+  [36820] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1707), 1,
-      anon_sym_else,
-    STATE(270), 1,
+    ACTIONS(1713), 1,
+      anon_sym_select,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64502,31 +65351,60 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36118] = 15,
+  [36873] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1717), 1,
+      anon_sym_COMMA,
+    STATE(1102), 1,
+      aux_sym_orderBys_repeat1,
+    ACTIONS(1719), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1715), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [36908] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1709), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
+    ACTIONS(1721), 1,
+      anon_sym_select,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64540,31 +65418,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36171] = 15,
+  [36961] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1711), 1,
+    ACTIONS(1723), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64578,31 +65456,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36224] = 15,
+  [37014] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1713), 1,
-      anon_sym_else,
-    STATE(270), 1,
+    ACTIONS(1725), 1,
+      anon_sym_select,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64616,31 +65494,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36277] = 15,
+  [37067] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1715), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1727), 1,
+      anon_sym_select,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64654,31 +65532,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36330] = 15,
+  [37120] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1717), 1,
-      anon_sym_select,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    ACTIONS(1729), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64692,21 +65570,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36383] = 6,
+  [37173] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1667), 1,
+    ACTIONS(1661), 5,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-    STATE(1106), 1,
-      aux_sym_orderBys_repeat1,
-    ACTIONS(1721), 4,
-      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1719), 14,
+    ACTIONS(1659), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -64714,6 +65589,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
+      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -64721,69 +65597,109 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [36418] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
+  [37204] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(907), 4,
+      anon_sym_LT,
+      anon_sym_GT,
       anon_sym_in,
-    ACTIONS(1274), 1,
+      anon_sym_SLASH,
+    ACTIONS(909), 16,
+      anon_sym_COMMA,
+      anon_sym_EQ,
       anon_sym_or,
-    ACTIONS(1276), 1,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
       anon_sym_and,
-    ACTIONS(1278), 1,
       anon_sym_implies,
-    ACTIONS(1723), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [37233] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(941), 4,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(939), 16,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+      anon_sym_asc,
+      anon_sym_desc,
+  [37262] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(937), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(935), 15,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36471] = 15,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [37291] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1725), 1,
+    ACTIONS(1731), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64797,21 +65713,119 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36524] = 6,
+  [37344] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1731), 1,
+    ACTIONS(1647), 1,
+      anon_sym_order,
+    STATE(1388), 1,
+      sym_orderBys,
+    ACTIONS(1735), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1733), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [37379] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1741), 1,
       anon_sym_or,
-    STATE(1117), 1,
+    STATE(1075), 1,
       aux_sym_datatypeBranches_repeat1,
-    ACTIONS(1729), 4,
+    ACTIONS(1739), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1727), 14,
+    ACTIONS(1737), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [37414] = 17,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1708), 1,
+      sym_signatureExpr,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1783), 1,
+      sym_moduleParam,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [37471] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1747), 1,
+      anon_sym_order,
+    STATE(1227), 1,
+      sym_orderBys,
+    ACTIONS(1743), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1745), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -64826,31 +65840,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [36559] = 15,
+  [37506] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1733), 1,
-      anon_sym_RBRACE,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    ACTIONS(1749), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64864,31 +65878,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36612] = 15,
+  [37559] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(969), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(967), 15,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_order,
+  [37588] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1735), 1,
+    ACTIONS(1751), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64902,31 +65942,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36665] = 15,
+  [37641] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1737), 1,
+    ACTIONS(1753), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -64940,84 +65980,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36718] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1739), 5,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      anon_sym_COLON_COLON,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1741), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_as,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [36749] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(913), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(911), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [36778] = 15,
+  [37694] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1743), 1,
+    ACTIONS(1755), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65031,21 +66018,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36831] = 6,
+  [37747] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1745), 1,
-      anon_sym_or,
-    STATE(1180), 1,
-      aux_sym_datatypeBranches_repeat1,
-    ACTIONS(1729), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1717), 1,
+      anon_sym_COMMA,
+    STATE(1111), 1,
+      aux_sym_orderBys_repeat1,
+    ACTIONS(1705), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1727), 14,
+    ACTIONS(1707), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -65060,31 +66047,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [36866] = 15,
+  [37782] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1747), 1,
-      anon_sym_RBRACE,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    ACTIONS(1757), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65098,19 +66085,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [36919] = 3,
+  [37835] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(919), 4,
+    ACTIONS(917), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(921), 16,
+    ACTIONS(915), 15,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -65122,109 +66110,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [36948] = 15,
+      anon_sym_order,
+  [37864] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1749), 1,
-      anon_sym_then,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [37001] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1751), 1,
-      anon_sym_select,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    ACTIONS(1759), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [37054] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1753), 1,
-      anon_sym_else,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(274), 1,
-      sym_compop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65238,16 +66149,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37107] = 3,
+  [37917] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(967), 4,
+    ACTIONS(917), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(969), 16,
+    ACTIONS(915), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -65264,31 +66175,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [37136] = 15,
+  [37946] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1755), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
+    ACTIONS(1761), 1,
+      anon_sym_RBRACE,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65302,31 +66213,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37189] = 15,
+  [37999] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1757), 1,
+    ACTIONS(1763), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65340,31 +66251,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37242] = 15,
+  [38052] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1759), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1765), 1,
+      anon_sym_else,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65378,31 +66289,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37295] = 15,
+  [38105] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1761), 1,
-      anon_sym_select,
-    STATE(270), 1,
+    ACTIONS(1767), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65416,134 +66327,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37348] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1695), 1,
-      anon_sym_order,
-    STATE(1231), 1,
-      sym_orderBys,
-    ACTIONS(1763), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1765), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [37383] = 6,
+  [38158] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
     ACTIONS(1771), 1,
-      anon_sym_or,
-    STATE(1103), 1,
-      aux_sym_datatypeBranches_repeat1,
-    ACTIONS(1769), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1767), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [37418] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1774), 1,
-      anon_sym_COMMA,
-    STATE(1048), 1,
-      aux_sym_orderBys_repeat1,
-    ACTIONS(1721), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1719), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [37453] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(959), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(961), 16,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [37482] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1776), 1,
       anon_sym_COMMA,
-    STATE(1106), 1,
+    STATE(1111), 1,
       aux_sym_orderBys_repeat1,
-    ACTIONS(1646), 4,
+    ACTIONS(1774), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1648), 14,
+    ACTIONS(1769), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -65558,31 +66356,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [37517] = 15,
+  [38193] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1779), 1,
+    ACTIONS(1776), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65596,50 +66394,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37570] = 6,
-    ACTIONS(3), 1,
+  [38246] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1657), 1,
+    ACTIONS(951), 5,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(953), 15,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
       anon_sym_order,
-    STATE(1368), 1,
-      sym_orderBys,
-    ACTIONS(1783), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1781), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [37605] = 6,
+  [38275] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1657), 1,
-      anon_sym_order,
-    STATE(1285), 1,
-      sym_orderBys,
-    ACTIONS(1691), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1782), 1,
+      anon_sym_or,
+    STATE(1124), 1,
+      aux_sym_datatypeBranches_repeat1,
+    ACTIONS(1778), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1693), 14,
+    ACTIONS(1780), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -65654,54 +66449,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [37640] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1785), 1,
-      anon_sym_select,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [37693] = 3,
+  [38310] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(907), 4,
+    ACTIONS(961), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(909), 16,
+    ACTIONS(959), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -65718,57 +66475,69 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [37722] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(935), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
+  [38339] = 15,
+    ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(937), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
       anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(1784), 1,
+      anon_sym_RBRACE,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [37751] = 15,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [38392] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1787), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1786), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65782,31 +66551,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37804] = 15,
+  [38445] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1789), 1,
-      anon_sym_select,
-    STATE(270), 1,
+    ACTIONS(1788), 1,
+      anon_sym_else,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65820,60 +66589,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37857] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1695), 1,
-      anon_sym_order,
-    STATE(1338), 1,
-      sym_orderBys,
-    ACTIONS(1783), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1781), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [37892] = 15,
+  [38498] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1791), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1790), 1,
+      anon_sym_then,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65887,46 +66627,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [37945] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1731), 1,
-      anon_sym_or,
-    STATE(1103), 1,
-      aux_sym_datatypeBranches_repeat1,
-    ACTIONS(1795), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1793), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [37980] = 3,
+  [38551] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(919), 5,
+    ACTIONS(947), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(921), 15,
+    ACTIONS(949), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -65942,31 +66653,60 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [38009] = 15,
+  [38580] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1647), 1,
+      anon_sym_order,
+    STATE(1382), 1,
+      sym_orderBys,
+    ACTIONS(1794), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1792), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [38615] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1797), 1,
+    ACTIONS(1796), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -65980,31 +66720,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [38062] = 15,
+  [38668] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1799), 1,
+    ACTIONS(1798), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66018,21 +66758,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [38115] = 6,
+  [38721] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1657), 1,
-      anon_sym_order,
-    STATE(1357), 1,
-      sym_orderBys,
-    ACTIONS(1763), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1782), 1,
+      anon_sym_or,
+    STATE(1070), 1,
+      aux_sym_datatypeBranches_repeat1,
+    ACTIONS(1739), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1765), 14,
+    ACTIONS(1737), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -66047,21 +66787,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [38150] = 6,
+  [38756] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1695), 1,
+    ACTIONS(1747), 1,
       anon_sym_order,
-    STATE(1347), 1,
+    STATE(1318), 1,
       sym_orderBys,
-    ACTIONS(1655), 4,
+    ACTIONS(1735), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1653), 14,
+    ACTIONS(1733), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -66076,73 +66816,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [38185] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(915), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(917), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [38214] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(947), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(949), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [38243] = 6,
+  [38791] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1801), 1,
+    ACTIONS(1741), 1,
       anon_sym_or,
-    STATE(1125), 1,
+    STATE(1094), 1,
       aux_sym_datatypeBranches_repeat1,
-    ACTIONS(1769), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1778), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1767), 14,
+    ACTIONS(1780), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -66157,57 +66845,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [38278] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(963), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(965), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [38307] = 15,
+  [38826] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1804), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1800), 1,
+      anon_sym_select,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66221,21 +66883,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [38360] = 6,
+  [38879] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(965), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(963), 16,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [38908] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1695), 1,
+    ACTIONS(1747), 1,
       anon_sym_order,
-    STATE(1301), 1,
+    STATE(1289), 1,
       sym_orderBys,
-    ACTIONS(1703), 4,
+    ACTIONS(1802), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1701), 14,
+    ACTIONS(1804), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -66250,69 +66938,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [38395] = 15,
+  [38943] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
     ACTIONS(1806), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [38448] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1808), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66326,19 +66976,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [38501] = 3,
+  [38996] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(925), 4,
+    ACTIONS(923), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(923), 16,
+    ACTIONS(925), 15,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -66350,22 +67001,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [38530] = 3,
+      anon_sym_order,
+  [39025] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(907), 5,
+    ACTIONS(913), 4,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(909), 15,
+    ACTIONS(911), 16,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_EQ,
+      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -66377,20 +67026,80 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [39054] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1747), 1,
+      anon_sym_order,
+    STATE(1372), 1,
+      sym_orderBys,
+    ACTIONS(1808), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1810), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [39089] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1747), 1,
       anon_sym_order,
-  [38559] = 3,
+    STATE(1239), 1,
+      sym_orderBys,
+    ACTIONS(1645), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1643), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [39124] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(933), 4,
+    ACTIONS(927), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(931), 16,
+    ACTIONS(929), 15,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -66402,45 +67111,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [38588] = 3,
+      anon_sym_order,
+  [39153] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
+      anon_sym_implies,
+    ACTIONS(1812), 1,
+      anon_sym_else,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(929), 4,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(927), 16,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [38617] = 3,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [39206] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(959), 5,
+    ACTIONS(957), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(961), 15,
+    ACTIONS(955), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -66456,57 +67176,69 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [38646] = 3,
+  [39235] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1814), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(963), 4,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(965), 16,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [38675] = 15,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [39288] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1810), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1816), 1,
+      anon_sym_select,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66520,31 +67252,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [38728] = 15,
+  [39341] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1812), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+    ACTIONS(1818), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66558,17 +67290,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [38781] = 3,
+  [39394] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(967), 5,
+    ACTIONS(965), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(969), 15,
+    ACTIONS(963), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -66584,31 +67316,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [38810] = 15,
+  [39423] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1814), 1,
+    ACTIONS(1820), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66622,21 +67354,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [38863] = 4,
+  [39476] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1739), 5,
-      anon_sym_RBRACE,
+    ACTIONS(1709), 1,
+      anon_sym_COMMA,
+    STATE(1079), 1,
+      aux_sym_orderBys_repeat1,
+    ACTIONS(1719), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
-      anon_sym_COLON_COLON,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1741), 15,
+    ACTIONS(1715), 14,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_as,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -66649,171 +67383,97 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [38894] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(947), 4,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(949), 16,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [38923] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1816), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
+  [39511] = 17,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1708), 1,
+      sym_signatureExpr,
+    STATE(1711), 1,
+      sym_moduleParam,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [38976] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1818), 1,
-      anon_sym_then,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [39568] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(957), 4,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [39029] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+      anon_sym_SLASH,
+    ACTIONS(955), 16,
+      anon_sym_COMMA,
+      anon_sym_EQ,
       anon_sym_or,
-    ACTIONS(1276), 1,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
       anon_sym_and,
-    ACTIONS(1278), 1,
       anon_sym_implies,
-    ACTIONS(1820), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [39082] = 15,
+      anon_sym_asc,
+      anon_sym_desc,
+  [39597] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
     ACTIONS(1822), 1,
-      anon_sym_then,
-    STATE(270), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66827,31 +67487,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39135] = 15,
+  [39650] = 4,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(699), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(701), 15,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_order,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [39681] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1235), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1237), 1,
       anon_sym_implies,
     ACTIONS(1824), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
+      anon_sym_select,
+    STATE(209), 1,
       sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66865,31 +67552,60 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39188] = 15,
+  [39734] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1647), 1,
+      anon_sym_order,
+    STATE(1226), 1,
+      sym_orderBys,
+    ACTIONS(1802), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1804), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [39769] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
     ACTIONS(1826), 1,
       anon_sym_else,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -66903,54 +67619,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39241] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1828), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
+  [39822] = 6,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [39294] = 3,
+    ACTIONS(1647), 1,
+      anon_sym_order,
+    STATE(1354), 1,
+      sym_orderBys,
+    ACTIONS(1743), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1745), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [39857] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(915), 4,
+    ACTIONS(933), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(917), 16,
+    ACTIONS(931), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -66967,16 +67674,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [39323] = 3,
+  [39886] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(935), 4,
+    ACTIONS(951), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(937), 16,
+    ACTIONS(953), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -66993,59 +67700,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [39352] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1830), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+  [39915] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(945), 4,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(943), 16,
+      anon_sym_COMMA,
       anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39405] = 6,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [39944] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1774), 1,
-      anon_sym_COMMA,
-    STATE(1104), 1,
-      aux_sym_orderBys_repeat1,
-    ACTIONS(1669), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1647), 1,
+      anon_sym_order,
+    STATE(1280), 1,
+      sym_orderBys,
+    ACTIONS(1808), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1665), 14,
+    ACTIONS(1810), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -67060,18 +67755,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [39440] = 4,
+  [39979] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(921), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(919), 16,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [40008] = 6,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1630), 5,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+    ACTIONS(1747), 1,
+      anon_sym_order,
+    STATE(1305), 1,
+      sym_orderBys,
+    ACTIONS(1794), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1632), 15,
+    ACTIONS(1792), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -67079,7 +67803,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_where,
       anon_sym_select,
       anon_sym_class,
-      anon_sym_order,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -67087,31 +67810,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [39471] = 15,
+  [40043] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1832), 1,
+    ACTIONS(1828), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67125,16 +67848,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39524] = 3,
+  [40096] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(939), 4,
+    ACTIONS(947), 4,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(941), 16,
+    ACTIONS(949), 16,
       anon_sym_COMMA,
       anon_sym_EQ,
       anon_sym_or,
@@ -67151,19 +67874,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       anon_sym_asc,
       anon_sym_desc,
-  [39553] = 3,
+  [40125] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(945), 4,
+    ACTIONS(961), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(943), 16,
+    ACTIONS(959), 15,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -67175,60 +67899,134 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [39582] = 4,
-    ACTIONS(3), 1,
+      anon_sym_order,
+  [40154] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1830), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [40207] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1251), 1,
+      anon_sym_in,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1832), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [40260] = 3,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1421), 5,
+    ACTIONS(927), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(929), 16,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1416), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_order,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [39613] = 15,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [40289] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
     ACTIONS(1834), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67242,31 +68040,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39666] = 15,
+  [40342] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
     ACTIONS(1836), 1,
-      anon_sym_then,
-    STATE(270), 1,
+      anon_sym_RBRACK,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67280,31 +68078,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39719] = 15,
+  [40395] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
     ACTIONS(1838), 1,
-      anon_sym_select,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67318,31 +68116,60 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39772] = 15,
+  [40448] = 6,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(1840), 1,
+      anon_sym_COMMA,
+    STATE(1167), 1,
+      aux_sym_orderBys_repeat1,
+    ACTIONS(1774), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1769), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [40483] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1279), 1,
+      anon_sym_and,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1840), 1,
-      anon_sym_RBRACK,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
+    ACTIONS(1843), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
       sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67356,31 +68183,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39825] = 15,
+  [40536] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1842), 1,
+    ACTIONS(1845), 1,
       anon_sym_then,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67394,17 +68221,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39878] = 3,
+  [40589] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(955), 5,
+    ACTIONS(921), 5,
       anon_sym_LT,
       anon_sym_GT,
       anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(957), 15,
+    ACTIONS(919), 15,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_EQ,
@@ -67420,57 +68247,72 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_PERCENT,
       anon_sym_order,
-  [39907] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1138), 1,
-      anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
-      anon_sym_or,
-    ACTIONS(1194), 1,
-      anon_sym_implies,
-    ACTIONS(1844), 1,
-      anon_sym_else,
-    STATE(270), 1,
-      sym_addop,
-    STATE(272), 1,
-      sym_mulop,
-    STATE(274), 1,
-      sym_compop,
+  [40618] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(945), 5,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
+      anon_sym_or,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(943), 15,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
+      anon_sym_order,
+  [40647] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(923), 4,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_in,
+      anon_sym_SLASH,
+    ACTIONS(925), 16,
+      anon_sym_COMMA,
       anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_RPAREN,
+      anon_sym_instanceof,
+      anon_sym_and,
+      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [39960] = 3,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+      anon_sym_asc,
+      anon_sym_desc,
+  [40676] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(913), 4,
+    ACTIONS(933), 5,
       anon_sym_LT,
       anon_sym_GT,
+      anon_sym_or,
       anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(911), 16,
+    ACTIONS(931), 15,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_EQ,
-      anon_sym_or,
       anon_sym_RPAREN,
       anon_sym_instanceof,
       anon_sym_and,
@@ -67482,33 +68324,70 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_asc,
-      anon_sym_desc,
-  [39989] = 15,
+      anon_sym_order,
+  [40705] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
+    ACTIONS(1277), 1,
+      anon_sym_or,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1281), 1,
+      anon_sym_implies,
+    ACTIONS(1847), 1,
+      anon_sym_RPAREN,
+    STATE(321), 1,
+      sym_compop,
+    STATE(323), 1,
+      sym_mulop,
+    STATE(324), 1,
+      sym_addop,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(594), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(608), 2,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+    ACTIONS(610), 2,
+      anon_sym_STAR,
+      anon_sym_PERCENT,
+    ACTIONS(596), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
+  [40758] = 15,
+    ACTIONS(612), 1,
+      anon_sym_SLASH,
+    ACTIONS(1229), 1,
+      anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1846), 1,
+    ACTIONS(1849), 1,
       anon_sym_select,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67522,31 +68401,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [40042] = 15,
+  [40811] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1848), 1,
+    ACTIONS(1851), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67560,125 +68439,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [40095] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(929), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
+  [40864] = 15,
+    ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(927), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
+    ACTIONS(1231), 1,
+      anon_sym_in,
+    ACTIONS(1233), 1,
+      anon_sym_or,
+    ACTIONS(1235), 1,
       anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [40124] = 3,
+    ACTIONS(1853), 1,
+      anon_sym_else,
+    STATE(209), 1,
+      sym_addop,
+    STATE(210), 1,
+      sym_mulop,
+    STATE(211), 1,
+      sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(933), 5,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(931), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
+    ACTIONS(608), 2,
       anon_sym_PLUS,
       anon_sym_DASH,
+    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-      anon_sym_order,
-  [40153] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1695), 1,
-      anon_sym_order,
-    STATE(1275), 1,
-      sym_orderBys,
-    ACTIONS(1685), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1683), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [40188] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(925), 5,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_or,
-      anon_sym_in,
-      anon_sym_SLASH,
-    ACTIONS(923), 15,
-      anon_sym_COMMA,
-      anon_sym_as,
+    ACTIONS(596), 4,
       anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_instanceof,
-      anon_sym_and,
-      anon_sym_implies,
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-      anon_sym_order,
-  [40217] = 4,
+  [40917] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1421), 5,
-      ts_builtin_sym_end,
+    ACTIONS(699), 5,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1416), 15,
+    ACTIONS(701), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -67694,31 +68504,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40248] = 15,
+  [40948] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1850), 1,
+    ACTIONS(1855), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67732,31 +68542,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [40301] = 15,
+  [41001] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
+    ACTIONS(1251), 1,
       anon_sym_in,
-    ACTIONS(1274), 1,
+    ACTIONS(1277), 1,
       anon_sym_or,
-    ACTIONS(1276), 1,
+    ACTIONS(1279), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
+    ACTIONS(1281), 1,
       anon_sym_implies,
-    ACTIONS(1852), 1,
+    ACTIONS(1857), 1,
       anon_sym_RPAREN,
-    STATE(255), 1,
+    STATE(321), 1,
       sym_compop,
-    STATE(256), 1,
+    STATE(323), 1,
       sym_mulop,
-    STATE(257), 1,
+    STATE(324), 1,
       sym_addop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67770,31 +68580,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [40354] = 15,
+  [41054] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1854), 1,
+    ACTIONS(1859), 1,
       anon_sym_then,
-    STATE(270), 1,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67808,31 +68618,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [40407] = 15,
+  [41107] = 15,
     ACTIONS(612), 1,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(1229), 1,
       anon_sym_instanceof,
-    ACTIONS(1138), 1,
+    ACTIONS(1231), 1,
       anon_sym_in,
-    ACTIONS(1140), 1,
-      anon_sym_and,
-    ACTIONS(1162), 1,
+    ACTIONS(1233), 1,
       anon_sym_or,
-    ACTIONS(1194), 1,
+    ACTIONS(1235), 1,
+      anon_sym_and,
+    ACTIONS(1237), 1,
       anon_sym_implies,
-    ACTIONS(1856), 1,
-      anon_sym_then,
-    STATE(270), 1,
+    ACTIONS(1861), 1,
+      anon_sym_else,
+    STATE(209), 1,
       sym_addop,
-    STATE(272), 1,
+    STATE(210), 1,
       sym_mulop,
-    STATE(274), 1,
+    STATE(211), 1,
       sym_compop,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(594), 2,
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(608), 2,
@@ -67846,122 +68656,43 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_LT_EQ,
       anon_sym_GT_EQ,
-  [40460] = 15,
-    ACTIONS(612), 1,
-      anon_sym_SLASH,
-    ACTIONS(1136), 1,
-      anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
-      anon_sym_and,
-    ACTIONS(1278), 1,
-      anon_sym_implies,
-    ACTIONS(1858), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
+  [41160] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(592), 2,
+    ACTIONS(913), 5,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(608), 2,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-    ACTIONS(610), 2,
-      anon_sym_STAR,
-      anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [40513] = 15,
-    ACTIONS(612), 1,
+      anon_sym_or,
+      anon_sym_in,
       anon_sym_SLASH,
-    ACTIONS(1136), 1,
+    ACTIONS(911), 15,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
       anon_sym_instanceof,
-    ACTIONS(1272), 1,
-      anon_sym_in,
-    ACTIONS(1274), 1,
-      anon_sym_or,
-    ACTIONS(1276), 1,
       anon_sym_and,
-    ACTIONS(1278), 1,
       anon_sym_implies,
-    ACTIONS(1860), 1,
-      anon_sym_RPAREN,
-    STATE(255), 1,
-      sym_compop,
-    STATE(256), 1,
-      sym_mulop,
-    STATE(257), 1,
-      sym_addop,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(592), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(608), 2,
+      anon_sym_BANG_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_GT_EQ,
       anon_sym_PLUS,
       anon_sym_DASH,
-    ACTIONS(610), 2,
       anon_sym_STAR,
       anon_sym_PERCENT,
-    ACTIONS(596), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_GT_EQ,
-  [40566] = 6,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1745), 1,
-      anon_sym_or,
-    STATE(1125), 1,
-      aux_sym_datatypeBranches_repeat1,
-    ACTIONS(1795), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(1793), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [40601] = 4,
+      anon_sym_order,
+  [41189] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1372), 4,
+    ACTIONS(1865), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1370), 15,
+    ACTIONS(1863), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -67977,20 +68708,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40631] = 4,
+  [41219] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1522), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1774), 5,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1520), 15,
+    ACTIONS(1769), 14,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68003,20 +68734,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40661] = 4,
-    ACTIONS(3), 1,
+  [41249] = 4,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1502), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
+    ACTIONS(581), 2,
+      anon_sym_LT,
+      anon_sym_COLON_COLON,
+    ACTIONS(585), 3,
+      anon_sym_LBRACK,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1500), 15,
+    ACTIONS(1867), 14,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68029,21 +68760,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40691] = 5,
+  [41279] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1866), 1,
-      anon_sym_as,
-    ACTIONS(1862), 4,
+    ACTIONS(1513), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1864), 14,
+    ACTIONS(1515), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68056,17 +68786,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40723] = 4,
+  [41309] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1868), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1871), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1870), 15,
+    ACTIONS(1869), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68082,17 +68812,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40753] = 4,
+  [41339] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1423), 4,
+    ACTIONS(1873), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1425), 15,
+    ACTIONS(1875), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68108,17 +68838,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40783] = 4,
+  [41369] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1423), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1877), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1425), 15,
+    ACTIONS(1879), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68134,17 +68864,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40813] = 4,
+  [41399] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1872), 4,
+    ACTIONS(1372), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1874), 15,
+    ACTIONS(1374), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68160,17 +68890,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40843] = 4,
+  [41429] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1484), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1865), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1482), 15,
+    ACTIONS(1863), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68186,55 +68916,56 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40873] = 15,
+  [41459] = 16,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(1876), 1,
+    ACTIONS(1681), 1,
       sym__lower_id,
-    ACTIONS(1878), 1,
+    ACTIONS(1683), 1,
       sym__upper_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
+    STATE(1483), 1,
       sym_predicateExpr,
-    STATE(1593), 1,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1656), 1,
+    STATE(1636), 1,
       sym_signatureExpr,
-    STATE(1785), 1,
-      sym_moduleParam,
-    STATE(1909), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
       sym_aritylessPredicateExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [40925] = 4,
+  [41513] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1646), 5,
+    ACTIONS(1881), 5,
+      ts_builtin_sym_end,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1648), 14,
+    ACTIONS(1883), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -68249,17 +68980,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40955] = 4,
+  [41543] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1880), 4,
+    ACTIONS(1351), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1882), 15,
+    ACTIONS(1353), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68275,17 +69006,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [40985] = 4,
+  [41573] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1372), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1351), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1370), 15,
+    ACTIONS(1353), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68301,20 +69032,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41015] = 4,
+  [41603] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1362), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1881), 5,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1358), 15,
+    ACTIONS(1883), 14,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68327,46 +69058,61 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41045] = 4,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(1872), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
+  [41633] = 16,
+    ACTIONS(29), 1,
       sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
       sym__upper_id,
-    ACTIONS(1874), 15,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_or,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1701), 1,
+      sym_signatureExpr,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
+  [41687] = 6,
+    ACTIONS(1885), 1,
       sym__lower_id,
-      sym_predicate,
-  [41075] = 4,
-    ACTIONS(3), 1,
+    STATE(1399), 1,
+      sym_annotName,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1362), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
+    ACTIONS(1890), 2,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1358), 15,
+    STATE(1199), 2,
+      sym_annotation,
+      aux_sym_moduleMember_repeat1,
+    ACTIONS(1888), 13,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68377,19 +69123,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-      sym__lower_id,
       sym_predicate,
-  [41105] = 4,
+  [41721] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1868), 4,
+    ACTIONS(1873), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1870), 15,
+    ACTIONS(1875), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68405,17 +69150,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41135] = 4,
+  [41751] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1769), 4,
+    ACTIONS(1511), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1767), 15,
+    ACTIONS(1509), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68431,17 +69176,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41165] = 4,
+  [41781] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1769), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1519), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1767), 15,
+    ACTIONS(1517), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68457,20 +69202,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41195] = 4,
+  [41811] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1884), 5,
+    ACTIONS(1559), 4,
       ts_builtin_sym_end,
-      anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1886), 14,
+    ACTIONS(1557), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68483,48 +69228,59 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41225] = 6,
-    ACTIONS(1888), 1,
+  [41841] = 16,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
       sym__lower_id,
-    STATE(1388), 1,
-      sym_annotName,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1495), 1,
+      sym_signatureExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1893), 2,
-      sym_dbtype,
-      sym__upper_id,
-    STATE(1201), 2,
-      sym_annotation,
-      aux_sym_moduleMember_repeat1,
-    ACTIONS(1891), 13,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-      sym_predicate,
-  [41259] = 4,
+  [41895] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1897), 4,
+    ACTIONS(1896), 1,
+      anon_sym_as,
+    ACTIONS(1894), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1895), 15,
+    ACTIONS(1892), 14,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68537,20 +69293,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41289] = 4,
+  [41927] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1880), 4,
+    ACTIONS(1774), 5,
+      anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1882), 15,
+    ACTIONS(1769), 14,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68563,55 +69319,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41319] = 15,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1597), 1,
-      sym_moduleParam,
-    STATE(1656), 1,
-      sym_signatureExpr,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [41371] = 4,
+  [41957] = 5,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1899), 5,
+    ACTIONS(1898), 1,
+      anon_sym_as,
+    ACTIONS(1894), 4,
       ts_builtin_sym_end,
-      anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1901), 14,
+    ACTIONS(1892), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -68626,20 +69346,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41401] = 4,
+  [41989] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1899), 5,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
+    ACTIONS(1511), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1901), 14,
+    ACTIONS(1509), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68652,18 +69372,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41431] = 4,
+  [42019] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1884), 5,
+    ACTIONS(1902), 5,
       anon_sym_COMMA,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1886), 14,
+    ACTIONS(1900), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -68678,17 +69398,93 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41461] = 4,
+  [42049] = 16,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1503), 1,
+      sym_signatureExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [42103] = 16,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1494), 1,
+      sym_signatureExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [42157] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1484), 4,
+    ACTIONS(1519), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1482), 15,
+    ACTIONS(1517), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68704,20 +69500,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41491] = 4,
+  [42187] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1502), 4,
+    ACTIONS(1902), 5,
       ts_builtin_sym_end,
+      anon_sym_COMMA,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1500), 15,
+    ACTIONS(1900), 14,
       anon_sym_module,
       anon_sym_import,
-      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68730,17 +69526,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41521] = 4,
+  [42217] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1522), 4,
+    ACTIONS(1871), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1520), 15,
+    ACTIONS(1869), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68756,81 +69552,131 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41551] = 5,
-    ACTIONS(3), 1,
+  [42247] = 16,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1521), 1,
+      sym_signatureExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1903), 1,
-      anon_sym_as,
-    ACTIONS(1862), 4,
-      anon_sym_RBRACE,
-      sym_qldoc,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [42301] = 16,
+    ACTIONS(29), 1,
       sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
       sym__upper_id,
-    ACTIONS(1864), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1518), 1,
+      sym_signatureExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [41583] = 15,
+  [42355] = 16,
     ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(1876), 1,
+    ACTIONS(1681), 1,
       sym__lower_id,
-    ACTIONS(1878), 1,
+    ACTIONS(1683), 1,
       sym__upper_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
+    STATE(1483), 1,
       sym_predicateExpr,
-    STATE(1593), 1,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1656), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1748), 1,
       sym_signatureExpr,
-    STATE(1738), 1,
-      sym_moduleParam,
-    STATE(1909), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
       sym_aritylessPredicateExpr,
-    STATE(1957), 1,
+    STATE(1894), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [41635] = 4,
+  [42409] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1897), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1685), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1895), 15,
+    ACTIONS(1687), 15,
       anon_sym_module,
       anon_sym_import,
       anon_sym_or,
@@ -68846,20 +69692,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41665] = 4,
+  [42439] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1646), 5,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
+    ACTIONS(1559), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1648), 14,
+    ACTIONS(1557), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68872,19 +69718,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41695] = 4,
+  [42469] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1907), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1685), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1905), 14,
+    ACTIONS(1687), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68897,19 +69744,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41724] = 4,
+  [42499] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1911), 4,
+    ACTIONS(1372), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1909), 14,
+    ACTIONS(1374), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68922,19 +69770,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41753] = 4,
+  [42529] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1915), 4,
+    ACTIONS(1513), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1913), 14,
+    ACTIONS(1515), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68947,19 +69796,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41782] = 4,
+  [42559] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1919), 4,
+    ACTIONS(1877), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1917), 14,
+    ACTIONS(1879), 15,
       anon_sym_module,
       anon_sym_import,
+      anon_sym_or,
       anon_sym_newtype,
       anon_sym_from,
       anon_sym_where,
@@ -68972,17 +69822,55 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41811] = 4,
+  [42589] = 16,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(1681), 1,
+      sym__lower_id,
+    ACTIONS(1683), 1,
+      sym__upper_id,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1483), 1,
+      sym_predicateExpr,
+    STATE(1484), 1,
+      sym_typeExpr,
+    STATE(1507), 1,
+      sym_signatureExpr,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1894), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [42643] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1923), 4,
+    ACTIONS(1906), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1921), 14,
+    ACTIONS(1904), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -68997,17 +69885,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41840] = 4,
+  [42672] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1925), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1794), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1927), 14,
+    ACTIONS(1792), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69022,17 +69910,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41869] = 4,
+  [42701] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1929), 4,
+    ACTIONS(1645), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1931), 14,
+    ACTIONS(1643), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69047,52 +69935,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41898] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1723), 1,
-      sym_signatureExpr,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [41947] = 4,
+  [42730] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1933), 4,
+    ACTIONS(1908), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1935), 14,
+    ACTIONS(1910), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69107,17 +69960,53 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [41976] = 4,
+  [42759] = 15,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(1914), 1,
+      anon_sym_where,
+    ACTIONS(1916), 1,
+      anon_sym_select,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1593), 1,
+      sym_varDecl,
+    STATE(1595), 1,
+      sym_typeExpr,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [42810] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1937), 4,
+    ACTIONS(1918), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1939), 14,
+    ACTIONS(1920), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69132,17 +70021,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42005] = 4,
+  [42839] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1941), 4,
+    ACTIONS(1922), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1943), 14,
+    ACTIONS(1924), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69157,17 +70046,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42034] = 4,
+  [42868] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1947), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1926), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1945), 14,
+    ACTIONS(1928), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69182,17 +70071,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42063] = 4,
+  [42897] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1951), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1930), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1949), 14,
+    ACTIONS(1932), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69207,17 +70096,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42092] = 4,
+  [42926] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1955), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1934), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1953), 14,
+    ACTIONS(1936), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69232,17 +70121,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42121] = 4,
+  [42955] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1959), 4,
+    ACTIONS(1926), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1957), 14,
+    ACTIONS(1928), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69257,17 +70146,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42150] = 4,
+  [42984] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1925), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1938), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1927), 14,
+    ACTIONS(1940), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69282,17 +70171,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42179] = 4,
+  [43013] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1685), 4,
+    ACTIONS(1942), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1683), 14,
+    ACTIONS(1944), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69307,17 +70196,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42208] = 4,
+  [43042] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1963), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1946), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1961), 14,
+    ACTIONS(1948), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69332,17 +70221,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42237] = 4,
+  [43071] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1965), 4,
+    ACTIONS(1950), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1967), 14,
+    ACTIONS(1952), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69357,17 +70246,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42266] = 4,
+  [43100] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1971), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1954), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1969), 14,
+    ACTIONS(1956), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69382,17 +70271,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42295] = 4,
+  [43129] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1975), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1958), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1973), 14,
+    ACTIONS(1960), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69407,17 +70296,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42324] = 4,
+  [43158] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1977), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1964), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1979), 14,
+    ACTIONS(1962), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69432,17 +70321,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42353] = 4,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(3), 2,
+  [43187] = 4,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(585), 3,
-      anon_sym_LBRACK,
+    ACTIONS(1966), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1981), 14,
+    ACTIONS(1968), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69457,17 +70346,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42382] = 4,
+  [43216] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1983), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1972), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1985), 14,
+    ACTIONS(1970), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69482,17 +70371,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42411] = 4,
+  [43245] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1987), 4,
+    ACTIONS(1974), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1989), 14,
+    ACTIONS(1976), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69507,17 +70396,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42440] = 4,
+  [43274] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1991), 4,
+    ACTIONS(1978), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1993), 14,
+    ACTIONS(1980), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69532,17 +70421,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42469] = 4,
+  [43303] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1995), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1984), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1997), 14,
+    ACTIONS(1982), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69557,17 +70446,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42498] = 4,
+  [43332] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1999), 4,
+    ACTIONS(1984), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2001), 14,
+    ACTIONS(1982), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69582,17 +70471,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42527] = 4,
+  [43361] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2005), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1972), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2003), 14,
+    ACTIONS(1970), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69607,17 +70496,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42556] = 4,
+  [43390] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2009), 4,
+    ACTIONS(1918), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2007), 14,
+    ACTIONS(1920), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69632,17 +70521,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42585] = 4,
+  [43419] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2011), 4,
+    ACTIONS(1964), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2013), 14,
+    ACTIONS(1962), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69657,17 +70546,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42614] = 4,
+  [43448] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2015), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1978), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2017), 14,
+    ACTIONS(1980), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69682,17 +70571,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42643] = 4,
+  [43477] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1947), 4,
+    ACTIONS(1986), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1945), 14,
+    ACTIONS(1988), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69707,17 +70596,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42672] = 4,
+  [43506] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2019), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1992), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2021), 14,
+    ACTIONS(1990), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69732,17 +70621,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42701] = 4,
+  [43535] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2005), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1974), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2003), 14,
+    ACTIONS(1976), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69757,17 +70646,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42730] = 4,
+  [43564] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2023), 4,
+    ACTIONS(1994), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2025), 14,
+    ACTIONS(1996), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69782,17 +70671,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42759] = 4,
+  [43593] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2027), 4,
+    ACTIONS(1998), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2029), 14,
+    ACTIONS(2000), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69807,52 +70696,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42788] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1494), 1,
-      sym_signatureExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [42837] = 4,
+  [43622] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2031), 4,
+    ACTIONS(2002), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2033), 14,
+    ACTIONS(2004), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69867,17 +70721,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42866] = 4,
+  [43651] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2023), 4,
+    ACTIONS(2008), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2025), 14,
+    ACTIONS(2006), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69892,52 +70746,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42895] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1511), 1,
-      sym_signatureExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [42944] = 4,
+  [43680] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2037), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2008), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2035), 14,
+    ACTIONS(2006), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69952,17 +70771,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [42973] = 4,
+  [43709] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2041), 4,
+    ACTIONS(2012), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2039), 14,
+    ACTIONS(2010), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -69977,17 +70796,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43002] = 4,
+  [43738] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2045), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2014), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2043), 14,
+    ACTIONS(2016), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70002,17 +70821,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43031] = 4,
+  [43767] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2047), 4,
+    ACTIONS(2018), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2049), 14,
+    ACTIONS(2020), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70027,17 +70846,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43060] = 4,
+  [43796] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2051), 4,
+    ACTIONS(2022), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2053), 14,
+    ACTIONS(2024), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70052,17 +70871,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43089] = 4,
+  [43825] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2055), 4,
+    ACTIONS(2026), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2057), 14,
+    ACTIONS(2028), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70077,17 +70896,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43118] = 4,
+  [43854] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2059), 4,
+    ACTIONS(1906), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2061), 14,
+    ACTIONS(1904), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70102,17 +70921,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43147] = 4,
+  [43883] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2063), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1954), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2065), 14,
+    ACTIONS(1956), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70127,17 +70946,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43176] = 4,
+  [43912] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2069), 4,
+    ACTIONS(1934), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2067), 14,
+    ACTIONS(1936), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70152,17 +70971,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43205] = 4,
+  [43941] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2073), 4,
+    ACTIONS(1930), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2071), 14,
+    ACTIONS(1932), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70177,52 +70996,42 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43234] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1520), 1,
-      sym_signatureExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
+  [43970] = 4,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(1922), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(1924), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [43283] = 4,
+      sym__lower_id,
+      sym_predicate,
+  [43999] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2077), 4,
+    ACTIONS(1994), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2075), 14,
+    ACTIONS(1996), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70237,17 +71046,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43312] = 4,
+  [44028] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2027), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2030), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2029), 14,
+    ACTIONS(2032), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70262,17 +71071,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43341] = 4,
+  [44057] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2081), 4,
+    ACTIONS(2002), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2079), 14,
+    ACTIONS(2004), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70287,17 +71096,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43370] = 4,
+  [44086] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2085), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2034), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2083), 14,
+    ACTIONS(2036), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70312,17 +71121,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43399] = 4,
+  [44115] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2089), 4,
+    ACTIONS(2014), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2087), 14,
+    ACTIONS(2016), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70337,17 +71146,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43428] = 4,
+  [44144] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2055), 4,
+    ACTIONS(2022), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2057), 14,
+    ACTIONS(2024), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70362,17 +71171,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43457] = 4,
+  [44173] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2093), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2012), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2091), 14,
+    ACTIONS(2010), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70387,17 +71196,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43486] = 4,
+  [44202] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1763), 4,
+    ACTIONS(2040), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1765), 14,
+    ACTIONS(2038), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70412,17 +71221,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43515] = 4,
+  [44231] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1655), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2044), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1653), 14,
+    ACTIONS(2042), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70437,17 +71246,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43544] = 4,
+  [44260] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2097), 4,
+    ACTIONS(1802), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2095), 14,
+    ACTIONS(1804), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70462,17 +71271,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43573] = 4,
+  [44289] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2051), 4,
+    ACTIONS(2048), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2053), 14,
+    ACTIONS(2046), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70487,17 +71296,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43602] = 4,
+  [44318] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2101), 4,
+    ACTIONS(1942), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2099), 14,
+    ACTIONS(1944), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70512,17 +71321,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43631] = 4,
+  [44347] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1933), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2050), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1935), 14,
+    ACTIONS(2052), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70537,17 +71346,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43660] = 4,
+  [44376] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1937), 4,
+    ACTIONS(2056), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1939), 14,
+    ACTIONS(2054), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70562,17 +71371,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43689] = 4,
+  [44405] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1941), 4,
+    ACTIONS(2060), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1943), 14,
+    ACTIONS(2058), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70587,17 +71396,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43718] = 4,
+  [44434] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2105), 4,
+    ACTIONS(2064), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2103), 14,
+    ACTIONS(2062), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70612,17 +71421,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43747] = 4,
+  [44463] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2109), 4,
+    ACTIONS(2068), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2107), 14,
+    ACTIONS(2066), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70637,17 +71446,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43776] = 4,
+  [44492] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2047), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2040), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2049), 14,
+    ACTIONS(2038), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70662,17 +71471,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43805] = 4,
+  [44521] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2113), 4,
-      anon_sym_RBRACE,
+    ACTIONS(1794), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2111), 14,
+    ACTIONS(1792), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70687,17 +71496,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43834] = 4,
+  [44550] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2031), 4,
+    ACTIONS(2072), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2033), 14,
+    ACTIONS(2070), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70712,17 +71521,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43863] = 4,
+  [44579] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2059), 4,
+    ACTIONS(2076), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2061), 14,
+    ACTIONS(2074), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70737,17 +71546,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43892] = 4,
+  [44608] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2019), 4,
+    ACTIONS(2080), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2021), 14,
+    ACTIONS(2078), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70762,17 +71571,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43921] = 4,
+  [44637] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2015), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2044), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2017), 14,
+    ACTIONS(2042), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70787,17 +71596,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43950] = 4,
+  [44666] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2063), 4,
+    ACTIONS(2084), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2065), 14,
+    ACTIONS(2082), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70812,17 +71621,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [43979] = 4,
+  [44695] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2109), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2050), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2107), 14,
+    ACTIONS(2052), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70837,17 +71646,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44008] = 4,
+  [44724] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2117), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2056), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2115), 14,
+    ACTIONS(2054), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70862,17 +71671,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44037] = 4,
+  [44753] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2117), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2088), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2115), 14,
+    ACTIONS(2086), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70887,17 +71696,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44066] = 4,
+  [44782] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2119), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2092), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2121), 14,
+    ACTIONS(2090), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70912,17 +71721,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44095] = 4,
+  [44811] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1999), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2060), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2001), 14,
+    ACTIONS(2058), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70937,17 +71746,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44124] = 4,
+  [44840] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2119), 4,
+    ACTIONS(2096), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2121), 14,
+    ACTIONS(2094), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70962,17 +71771,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44153] = 4,
+  [44869] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1987), 4,
+    ACTIONS(2100), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1989), 14,
+    ACTIONS(2098), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -70987,17 +71796,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44182] = 4,
+  [44898] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2123), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2104), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2125), 14,
+    ACTIONS(2102), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71012,17 +71821,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44211] = 4,
+  [44927] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2123), 4,
+    ACTIONS(2108), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2125), 14,
+    ACTIONS(2106), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71037,17 +71846,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44240] = 4,
+  [44956] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2045), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2112), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2043), 14,
+    ACTIONS(2110), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71062,17 +71871,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44269] = 4,
+  [44985] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1763), 4,
+    ACTIONS(1735), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1765), 14,
+    ACTIONS(1733), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71087,17 +71896,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44298] = 4,
+  [45014] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2129), 4,
+    ACTIONS(2116), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2127), 14,
+    ACTIONS(2114), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71112,17 +71921,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44327] = 4,
+  [45043] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2133), 4,
+    ACTIONS(2120), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2131), 14,
+    ACTIONS(2118), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71137,17 +71946,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44356] = 4,
+  [45072] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2101), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2124), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2099), 14,
+    ACTIONS(2122), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71162,17 +71971,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44385] = 4,
+  [45101] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1915), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2128), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1913), 14,
+    ACTIONS(2126), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71187,17 +71996,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44414] = 4,
+  [45130] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2137), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2072), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2135), 14,
+    ACTIONS(2070), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71212,17 +72021,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44443] = 4,
+  [45159] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1983), 4,
+    ACTIONS(2132), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1985), 14,
+    ACTIONS(2130), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71237,17 +72046,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44472] = 4,
+  [45188] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2139), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2136), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2141), 14,
+    ACTIONS(2134), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71262,17 +72071,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44501] = 4,
+  [45217] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2145), 4,
+    ACTIONS(2140), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2143), 14,
+    ACTIONS(2138), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71287,17 +72096,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44530] = 4,
+  [45246] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1977), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2076), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1979), 14,
+    ACTIONS(2074), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71312,17 +72121,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44559] = 4,
+  [45275] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1965), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2120), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1967), 14,
+    ACTIONS(2118), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71337,17 +72146,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44588] = 4,
+  [45304] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2097), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1950), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2095), 14,
+    ACTIONS(1952), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71362,17 +72171,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44617] = 4,
+  [45333] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2009), 4,
+    ACTIONS(2142), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2007), 14,
+    ACTIONS(2144), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71387,16 +72196,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44646] = 3,
-    ACTIONS(3), 2,
+  [45362] = 4,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(585), 4,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
+    ACTIONS(1743), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1981), 14,
+    ACTIONS(1745), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71411,17 +72221,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44673] = 4,
+  [45391] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2149), 4,
+    ACTIONS(2148), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2147), 14,
+    ACTIONS(2146), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71436,17 +72246,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44702] = 4,
+  [45420] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2149), 4,
+    ACTIONS(2150), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2147), 14,
+    ACTIONS(2152), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71461,17 +72271,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44731] = 4,
+  [45449] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2153), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2154), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2151), 14,
+    ACTIONS(2156), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71486,17 +72296,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44760] = 4,
+  [45478] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2105), 4,
+    ACTIONS(2064), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2103), 14,
+    ACTIONS(2062), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71511,17 +72321,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44789] = 4,
+  [45507] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2155), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1986), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2157), 14,
+    ACTIONS(1988), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71536,17 +72346,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44818] = 4,
+  [45536] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2011), 4,
+    ACTIONS(1998), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2013), 14,
+    ACTIONS(2000), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71561,17 +72371,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44847] = 4,
+  [45565] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2155), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2158), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2157), 14,
+    ACTIONS(2160), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71586,17 +72396,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44876] = 4,
+  [45594] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2161), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2162), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2159), 14,
+    ACTIONS(2164), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71611,17 +72421,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44905] = 4,
+  [45623] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2165), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2068), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2163), 14,
+    ACTIONS(2066), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71636,17 +72446,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44934] = 4,
+  [45652] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2169), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2166), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2167), 14,
+    ACTIONS(2168), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71661,17 +72471,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44963] = 4,
+  [45681] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2173), 4,
+    ACTIONS(2150), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2171), 14,
+    ACTIONS(2152), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71686,17 +72496,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [44992] = 4,
+  [45710] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2177), 4,
+    ACTIONS(2172), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2175), 14,
+    ACTIONS(2170), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71711,17 +72521,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45021] = 4,
+  [45739] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2129), 4,
+    ACTIONS(2096), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2127), 14,
+    ACTIONS(2094), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71736,17 +72546,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45050] = 4,
+  [45768] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1919), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1938), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1917), 14,
+    ACTIONS(1940), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71761,17 +72571,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45079] = 4,
+  [45797] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2179), 4,
+    ACTIONS(2174), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2181), 14,
+    ACTIONS(2176), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71786,17 +72596,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45108] = 4,
+  [45826] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2161), 4,
+    ACTIONS(2178), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2159), 14,
+    ACTIONS(2180), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71811,17 +72621,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45137] = 4,
+  [45855] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2185), 4,
+    ACTIONS(2184), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2183), 14,
+    ACTIONS(2182), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71836,17 +72646,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45166] = 4,
+  [45884] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2165), 4,
+    ACTIONS(2186), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2163), 14,
+    ACTIONS(2188), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71861,52 +72671,42 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45195] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1482), 1,
-      sym_signatureExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
+  [45913] = 4,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(2192), 4,
+      anon_sym_RBRACE,
+      sym_qldoc,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(2190), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [45244] = 4,
+      sym__lower_id,
+      sym_predicate,
+  [45942] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1975), 4,
+    ACTIONS(2084), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1973), 14,
+    ACTIONS(2082), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71921,52 +72721,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45273] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1784), 1,
-      sym_signatureExpr,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [45322] = 4,
+  [45971] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2169), 4,
+    ACTIONS(2148), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2167), 14,
+    ACTIONS(2146), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -71981,17 +72746,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45351] = 4,
+  [46000] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1971), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2166), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1969), 14,
+    ACTIONS(2168), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72006,17 +72771,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45380] = 4,
+  [46029] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1703), 4,
+    ACTIONS(2108), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1701), 14,
+    ACTIONS(2106), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72031,17 +72796,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45409] = 4,
+  [46058] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2173), 4,
+    ACTIONS(2194), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2171), 14,
+    ACTIONS(2196), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72056,17 +72821,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45438] = 4,
+  [46087] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2185), 4,
+    ACTIONS(2172), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2183), 14,
+    ACTIONS(2170), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72081,17 +72846,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45467] = 4,
+  [46116] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1907), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2174), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1905), 14,
+    ACTIONS(2176), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72106,17 +72871,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45496] = 4,
+  [46145] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1963), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2158), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1961), 14,
+    ACTIONS(2160), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72131,52 +72896,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45525] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1484), 1,
-      sym_signatureExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [45574] = 4,
+  [46174] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2189), 4,
+    ACTIONS(2200), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2187), 14,
+    ACTIONS(2198), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72191,17 +72921,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45603] = 4,
+  [46203] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2193), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2202), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2191), 14,
+    ACTIONS(2204), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72216,17 +72946,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45632] = 4,
+  [46232] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2133), 4,
+    ACTIONS(2192), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2131), 14,
+    ACTIONS(2190), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72241,17 +72971,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45661] = 4,
+  [46261] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1691), 4,
+    ACTIONS(2206), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1693), 14,
+    ACTIONS(2208), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72266,17 +72996,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45690] = 4,
+  [46290] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1959), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2194), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1957), 14,
+    ACTIONS(2196), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72291,17 +73021,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45719] = 4,
+  [46319] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1955), 4,
+    ACTIONS(2080), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1953), 14,
+    ACTIONS(2078), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72316,17 +73046,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45748] = 4,
+  [46348] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2197), 4,
+    ACTIONS(1908), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2195), 14,
+    ACTIONS(1910), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72341,17 +73071,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45777] = 4,
+  [46377] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2201), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2088), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2199), 14,
+    ACTIONS(2086), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72366,17 +73096,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45806] = 4,
+  [46406] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2179), 4,
+    ACTIONS(1645), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2181), 14,
+    ACTIONS(1643), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72391,17 +73121,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45835] = 4,
+  [46435] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2139), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2184), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2141), 14,
+    ACTIONS(2182), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72416,17 +73146,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45864] = 4,
+  [46464] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1929), 4,
+    ACTIONS(2026), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1931), 14,
+    ACTIONS(2028), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72441,17 +73171,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45893] = 4,
+  [46493] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1951), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2030), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1949), 14,
+    ACTIONS(2032), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72466,17 +73196,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45922] = 4,
+  [46522] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2037), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2034), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2035), 14,
+    ACTIONS(2036), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72491,17 +73221,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45951] = 4,
+  [46551] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1685), 4,
+    ACTIONS(1946), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1683), 14,
+    ACTIONS(1948), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72516,17 +73246,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [45980] = 4,
+  [46580] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2201), 4,
+    ACTIONS(2140), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2199), 14,
+    ACTIONS(2138), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72541,17 +73271,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46009] = 4,
+  [46609] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2041), 4,
+    ACTIONS(2128), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2039), 14,
+    ACTIONS(2126), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72566,17 +73296,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46038] = 4,
+  [46638] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2069), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2212), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2067), 14,
+    ACTIONS(2210), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72591,17 +73321,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46067] = 4,
+  [46667] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1691), 4,
+    ACTIONS(1966), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1693), 14,
+    ACTIONS(1968), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72616,17 +73346,52 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46096] = 4,
-    ACTIONS(3), 1,
+  [46696] = 15,
+    ACTIONS(29), 1,
+      sym_dbtype,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(2214), 1,
+      anon_sym_where,
+    ACTIONS(2216), 1,
+      anon_sym_select,
+    STATE(1433), 1,
+      sym_className,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1522), 1,
+      sym_varDecl,
+    STATE(1595), 1,
+      sym_typeExpr,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
       sym_line_comment,
-    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2197), 4,
-      ts_builtin_sym_end,
-      sym_qldoc,
+    ACTIONS(27), 5,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+  [46747] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(585), 4,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2195), 14,
+    ACTIONS(1867), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72641,17 +73406,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46125] = 4,
+  [46774] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2193), 4,
+    ACTIONS(2092), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2191), 14,
+    ACTIONS(2090), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72666,17 +73431,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46154] = 4,
+  [46803] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2189), 4,
+    ACTIONS(2100), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2187), 14,
+    ACTIONS(2098), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72691,17 +73456,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46183] = 4,
+  [46832] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1911), 4,
+    ACTIONS(2104), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1909), 14,
+    ACTIONS(2102), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72716,17 +73481,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46212] = 4,
+  [46861] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2177), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1958), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2175), 14,
+    ACTIONS(1960), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72741,17 +73506,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46241] = 4,
+  [46890] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2073), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2202), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2071), 14,
+    ACTIONS(2204), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72766,17 +73531,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46270] = 4,
+  [46919] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1703), 4,
+    ACTIONS(2018), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1701), 14,
+    ACTIONS(2020), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72791,17 +73556,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46299] = 4,
+  [46948] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2077), 4,
+    ACTIONS(1802), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2075), 14,
+    ACTIONS(1804), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72816,17 +73581,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46328] = 4,
+  [46977] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2203), 4,
+    ACTIONS(2112), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2205), 14,
+    ACTIONS(2110), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72841,17 +73606,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46357] = 4,
+  [47006] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1991), 4,
+    ACTIONS(2186), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1993), 14,
+    ACTIONS(2188), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72866,17 +73631,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46386] = 4,
+  [47035] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1923), 4,
+    ACTIONS(2200), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1921), 14,
+    ACTIONS(2198), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72891,17 +73656,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46415] = 4,
+  [47064] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2153), 4,
+    ACTIONS(2048), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2151), 14,
+    ACTIONS(2046), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72916,17 +73681,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46444] = 4,
+  [47093] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1655), 4,
+    ACTIONS(2206), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1653), 14,
+    ACTIONS(2208), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72941,17 +73706,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46473] = 4,
+  [47122] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2145), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2142), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2143), 14,
+    ACTIONS(2144), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72966,17 +73731,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46502] = 4,
+  [47151] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2137), 4,
+    ACTIONS(1992), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2135), 14,
+    ACTIONS(1990), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -72991,17 +73756,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46531] = 4,
+  [47180] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(1995), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2212), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(1997), 14,
+    ACTIONS(2210), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73016,52 +73781,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46560] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1490), 1,
-      sym_signatureExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [46609] = 4,
+  [47209] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2113), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2178), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2111), 14,
+    ACTIONS(2180), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73076,17 +73806,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46638] = 4,
+  [47238] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2203), 4,
+    ACTIONS(1735), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2205), 14,
+    ACTIONS(1733), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73101,17 +73831,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46667] = 4,
+  [47267] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2081), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2154), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2079), 14,
+    ACTIONS(2156), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73126,17 +73856,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46696] = 4,
+  [47296] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2207), 4,
-      ts_builtin_sym_end,
+    ACTIONS(2162), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2209), 14,
+    ACTIONS(2164), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73151,52 +73881,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46725] = 14,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(1876), 1,
-      sym__lower_id,
-    ACTIONS(1878), 1,
-      sym__upper_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1474), 1,
-      sym_typeExpr,
-    STATE(1481), 1,
-      sym_predicateExpr,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1644), 1,
-      sym_signatureExpr,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    STATE(1957), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [46774] = 4,
+  [47325] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2093), 4,
+    ACTIONS(2136), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2091), 14,
+    ACTIONS(2134), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73211,17 +73906,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46803] = 4,
+  [47354] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2089), 4,
+    ACTIONS(2116), 4,
       ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2087), 14,
+    ACTIONS(2114), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73236,17 +73931,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46832] = 4,
+  [47383] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2207), 4,
-      anon_sym_RBRACE,
+    ACTIONS(2124), 4,
+      ts_builtin_sym_end,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2209), 14,
+    ACTIONS(2122), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73261,17 +73956,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46861] = 4,
+  [47412] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2085), 4,
-      ts_builtin_sym_end,
+    ACTIONS(1743), 4,
+      anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2083), 14,
+    ACTIONS(1745), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73286,16 +73981,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46890] = 4,
-    ACTIONS(2213), 1,
-      anon_sym_LBRACK,
-    ACTIONS(3), 2,
+  [47441] = 4,
+    ACTIONS(3), 1,
       sym_line_comment,
+    ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2215), 2,
+    ACTIONS(2132), 4,
+      ts_builtin_sym_end,
+      sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2211), 14,
+    ACTIONS(2130), 14,
       anon_sym_module,
       anon_sym_import,
       anon_sym_newtype,
@@ -73310,1237 +74006,1325 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [46918] = 13,
+  [47470] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2219), 1,
-      anon_sym_where,
-    ACTIONS(2221), 1,
-      anon_sym_select,
-    STATE(1438), 1,
+    ACTIONS(2218), 1,
+      anon_sym_RPAREN,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
-      sym_typeExpr,
     STATE(1595), 1,
+      sym_typeExpr,
+    STATE(1663), 1,
       sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
+    STATE(1668), 1,
       sym_simpleId,
-    ACTIONS(27), 5,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-  [46964] = 13,
-    ACTIONS(29), 1,
-      sym_dbtype,
-    ACTIONS(31), 1,
-      sym__upper_id,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    ACTIONS(2223), 1,
-      anon_sym_where,
-    ACTIONS(2225), 1,
-      anon_sym_select,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1545), 1,
-      sym_varDecl,
-    STATE(1594), 1,
-      sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47010] = 12,
+  [47518] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2227), 1,
+    ACTIONS(2220), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1679), 1,
+    STATE(1606), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47053] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(2231), 2,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(2229), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [47078] = 12,
+  [47566] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2233), 1,
+    ACTIONS(2222), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1663), 1,
+    STATE(1620), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47121] = 12,
+  [47614] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2235), 1,
+    ACTIONS(2224), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1727), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1723), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47164] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(2239), 2,
-      sym_dbtype,
-      sym__upper_id,
-    ACTIONS(2237), 14,
-      anon_sym_module,
-      anon_sym_import,
-      anon_sym_newtype,
-      anon_sym_from,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_class,
-      anon_sym_boolean,
-      anon_sym_date,
-      anon_sym_float,
-      anon_sym_int,
-      anon_sym_string,
-      sym__lower_id,
-      sym_predicate,
-  [47189] = 12,
+  [47662] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2241), 1,
+    ACTIONS(2226), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1743), 1,
+    STATE(1646), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47232] = 12,
+  [47710] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2243), 1,
+    ACTIONS(2228), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1693), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1686), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47275] = 12,
+  [47758] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2245), 1,
+    ACTIONS(2230), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1719), 1,
+    STATE(1632), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47318] = 12,
+  [47806] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2247), 1,
+    ACTIONS(2232), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1744), 1,
+    STATE(1619), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47361] = 12,
+  [47854] = 14,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2249), 1,
+    ACTIONS(2234), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1712), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1703), 1,
       sym_varDecl,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47404] = 12,
-    ACTIONS(29), 1,
+  [47902] = 4,
+    ACTIONS(2238), 1,
+      anon_sym_LBRACK,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2240), 2,
       sym_dbtype,
-    ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(2236), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
       sym__lower_id,
-    ACTIONS(2251), 1,
-      anon_sym_RPAREN,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1594), 1,
-      sym_typeExpr,
-    STATE(1710), 1,
-      sym_varDecl,
-    STATE(1981), 1,
-      sym_moduleExpr,
+      sym_predicate,
+  [47930] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(2244), 2,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(2242), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47447] = 11,
+      sym__lower_id,
+      sym_predicate,
+  [47955] = 13,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2253), 1,
+    ACTIONS(2246), 1,
       anon_sym_SEMI,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1736), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1726), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47487] = 11,
+  [48000] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2250), 2,
+      sym_dbtype,
+      sym__upper_id,
+    ACTIONS(2248), 14,
+      anon_sym_module,
+      anon_sym_import,
+      anon_sym_newtype,
+      anon_sym_from,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_class,
+      anon_sym_boolean,
+      anon_sym_date,
+      anon_sym_float,
+      anon_sym_int,
+      anon_sym_string,
+      sym__lower_id,
+      sym_predicate,
+  [48025] = 13,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1492), 1,
+    STATE(1498), 1,
       sym_varDecl,
-    STATE(1594), 1,
+    STATE(1595), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47527] = 11,
+  [48070] = 13,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2255), 1,
+    ACTIONS(2252), 1,
       anon_sym_SEMI,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1704), 1,
+    STATE(1625), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47567] = 10,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    ACTIONS(2259), 1,
+  [48115] = 12,
+    ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(2261), 1,
+    ACTIONS(31), 1,
       sym__upper_id,
-    STATE(606), 1,
-      sym_primitiveType,
-    STATE(608), 1,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    STATE(1433), 1,
       sym_className,
-    STATE(658), 1,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1836), 1,
       sym_typeExpr,
-    STATE(1961), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(2257), 5,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47604] = 10,
+  [48157] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1833), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1847), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47641] = 10,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    ACTIONS(2265), 1,
+  [48199] = 12,
+    ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(2267), 1,
+    ACTIONS(31), 1,
       sym__upper_id,
-    STATE(761), 1,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    STATE(1433), 1,
       sym_className,
-    STATE(762), 1,
-      sym_typeExpr,
-    STATE(790), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1989), 1,
+    STATE(1577), 1,
+      sym_typeExpr,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(2263), 5,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47678] = 10,
-    ACTIONS(2217), 1,
+  [48241] = 12,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2271), 1,
+    ACTIONS(2256), 1,
       sym_dbtype,
-    ACTIONS(2273), 1,
+    ACTIONS(2258), 1,
       sym__upper_id,
-    STATE(1139), 1,
+    STATE(627), 1,
       sym_typeExpr,
-    STATE(1170), 1,
-      sym_primitiveType,
-    STATE(1172), 1,
+    STATE(633), 1,
       sym_className,
-    STATE(1875), 1,
+    STATE(637), 1,
+      sym_primitiveType,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1966), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(2269), 5,
+    ACTIONS(2254), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47715] = 10,
+  [48283] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1819), 1,
-      sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1946), 1,
+      sym_typeExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47752] = 10,
-    ACTIONS(29), 1,
+  [48325] = 12,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(2262), 1,
       sym_dbtype,
-    ACTIONS(31), 1,
+    ACTIONS(2264), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    STATE(1438), 1,
+    STATE(651), 1,
       sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1788), 1,
+    STATE(655), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(657), 1,
+      sym_primitiveType,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1864), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(2260), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47789] = 10,
+  [48367] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1793), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1875), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47826] = 10,
+  [48409] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1495), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1896), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47863] = 10,
-    ACTIONS(29), 1,
+  [48451] = 12,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(2268), 1,
       sym_dbtype,
-    ACTIONS(31), 1,
+    ACTIONS(2270), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1544), 1,
+    STATE(788), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(793), 1,
+      sym_primitiveType,
+    STATE(799), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1858), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(2266), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47900] = 10,
+  [48493] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1506), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1752), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47937] = 10,
-    ACTIONS(29), 1,
+  [48535] = 12,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(2274), 1,
       sym_dbtype,
-    ACTIONS(31), 1,
+    ACTIONS(2276), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    STATE(1438), 1,
+    STATE(1115), 1,
+      sym_typeExpr,
+    STATE(1152), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1154), 1,
       sym_primitiveType,
-    STATE(1805), 1,
-      sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1931), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(2272), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [47974] = 10,
-    ACTIONS(29), 1,
+  [48577] = 12,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(2280), 1,
       sym_dbtype,
-    ACTIONS(31), 1,
+    ACTIONS(2282), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
-      sym_primitiveType,
-    STATE(1952), 1,
+    STATE(1160), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1171), 1,
+      sym_primitiveType,
+    STATE(1173), 1,
+      sym_className,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1919), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(2278), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48011] = 10,
-    ACTIONS(2217), 1,
+  [48619] = 12,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2277), 1,
+    ACTIONS(2286), 1,
       sym_dbtype,
-    ACTIONS(2279), 1,
+    ACTIONS(2288), 1,
       sym__upper_id,
-    STATE(604), 1,
+    STATE(606), 1,
       sym_className,
-    STATE(607), 1,
+    STATE(611), 1,
       sym_primitiveType,
-    STATE(627), 1,
+    STATE(621), 1,
       sym_typeExpr,
-    STATE(1956), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
+    STATE(1987), 1,
       sym_moduleExpr,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(2275), 5,
+    ACTIONS(2284), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48048] = 10,
+  [48661] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1551), 1,
-      sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1951), 1,
+      sym_typeExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48085] = 10,
+  [48703] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1552), 1,
+    STATE(1546), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48122] = 10,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    ACTIONS(2283), 1,
+  [48745] = 12,
+    ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(2285), 1,
+    ACTIONS(31), 1,
       sym__upper_id,
-    STATE(621), 1,
-      sym_typeExpr,
-    STATE(637), 1,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    STATE(1433), 1,
       sym_className,
-    STATE(640), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1838), 1,
+    STATE(1588), 1,
+      sym_typeExpr,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(2281), 5,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48159] = 10,
+  [48787] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1802), 1,
+    STATE(1582), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48196] = 10,
-    ACTIONS(29), 1,
+  [48829] = 12,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(2292), 1,
       sym_dbtype,
-    ACTIONS(31), 1,
+    ACTIONS(2294), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    STATE(1438), 1,
-      sym_className,
-    STATE(1443), 1,
+    STATE(624), 1,
       sym_primitiveType,
-    STATE(1935), 1,
+    STATE(630), 1,
+      sym_className,
+    STATE(660), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1861), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(27), 5,
+    ACTIONS(2290), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48233] = 2,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(579), 14,
-      anon_sym_LT,
-      anon_sym_COMMA,
-      anon_sym_GT,
-      anon_sym_implements,
-      anon_sym_LBRACE,
-      anon_sym_EQ,
-      anon_sym_SEMI,
-      anon_sym_RPAREN,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_order,
-      anon_sym_COLON_COLON,
-  [48254] = 10,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    ACTIONS(2289), 1,
+  [48871] = 12,
+    ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(2291), 1,
+    ACTIONS(31), 1,
       sym__upper_id,
-    STATE(630), 1,
-      sym_primitiveType,
-    STATE(653), 1,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    STATE(1433), 1,
       sym_className,
-    STATE(660), 1,
+    STATE(1442), 1,
+      sym_primitiveType,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1761), 1,
       sym_typeExpr,
-    STATE(1940), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(2287), 5,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48291] = 10,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    ACTIONS(2295), 1,
+  [48913] = 12,
+    ACTIONS(29), 1,
       sym_dbtype,
-    ACTIONS(2297), 1,
+    ACTIONS(31), 1,
       sym__upper_id,
-    STATE(1097), 1,
-      sym_typeExpr,
-    STATE(1131), 1,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    STATE(1433), 1,
       sym_className,
-    STATE(1133), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1867), 1,
+    STATE(1524), 1,
+      sym_typeExpr,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-    ACTIONS(2293), 5,
+    ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48328] = 10,
+  [48955] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1981), 1,
-      sym_moduleExpr,
-    STATE(1990), 1,
+    STATE(1501), 1,
       sym_typeExpr,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48365] = 10,
+  [48997] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1523), 1,
+    STATE(1581), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48402] = 10,
+  [49039] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1535), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1897), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48439] = 6,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(2299), 1,
-      anon_sym_LT,
-    ACTIONS(2301), 1,
-      anon_sym_SLASH,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(583), 3,
-      anon_sym_LPAREN,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    ACTIONS(862), 8,
-      anon_sym_COMMA,
-      anon_sym_GT,
-      anon_sym_LBRACE,
-      anon_sym_EQ,
-      anon_sym_RPAREN,
-      anon_sym_DOT,
-      sym__upper_id,
-      sym__lower_id,
-  [48468] = 10,
+  [49081] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1536), 1,
+    STATE(1506), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48505] = 10,
+  [49123] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1549), 1,
+    STATE(1564), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48542] = 10,
+  [49165] = 12,
     ACTIONS(29), 1,
       sym_dbtype,
     ACTIONS(31), 1,
       sym__upper_id,
-    ACTIONS(2217), 1,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    STATE(1438), 1,
+    STATE(1433), 1,
       sym_className,
-    STATE(1443), 1,
+    STATE(1442), 1,
       sym_primitiveType,
-    STATE(1789), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1766), 1,
       sym_typeExpr,
-    STATE(1981), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1942), 1,
       sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
     ACTIONS(27), 5,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
       anon_sym_int,
       anon_sym_string,
-  [48579] = 4,
+  [49207] = 5,
+    ACTIONS(2296), 1,
+      anon_sym_SLASH,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(581), 2,
+      anon_sym_LT,
+      anon_sym_COLON_COLON,
+    ACTIONS(583), 3,
+      anon_sym_LPAREN,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    ACTIONS(854), 8,
+      anon_sym_COMMA,
+      anon_sym_GT,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
+      anon_sym_RPAREN,
+      anon_sym_DOT,
+      sym__upper_id,
+      sym__lower_id,
+  [49234] = 2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(581), 14,
+      anon_sym_LT,
+      anon_sym_COMMA,
+      anon_sym_GT,
+      anon_sym_implements,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+      anon_sym_RPAREN,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_order,
+      anon_sym_COLON_COLON,
+  [49255] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(933), 3,
+      anon_sym_or,
+      anon_sym_instanceof,
+      sym__lower_id,
+    ACTIONS(931), 8,
+      anon_sym_COMMA,
+      anon_sym_GT,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+      anon_sym_RPAREN,
+      anon_sym_DOT,
+      sym__upper_id,
+  [49275] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2305), 4,
+    ACTIONS(2300), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2303), 7,
+    ACTIONS(2298), 7,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -74548,17 +75332,34 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [48601] = 4,
+  [49297] = 3,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(921), 3,
+      anon_sym_or,
+      anon_sym_instanceof,
+      sym__lower_id,
+    ACTIONS(919), 8,
+      anon_sym_COMMA,
+      anon_sym_GT,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+      anon_sym_RPAREN,
+      anon_sym_DOT,
+      sym__upper_id,
+  [49317] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2309), 4,
+    ACTIONS(2304), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2307), 7,
+    ACTIONS(2302), 7,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -74566,17 +75367,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [48623] = 4,
+  [49339] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2313), 4,
+    ACTIONS(2308), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2311), 7,
+    ACTIONS(2306), 7,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -74584,17 +75385,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [48645] = 4,
+  [49361] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2317), 4,
+    ACTIONS(2312), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2315), 7,
+    ACTIONS(2310), 7,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -74602,17 +75403,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [48667] = 4,
+  [49383] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2321), 4,
+    ACTIONS(2316), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2319), 7,
+    ACTIONS(2314), 7,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -74620,34 +75421,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [48689] = 3,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(925), 3,
-      anon_sym_or,
-      anon_sym_instanceof,
-      sym__lower_id,
-    ACTIONS(923), 8,
-      anon_sym_COMMA,
-      anon_sym_GT,
-      anon_sym_LBRACE,
-      anon_sym_EQ,
-      anon_sym_SEMI,
-      anon_sym_RPAREN,
-      anon_sym_DOT,
-      sym__upper_id,
-  [48709] = 4,
+  [49405] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2325), 4,
+    ACTIONS(2320), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2323), 7,
+    ACTIONS(2318), 7,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -74655,36 +75439,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [48731] = 5,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(2299), 1,
-      anon_sym_LT,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(864), 3,
-      anon_sym_or,
-      anon_sym_instanceof,
-      sym__lower_id,
-    ACTIONS(862), 6,
-      anon_sym_COMMA,
-      anon_sym_LBRACE,
-      anon_sym_SEMI,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      sym__upper_id,
-  [48755] = 4,
+  [49427] = 4,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2329), 4,
+    ACTIONS(2324), 4,
       anon_sym_RBRACE,
       sym_qldoc,
       sym_dbtype,
       sym__upper_id,
-    ACTIONS(2327), 7,
+    ACTIONS(2322), 7,
       anon_sym_boolean,
       anon_sym_date,
       anon_sym_float,
@@ -74692,15 +75457,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_string,
       sym__lower_id,
       sym_predicate,
-  [48777] = 3,
+  [49449] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(919), 3,
+    ACTIONS(945), 3,
       anon_sym_or,
       anon_sym_instanceof,
       sym__lower_id,
-    ACTIONS(921), 8,
+    ACTIONS(943), 8,
       anon_sym_COMMA,
       anon_sym_GT,
       anon_sym_LBRACE,
@@ -74709,15 +75474,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
       anon_sym_DOT,
       sym__upper_id,
-  [48797] = 3,
+  [49469] = 3,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(933), 3,
+    ACTIONS(957), 3,
       anon_sym_or,
       anon_sym_instanceof,
       sym__lower_id,
-    ACTIONS(931), 8,
+    ACTIONS(955), 8,
       anon_sym_COMMA,
       anon_sym_GT,
       anon_sym_LBRACE,
@@ -74726,70 +75491,138 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
       anon_sym_DOT,
       sym__upper_id,
-  [48817] = 3,
+  [49489] = 4,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(929), 3,
+    ACTIONS(581), 2,
+      anon_sym_LT,
+      anon_sym_COLON_COLON,
+    ACTIONS(856), 3,
       anon_sym_or,
       anon_sym_instanceof,
       sym__lower_id,
-    ACTIONS(927), 8,
+    ACTIONS(854), 6,
       anon_sym_COMMA,
-      anon_sym_GT,
       anon_sym_LBRACE,
-      anon_sym_EQ,
       anon_sym_SEMI,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
-      anon_sym_DOT,
       sym__upper_id,
-  [48837] = 9,
-    ACTIONS(2331), 1,
-      sym__lower_id,
-    ACTIONS(2333), 1,
+  [49511] = 10,
+    ACTIONS(2328), 1,
       anon_sym_RPAREN,
-    ACTIONS(2335), 1,
-      sym__upper_id,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1622), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1695), 1,
       sym_predicateExpr,
-    STATE(1852), 1,
-      sym_moduleExpr,
-    STATE(1909), 1,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
       sym_aritylessPredicateExpr,
+    STATE(1886), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [48867] = 9,
-    ACTIONS(2331), 1,
-      sym__lower_id,
-    ACTIONS(2335), 1,
+    ACTIONS(2326), 2,
       sym__upper_id,
-    ACTIONS(2337), 1,
+      sym__lower_id,
+  [49544] = 10,
+    ACTIONS(2330), 1,
       anon_sym_RPAREN,
-    STATE(1593), 1,
+    STATE(1575), 1,
       sym_literalId,
-    STATE(1684), 1,
+    STATE(1650), 1,
       sym_predicateExpr,
-    STATE(1852), 1,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1886), 1,
       sym_moduleExpr,
-    STATE(1909), 1,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2326), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [49577] = 9,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
       sym_aritylessPredicateExpr,
+    STATE(1884), 1,
+      sym_predicateExpr,
+    STATE(1886), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
+    ACTIONS(2326), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [49607] = 9,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1757), 1,
+      sym_predicateExpr,
+    STATE(1776), 1,
       sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1886), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2326), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [49637] = 9,
+    STATE(1575), 1,
+      sym_literalId,
+    STATE(1668), 1,
       sym_simpleId,
-  [48897] = 2,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1806), 1,
+      sym_aritylessPredicateExpr,
+    STATE(1842), 1,
+      sym_predicateExpr,
+    STATE(1886), 1,
+      sym_moduleExpr,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2326), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [49667] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2339), 8,
+    ACTIONS(2332), 8,
       anon_sym_COMMA,
       anon_sym_GT,
       anon_sym_LBRACE,
@@ -74798,5026 +75631,5010 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
       sym__upper_id,
       sym__lower_id,
-  [48912] = 10,
+  [49682] = 10,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2341), 1,
+    ACTIONS(2334), 1,
       sym__lower_id,
-    ACTIONS(2343), 1,
+    ACTIONS(2336), 1,
       sym_qldoc,
-    ACTIONS(2345), 1,
+    ACTIONS(2338), 1,
       sym__upper_id,
-    STATE(1084), 1,
+    STATE(1114), 1,
       sym_datatypeBranch,
-    STATE(1217), 1,
+    STATE(1315), 1,
       sym_datatypeBranches,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1768), 1,
+    STATE(1782), 1,
       sym_annotation,
-    STATE(1984), 1,
+    STATE(1948), 1,
       sym_className,
-  [48943] = 8,
-    ACTIONS(2331), 1,
-      sym__lower_id,
-    ACTIONS(2335), 1,
-      sym__upper_id,
-    STATE(1593), 1,
-      sym_literalId,
-    STATE(1852), 1,
-      sym_moduleExpr,
-    STATE(1895), 1,
-      sym_predicateExpr,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [48970] = 10,
+  [49713] = 10,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2341), 1,
+    ACTIONS(2334), 1,
       sym__lower_id,
-    ACTIONS(2345), 1,
+    ACTIONS(2338), 1,
       sym__upper_id,
-    ACTIONS(2347), 1,
+    ACTIONS(2340), 1,
       sym_qldoc,
-    STATE(1091), 1,
+    STATE(1126), 1,
       sym_datatypeBranch,
-    STATE(1305), 1,
+    STATE(1307), 1,
       sym_datatypeBranches,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1782), 1,
+    STATE(1780), 1,
       sym_annotation,
-    STATE(1890), 1,
+    STATE(1805), 1,
       sym_className,
-  [49001] = 8,
-    ACTIONS(2331), 1,
+  [49744] = 9,
+    ACTIONS(3), 1,
+      sym_line_comment,
+    ACTIONS(5), 1,
+      sym_block_comment,
+    ACTIONS(2334), 1,
       sym__lower_id,
-    ACTIONS(2335), 1,
+    ACTIONS(2338), 1,
       sym__upper_id,
-    STATE(1593), 1,
-      sym_literalId,
+    ACTIONS(2340), 1,
+      sym_qldoc,
+    STATE(1218), 1,
+      sym_datatypeBranch,
+    STATE(1399), 1,
+      sym_annotName,
     STATE(1780), 1,
-      sym_predicateExpr,
-    STATE(1852), 1,
-      sym_moduleExpr,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
+      sym_annotation,
+    STATE(1805), 1,
+      sym_className,
+  [49772] = 5,
+    ACTIONS(1468), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2342), 1,
+      anon_sym_EQ,
+    ACTIONS(2344), 1,
+      anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [49028] = 8,
-    ACTIONS(2331), 1,
-      sym__lower_id,
-    ACTIONS(2335), 1,
+    STATE(1440), 4,
+      sym__optbody,
+      sym_empty,
+      sym_body,
+      sym_higherOrderTerm,
+  [49792] = 8,
+    ACTIONS(1683), 1,
       sym__upper_id,
-    STATE(1593), 1,
+    ACTIONS(2326), 1,
+      sym__lower_id,
+    STATE(1443), 1,
+      sym_className,
+    STATE(1560), 1,
       sym_literalId,
-    STATE(1851), 1,
-      sym_predicateExpr,
-    STATE(1852), 1,
-      sym_moduleExpr,
-    STATE(1909), 1,
-      sym_aritylessPredicateExpr,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [49055] = 5,
-    ACTIONS(1360), 1,
+  [49818] = 5,
+    ACTIONS(2346), 1,
+      anon_sym_LPAREN,
+    STATE(1567), 1,
+      sym_closure,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2348), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    STATE(951), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [49838] = 5,
+    ACTIONS(2350), 1,
+      anon_sym_LPAREN,
+    STATE(1591), 1,
+      sym_closure,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2348), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    STATE(709), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [49858] = 5,
+    ACTIONS(2352), 1,
+      anon_sym_LPAREN,
+    STATE(1558), 1,
+      sym_closure,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2348), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    STATE(930), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [49878] = 5,
+    ACTIONS(2354), 1,
+      anon_sym_LPAREN,
+    STATE(1543), 1,
+      sym_closure,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2348), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    STATE(483), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [49898] = 5,
+    ACTIONS(2356), 1,
+      anon_sym_LPAREN,
+    STATE(1523), 1,
+      sym_closure,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2348), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+    STATE(433), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [49918] = 5,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    ACTIONS(2349), 1,
+    ACTIONS(2342), 1,
       anon_sym_EQ,
-    ACTIONS(2351), 1,
+    ACTIONS(2344), 1,
       anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1436), 4,
+    STATE(1434), 4,
       sym__optbody,
       sym_empty,
       sym_body,
       sym_higherOrderTerm,
-  [49075] = 5,
-    ACTIONS(1360), 1,
+  [49938] = 5,
+    ACTIONS(1355), 1,
       anon_sym_LBRACE,
-    ACTIONS(2349), 1,
+    ACTIONS(2358), 1,
       anon_sym_EQ,
-    ACTIONS(2351), 1,
+    ACTIONS(2360), 1,
       anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1219), 4,
+    STATE(1380), 4,
       sym__optbody,
       sym_empty,
       sym_body,
       sym_higherOrderTerm,
-  [49095] = 9,
-    ACTIONS(3), 1,
-      sym_line_comment,
-    ACTIONS(5), 1,
-      sym_block_comment,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    ACTIONS(2347), 1,
-      sym_qldoc,
-    STATE(1199), 1,
-      sym_datatypeBranch,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1782), 1,
-      sym_annotation,
-    STATE(1890), 1,
-      sym_className,
-  [49123] = 5,
-    ACTIONS(1427), 1,
+  [49958] = 7,
+    ACTIONS(2362), 1,
       anon_sym_LBRACE,
-    ACTIONS(2353), 1,
+    ACTIONS(2364), 1,
       anon_sym_EQ,
-    ACTIONS(2355), 1,
+    ACTIONS(2366), 1,
       anon_sym_SEMI,
+    ACTIONS(2368), 1,
+      anon_sym_extends,
+    ACTIONS(2370), 1,
+      anon_sym_instanceof,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1330), 4,
-      sym__optbody,
-      sym_empty,
-      sym_body,
-      sym_higherOrderTerm,
-  [49143] = 5,
-    ACTIONS(1427), 1,
+    STATE(1291), 2,
+      sym_typeAliasBody,
+      sym_typeUnionBody,
+  [49982] = 5,
+    ACTIONS(1355), 1,
       anon_sym_LBRACE,
-    ACTIONS(2353), 1,
+    ACTIONS(2358), 1,
       anon_sym_EQ,
-    ACTIONS(2355), 1,
+    ACTIONS(2360), 1,
       anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1372), 4,
+    STATE(1328), 4,
       sym__optbody,
       sym_empty,
       sym_body,
       sym_higherOrderTerm,
-  [49163] = 9,
+  [50002] = 9,
     ACTIONS(3), 1,
       sym_line_comment,
     ACTIONS(5), 1,
       sym_block_comment,
-    ACTIONS(2341), 1,
+    ACTIONS(2334), 1,
       sym__lower_id,
-    ACTIONS(2343), 1,
+    ACTIONS(2336), 1,
       sym_qldoc,
-    ACTIONS(2345), 1,
+    ACTIONS(2338), 1,
       sym__upper_id,
-    STATE(1198), 1,
+    STATE(1220), 1,
       sym_datatypeBranch,
-    STATE(1388), 1,
+    STATE(1399), 1,
       sym_annotName,
-    STATE(1768), 1,
+    STATE(1782), 1,
       sym_annotation,
-    STATE(1984), 1,
+    STATE(1948), 1,
       sym_className,
-  [49191] = 5,
-    ACTIONS(1427), 1,
+  [50030] = 5,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    ACTIONS(2353), 1,
+    ACTIONS(2342), 1,
       anon_sym_EQ,
-    ACTIONS(2355), 1,
+    ACTIONS(2344), 1,
       anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1251), 4,
+    STATE(1362), 4,
       sym__optbody,
       sym_empty,
       sym_body,
       sym_higherOrderTerm,
-  [49211] = 5,
-    ACTIONS(2357), 1,
+  [50050] = 5,
+    ACTIONS(2372), 1,
       anon_sym_LPAREN,
-    STATE(1537), 1,
+    STATE(1573), 1,
       sym_closure,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
+    ACTIONS(2348), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    STATE(568), 3,
+    STATE(545), 3,
       sym_call_body,
       sym_unqual_agg_body,
       sym__call_or_unqual_agg_body,
-  [49231] = 7,
-    ACTIONS(2361), 1,
+  [50070] = 5,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    ACTIONS(2363), 1,
+    ACTIONS(2342), 1,
       anon_sym_EQ,
-    ACTIONS(2365), 1,
+    ACTIONS(2344), 1,
       anon_sym_SEMI,
-    ACTIONS(2367), 1,
-      anon_sym_extends,
-    ACTIONS(2369), 1,
-      anon_sym_instanceof,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1352), 2,
-      sym_typeAliasBody,
-      sym_typeUnionBody,
-  [49255] = 5,
-    ACTIONS(2371), 1,
+    STATE(1332), 4,
+      sym__optbody,
+      sym_empty,
+      sym_body,
+      sym_higherOrderTerm,
+  [50090] = 5,
+    ACTIONS(2374), 1,
       anon_sym_LPAREN,
-    STATE(1570), 1,
+    STATE(1528), 1,
       sym_closure,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
+    ACTIONS(2348), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-    STATE(746), 3,
+    STATE(539), 3,
       sym_call_body,
       sym_unqual_agg_body,
       sym__call_or_unqual_agg_body,
-  [49275] = 5,
-    ACTIONS(2373), 1,
-      anon_sym_LPAREN,
-    STATE(1590), 1,
-      sym_closure,
+  [50110] = 5,
+    ACTIONS(1355), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2358), 1,
+      anon_sym_EQ,
+    ACTIONS(2360), 1,
+      anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    STATE(989), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [49295] = 7,
-    ACTIONS(2375), 1,
+    STATE(1236), 4,
+      sym__optbody,
+      sym_empty,
+      sym_body,
+      sym_higherOrderTerm,
+  [50130] = 7,
+    ACTIONS(2376), 1,
       anon_sym_LBRACE,
-    ACTIONS(2377), 1,
+    ACTIONS(2378), 1,
       anon_sym_EQ,
-    ACTIONS(2379), 1,
+    ACTIONS(2380), 1,
       anon_sym_SEMI,
-    ACTIONS(2381), 1,
+    ACTIONS(2382), 1,
       anon_sym_extends,
-    ACTIONS(2383), 1,
+    ACTIONS(2384), 1,
       anon_sym_instanceof,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1329), 2,
+    STATE(1314), 2,
       sym_typeAliasBody,
       sym_typeUnionBody,
-  [49319] = 5,
-    ACTIONS(1360), 1,
+  [50154] = 5,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    ACTIONS(2349), 1,
+    ACTIONS(2342), 1,
       anon_sym_EQ,
-    ACTIONS(2351), 1,
+    ACTIONS(2344), 1,
       anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1268), 4,
-      sym__optbody,
-      sym_empty,
-      sym_body,
-      sym_higherOrderTerm,
-  [49339] = 5,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2349), 1,
-      anon_sym_EQ,
-    ACTIONS(2351), 1,
-      anon_sym_SEMI,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1437), 4,
+    STATE(1441), 4,
       sym__optbody,
       sym_empty,
       sym_body,
       sym_higherOrderTerm,
-  [49359] = 5,
-    ACTIONS(2385), 1,
-      anon_sym_LPAREN,
-    STATE(1572), 1,
-      sym_closure,
+  [50174] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    STATE(467), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [49379] = 5,
-    ACTIONS(1360), 1,
+    ACTIONS(699), 7,
+      anon_sym_COMMA,
+      anon_sym_SEMI,
+      anon_sym_RPAREN,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_PIPE,
+      anon_sym_order,
+  [50188] = 5,
+    ACTIONS(1468), 1,
       anon_sym_LBRACE,
-    ACTIONS(2349), 1,
+    ACTIONS(2342), 1,
       anon_sym_EQ,
-    ACTIONS(2351), 1,
+    ACTIONS(2344), 1,
       anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1322), 4,
+    STATE(1340), 4,
       sym__optbody,
       sym_empty,
       sym_body,
       sym_higherOrderTerm,
-  [49399] = 2,
+  [50208] = 4,
+    ACTIONS(2386), 1,
+      anon_sym_COMMA,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(702), 7,
-      anon_sym_COMMA,
-      anon_sym_SEMI,
+    ACTIONS(2389), 4,
       anon_sym_RPAREN,
       anon_sym_where,
       anon_sym_select,
       anon_sym_PIPE,
-      anon_sym_order,
-  [49413] = 5,
-    ACTIONS(2387), 1,
-      anon_sym_LPAREN,
-    STATE(1559), 1,
-      sym_closure,
+  [50225] = 7,
+    ACTIONS(2294), 1,
+      sym__upper_id,
+    ACTIONS(2391), 1,
+      sym__lower_id,
+    STATE(643), 1,
+      sym_className,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [50248] = 4,
+    ACTIONS(2296), 1,
+      anon_sym_SLASH,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
+    ACTIONS(581), 2,
+      anon_sym_LT,
+      anon_sym_COLON_COLON,
+    ACTIONS(583), 3,
+      anon_sym_LPAREN,
       anon_sym_PLUS,
       anon_sym_STAR,
-    STATE(492), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [49433] = 5,
-    ACTIONS(1360), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2349), 1,
-      anon_sym_EQ,
-    ACTIONS(2351), 1,
-      anon_sym_SEMI,
+  [50265] = 6,
+    ACTIONS(1912), 1,
+      sym__lower_id,
+    ACTIONS(2391), 1,
+      sym__upper_id,
+    STATE(1772), 1,
+      sym_annotArg,
+    STATE(1777), 1,
+      sym_simpleId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1441), 4,
-      sym__optbody,
-      sym_empty,
-      sym_body,
-      sym_higherOrderTerm,
-  [49453] = 5,
-    ACTIONS(2389), 1,
-      anon_sym_LPAREN,
-    STATE(1576), 1,
-      sym_closure,
+    ACTIONS(2393), 2,
+      sym_result,
+      sym_this,
+  [50286] = 6,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1762), 1,
+      sym_moduleExpr,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    STATE(541), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [49473] = 5,
+    ACTIONS(2391), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [50307] = 6,
+    STATE(1668), 1,
+      sym_simpleId,
+    STATE(1765), 1,
+      sym_moduleExpr,
+    STATE(1776), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2391), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [50328] = 7,
+    ACTIONS(2258), 1,
+      sym__upper_id,
     ACTIONS(2391), 1,
-      anon_sym_LPAREN,
-    STATE(1582), 1,
-      sym_closure,
+      sym__lower_id,
+    STATE(619), 1,
+      sym_className,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [50351] = 7,
+    ACTIONS(2264), 1,
+      sym__upper_id,
+    ACTIONS(2391), 1,
+      sym__lower_id,
+    STATE(628), 1,
+      sym_className,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-    STATE(906), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [49493] = 2,
+  [50374] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2393), 6,
+    ACTIONS(2395), 6,
       anon_sym_COMMA,
       anon_sym_GT,
       anon_sym_LBRACE,
       anon_sym_EQ,
       sym__upper_id,
       sym__lower_id,
-  [49506] = 6,
-    ACTIONS(1878), 1,
+  [50387] = 2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2397), 6,
+      anon_sym_COMMA,
+      anon_sym_GT,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
       sym__upper_id,
-    ACTIONS(2331), 1,
       sym__lower_id,
-    STATE(1442), 1,
+  [50400] = 7,
+    ACTIONS(2270), 1,
+      sym__upper_id,
+    ACTIONS(2391), 1,
+      sym__lower_id,
+    STATE(812), 1,
       sym_className,
-    STATE(1554), 1,
-      sym_literalId,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [49527] = 2,
+  [50423] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(862), 6,
+    ACTIONS(854), 6,
       anon_sym_LBRACE,
       anon_sym_EQ,
       anon_sym_SEMI,
       anon_sym_LPAREN,
       anon_sym_extends,
       anon_sym_instanceof,
-  [49540] = 6,
-    ACTIONS(2217), 1,
-      sym__lower_id,
-    ACTIONS(2395), 1,
+  [50436] = 7,
+    ACTIONS(2276), 1,
       sym__upper_id,
-    STATE(1778), 1,
+    ACTIONS(2391), 1,
+      sym__lower_id,
+    STATE(1145), 1,
+      sym_className,
+    STATE(1725), 1,
       sym_simpleId,
-    STATE(1787), 1,
-      sym_annotArg,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2397), 2,
-      sym_result,
-      sym_this,
-  [49561] = 6,
-    ACTIONS(2217), 1,
+  [50459] = 6,
+    ACTIONS(1912), 1,
       sym__lower_id,
-    ACTIONS(2395), 1,
+    ACTIONS(2391), 1,
       sym__upper_id,
-    STATE(1645), 1,
+    STATE(1674), 1,
       sym_annotArg,
-    STATE(1778), 1,
+    STATE(1777), 1,
       sym_simpleId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2397), 2,
+    ACTIONS(2393), 2,
       sym_result,
       sym_this,
-  [49582] = 4,
-    ACTIONS(2399), 1,
-      anon_sym_COMMA,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [50480] = 7,
+    ACTIONS(31), 1,
+      sym__upper_id,
+    ACTIONS(2391), 1,
+      sym__lower_id,
+    STATE(1443), 1,
+      sym_className,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2402), 4,
-      anon_sym_RPAREN,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_PIPE,
-  [49599] = 2,
+  [50503] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2404), 6,
+    ACTIONS(2399), 6,
       anon_sym_COMMA,
       anon_sym_SEMI,
       anon_sym_RPAREN,
       anon_sym_where,
       anon_sym_select,
       anon_sym_PIPE,
-  [49612] = 2,
+  [50516] = 7,
+    ACTIONS(2288), 1,
+      sym__upper_id,
+    ACTIONS(2391), 1,
+      sym__lower_id,
+    STATE(617), 1,
+      sym_className,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2406), 6,
-      anon_sym_COMMA,
-      anon_sym_GT,
-      anon_sym_LBRACE,
-      anon_sym_EQ,
+  [50539] = 7,
+    ACTIONS(2282), 1,
       sym__upper_id,
+    ACTIONS(2391), 1,
       sym__lower_id,
-  [49625] = 6,
-    ACTIONS(2408), 1,
-      anon_sym_COMMA,
-    ACTIONS(2410), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2412), 1,
-      anon_sym_EQ,
-    STATE(1359), 1,
-      sym_moduleAliasBody,
-    STATE(1488), 1,
-      aux_sym_module_repeat2,
+    STATE(1137), 1,
+      sym_className,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [50562] = 6,
+    STATE(1560), 1,
+      sym_literalId,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49645] = 5,
-    ACTIONS(2273), 1,
+    ACTIONS(2326), 2,
       sym__upper_id,
-    ACTIONS(2395), 1,
       sym__lower_id,
-    STATE(1118), 1,
-      sym_className,
+  [50583] = 6,
+    ACTIONS(2401), 1,
+      anon_sym_COMMA,
+    ACTIONS(2403), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2405), 1,
+      anon_sym_EQ,
+    STATE(1298), 1,
+      sym_moduleAliasBody,
+    STATE(1516), 1,
+      aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [49663] = 6,
-    ACTIONS(2408), 1,
+  [50603] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-    ACTIONS(2414), 1,
+    ACTIONS(2407), 1,
       anon_sym_LBRACE,
-    ACTIONS(2416), 1,
+    ACTIONS(2409), 1,
       anon_sym_EQ,
-    STATE(1279), 1,
+    STATE(1366), 1,
       sym_moduleAliasBody,
-    STATE(1507), 1,
+    STATE(1517), 1,
       aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49683] = 6,
-    ACTIONS(2408), 1,
+  [50623] = 6,
+    ACTIONS(2411), 1,
+      anon_sym_COMMA,
+    ACTIONS(2413), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2415), 1,
+      anon_sym_SEMI,
+    ACTIONS(2417), 1,
+      anon_sym_instanceof,
+    STATE(1515), 1,
+      aux_sym_dataclass_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [50643] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-    ACTIONS(2416), 1,
+    ACTIONS(2409), 1,
       anon_sym_EQ,
-    ACTIONS(2418), 1,
+    ACTIONS(2419), 1,
       anon_sym_LBRACE,
-    STATE(1218), 1,
+    STATE(1321), 1,
       sym_moduleAliasBody,
-    STATE(1531), 1,
+    STATE(1535), 1,
       aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49703] = 5,
-    ACTIONS(2267), 1,
+  [50663] = 2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2389), 5,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_where,
+      anon_sym_select,
+      anon_sym_PIPE,
+  [50675] = 6,
+    ACTIONS(2391), 1,
       sym__upper_id,
-    ACTIONS(2395), 1,
+    ACTIONS(2421), 1,
       sym__lower_id,
-    STATE(810), 1,
-      sym_className,
+    STATE(1473), 1,
+      sym_simpleId,
+    STATE(1490), 1,
+      sym_varName,
+    STATE(1887), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
+  [50695] = 5,
+    STATE(860), 1,
       sym_simpleId,
-  [49721] = 5,
-    ACTIONS(2420), 1,
-      anon_sym_DOT,
-    STATE(1469), 1,
-      sym_simpleId,
-    STATE(1480), 1,
-      sym_varName,
+    STATE(1012), 1,
+      sym_qualModuleExpr,
+    STATE(1207), 1,
+      sym_importModuleExpr,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2395), 2,
+    ACTIONS(2423), 2,
       sym__upper_id,
       sym__lower_id,
-  [49739] = 6,
-    ACTIONS(2408), 1,
+  [50713] = 6,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2412), 1,
-      anon_sym_EQ,
-    ACTIONS(2422), 1,
+    ACTIONS(2425), 1,
       anon_sym_LBRACE,
-    STATE(1328), 1,
-      sym_moduleAliasBody,
-    STATE(1531), 1,
-      aux_sym_module_repeat2,
+    ACTIONS(2427), 1,
+      anon_sym_SEMI,
+    ACTIONS(2429), 1,
+      anon_sym_instanceof,
+    STATE(1496), 1,
+      aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49759] = 6,
-    ACTIONS(2416), 1,
-      anon_sym_EQ,
-    ACTIONS(2424), 1,
-      anon_sym_LT,
-    ACTIONS(2426), 1,
-      anon_sym_implements,
-    ACTIONS(2428), 1,
-      anon_sym_LBRACE,
-    STATE(1380), 1,
-      sym_moduleAliasBody,
+  [50733] = 5,
+    STATE(1725), 1,
+      sym_simpleId,
+    STATE(1755), 1,
+      sym_moduleInstantiation,
+    STATE(1971), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49779] = 6,
-    ACTIONS(2408), 1,
+    ACTIONS(2391), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [50751] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-    ACTIONS(2412), 1,
+    ACTIONS(2409), 1,
       anon_sym_EQ,
-    ACTIONS(2430), 1,
+    ACTIONS(2431), 1,
       anon_sym_LBRACE,
-    STATE(1223), 1,
+    STATE(1349), 1,
       sym_moduleAliasBody,
-    STATE(1512), 1,
+    STATE(1497), 1,
       aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49799] = 6,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    ACTIONS(2345), 1,
+  [50771] = 5,
+    STATE(870), 1,
+      sym_simpleId,
+    STATE(976), 1,
+      sym_qualModuleExpr,
+    STATE(1205), 1,
+      sym_importModuleExpr,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2433), 2,
       sym__upper_id,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1792), 1,
-      sym_annotation,
-    STATE(1839), 1,
-      sym_className,
+      sym__lower_id,
+  [50789] = 6,
+    ACTIONS(2401), 1,
+      anon_sym_COMMA,
+    ACTIONS(2409), 1,
+      anon_sym_EQ,
+    ACTIONS(2435), 1,
+      anon_sym_LBRACE,
+    STATE(1367), 1,
+      sym_moduleAliasBody,
+    STATE(1535), 1,
+      aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49819] = 2,
+  [50809] = 6,
+    ACTIONS(2411), 1,
+      anon_sym_COMMA,
+    ACTIONS(2437), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2439), 1,
+      anon_sym_SEMI,
+    ACTIONS(2441), 1,
+      anon_sym_instanceof,
+    STATE(1509), 1,
+      aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2402), 5,
+  [50829] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_where,
-      anon_sym_select,
-      anon_sym_PIPE,
-  [49831] = 5,
-    STATE(875), 1,
-      sym_simpleId,
-    STATE(926), 1,
-      sym_qualModuleExpr,
-    STATE(1184), 1,
-      sym_importModuleExpr,
+    ACTIONS(2409), 1,
+      anon_sym_EQ,
+    ACTIONS(2443), 1,
+      anon_sym_LBRACE,
+    STATE(1343), 1,
+      sym_moduleAliasBody,
+    STATE(1505), 1,
+      aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2432), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [49849] = 6,
-    ACTIONS(2408), 1,
+  [50849] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-    ACTIONS(2416), 1,
+    ACTIONS(2405), 1,
       anon_sym_EQ,
-    ACTIONS(2434), 1,
+    ACTIONS(2445), 1,
       anon_sym_LBRACE,
-    STATE(1257), 1,
+    STATE(1383), 1,
       sym_moduleAliasBody,
-    STATE(1485), 1,
+    STATE(1535), 1,
       aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49869] = 6,
-    ACTIONS(2436), 1,
+  [50869] = 6,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2438), 1,
+    ACTIONS(2447), 1,
       anon_sym_LBRACE,
-    ACTIONS(2440), 1,
+    ACTIONS(2449), 1,
       anon_sym_SEMI,
-    ACTIONS(2442), 1,
+    ACTIONS(2451), 1,
       anon_sym_instanceof,
-    STATE(1514), 1,
+    STATE(1515), 1,
       aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49889] = 5,
-    ACTIONS(2444), 1,
+  [50889] = 6,
+    ACTIONS(2334), 1,
+      sym__lower_id,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1781), 1,
+      sym_annotation,
+    STATE(1809), 1,
+      sym_className,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [50909] = 6,
+    ACTIONS(2334), 1,
+      sym__lower_id,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1399), 1,
+      sym_annotName,
+    STATE(1773), 1,
+      sym_annotation,
+    STATE(1846), 1,
+      sym_className,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [50929] = 6,
+    ACTIONS(2405), 1,
+      anon_sym_EQ,
+    ACTIONS(2453), 1,
+      anon_sym_LT,
+    ACTIONS(2455), 1,
+      anon_sym_implements,
+    ACTIONS(2457), 1,
+      anon_sym_LBRACE,
+    STATE(1261), 1,
+      sym_moduleAliasBody,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [50949] = 5,
+    ACTIONS(2459), 1,
       anon_sym_DOT,
-    STATE(1469), 1,
+    STATE(1473), 1,
       sym_simpleId,
-    STATE(1480), 1,
+    STATE(1490), 1,
       sym_varName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2395), 2,
+    ACTIONS(2391), 2,
       sym__upper_id,
       sym__lower_id,
-  [49907] = 6,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    ACTIONS(2345), 1,
+  [50967] = 5,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    STATE(1473), 1,
+      sym_simpleId,
+    STATE(1490), 1,
+      sym_varName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2391), 2,
       sym__upper_id,
-    STATE(1388), 1,
-      sym_annotName,
-    STATE(1764), 1,
-      sym_annotation,
-    STATE(1942), 1,
-      sym_className,
+      sym__lower_id,
+  [50985] = 4,
+    ACTIONS(2463), 1,
+      anon_sym_COMMA,
+    STATE(1515), 1,
+      aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49927] = 6,
-    ACTIONS(2408), 1,
+    ACTIONS(2466), 3,
+      anon_sym_LBRACE,
+      anon_sym_SEMI,
+      anon_sym_instanceof,
+  [51001] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-    ACTIONS(2416), 1,
+    ACTIONS(2405), 1,
       anon_sym_EQ,
-    ACTIONS(2446), 1,
+    ACTIONS(2468), 1,
       anon_sym_LBRACE,
-    STATE(1258), 1,
+    STATE(1278), 1,
       sym_moduleAliasBody,
-    STATE(1531), 1,
+    STATE(1535), 1,
       aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49947] = 6,
-    ACTIONS(2408), 1,
+  [51021] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-    ACTIONS(2412), 1,
+    ACTIONS(2409), 1,
       anon_sym_EQ,
-    ACTIONS(2448), 1,
+    ACTIONS(2470), 1,
       anon_sym_LBRACE,
-    STATE(1300), 1,
+    STATE(1288), 1,
       sym_moduleAliasBody,
-    STATE(1531), 1,
+    STATE(1535), 1,
       aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [49967] = 5,
-    ACTIONS(2285), 1,
-      sym__upper_id,
-    ACTIONS(2395), 1,
-      sym__lower_id,
-    STATE(603), 1,
-      sym_className,
+  [51041] = 6,
+    ACTIONS(2401), 1,
+      anon_sym_COMMA,
+    ACTIONS(2405), 1,
+      anon_sym_EQ,
+    ACTIONS(2472), 1,
+      anon_sym_LBRACE,
+    STATE(1377), 1,
+      sym_moduleAliasBody,
+    STATE(1508), 1,
+      aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [49985] = 5,
-    ACTIONS(2395), 1,
-      sym__lower_id,
-    ACTIONS(2450), 1,
-      sym__upper_id,
-    STATE(1781), 1,
-      sym_moduleExpr,
+  [51061] = 6,
+    ACTIONS(2401), 1,
+      anon_sym_COMMA,
+    ACTIONS(2405), 1,
+      anon_sym_EQ,
+    ACTIONS(2474), 1,
+      anon_sym_LBRACE,
+    STATE(1301), 1,
+      sym_moduleAliasBody,
+    STATE(1535), 1,
+      aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50003] = 4,
-    ACTIONS(2452), 1,
+  [51081] = 6,
+    ACTIONS(2409), 1,
+      anon_sym_EQ,
+    ACTIONS(2476), 1,
+      anon_sym_LT,
+    ACTIONS(2478), 1,
+      anon_sym_implements,
+    ACTIONS(2480), 1,
+      anon_sym_LBRACE,
+    STATE(1277), 1,
+      sym_moduleAliasBody,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51101] = 6,
+    ACTIONS(2401), 1,
       anon_sym_COMMA,
-    STATE(1502), 1,
-      aux_sym_dataclass_repeat1,
+    ACTIONS(2405), 1,
+      anon_sym_EQ,
+    ACTIONS(2482), 1,
+      anon_sym_LBRACE,
+    STATE(1330), 1,
+      sym_moduleAliasBody,
+    STATE(1519), 1,
+      aux_sym_module_repeat2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51121] = 5,
+    ACTIONS(1713), 1,
+      anon_sym_select,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2486), 1,
+      anon_sym_where,
+    STATE(1574), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51138] = 3,
+    ACTIONS(2356), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2455), 3,
+    STATE(452), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [51151] = 5,
+    ACTIONS(2411), 1,
+      anon_sym_COMMA,
+    ACTIONS(2488), 1,
       anon_sym_LBRACE,
+    ACTIONS(2490), 1,
       anon_sym_SEMI,
-      anon_sym_instanceof,
-  [50019] = 5,
-    STATE(863), 1,
-      sym_simpleId,
-    STATE(884), 1,
-      sym_qualModuleExpr,
-    STATE(1211), 1,
-      sym_importModuleExpr,
+    STATE(1551), 1,
+      aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2457), 2,
-      sym__upper_id,
+  [51168] = 5,
+    ACTIONS(2492), 1,
       sym__lower_id,
-  [50037] = 4,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(2301), 1,
-      anon_sym_SLASH,
+    ACTIONS(2494), 1,
+      anon_sym_LPAREN,
+    STATE(446), 1,
+      sym_qualifiedRhs,
+    STATE(1526), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(583), 3,
+  [51185] = 4,
+    ACTIONS(2496), 1,
       anon_sym_LPAREN,
+    STATE(1844), 1,
+      sym_closure,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2348), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-  [50053] = 5,
-    ACTIONS(2395), 1,
-      sym__lower_id,
-    ACTIONS(2450), 1,
+  [51200] = 4,
+    STATE(1054), 1,
+      sym_varName,
+    STATE(1178), 1,
+      sym_simpleId,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2433), 2,
       sym__upper_id,
-    STATE(1776), 1,
-      sym_moduleExpr,
+      sym__lower_id,
+  [51215] = 3,
+    ACTIONS(2374), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1759), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50071] = 6,
-    ACTIONS(2436), 1,
+    STATE(488), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [51228] = 5,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2459), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2461), 1,
-      anon_sym_SEMI,
-    ACTIONS(2463), 1,
-      anon_sym_instanceof,
-    STATE(1519), 1,
-      aux_sym_dataclass_repeat1,
+    ACTIONS(2498), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2500), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50091] = 6,
-    ACTIONS(2408), 1,
+  [51245] = 5,
+    ACTIONS(1824), 1,
+      anon_sym_select,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2416), 1,
-      anon_sym_EQ,
-    ACTIONS(2465), 1,
-      anon_sym_LBRACE,
-    STATE(1290), 1,
-      sym_moduleAliasBody,
-    STATE(1531), 1,
-      aux_sym_module_repeat2,
+    ACTIONS(2502), 1,
+      anon_sym_where,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50111] = 5,
-    ACTIONS(2291), 1,
-      sym__upper_id,
-    ACTIONS(2395), 1,
+  [51262] = 5,
+    ACTIONS(2492), 1,
       sym__lower_id,
-    STATE(633), 1,
-      sym_className,
+    ACTIONS(2504), 1,
+      anon_sym_LPAREN,
+    STATE(502), 1,
+      sym_qualifiedRhs,
+    STATE(1580), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50129] = 5,
-    ACTIONS(2261), 1,
-      sym__upper_id,
-    ACTIONS(2395), 1,
-      sym__lower_id,
-    STATE(642), 1,
-      sym_className,
+  [51279] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2506), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2508), 1,
+      anon_sym_PIPE,
+    STATE(1550), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50147] = 5,
-    ACTIONS(2297), 1,
-      sym__upper_id,
-    ACTIONS(2395), 1,
-      sym__lower_id,
-    STATE(1093), 1,
-      sym_className,
+  [51296] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2510), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2512), 1,
+      anon_sym_PIPE,
+    STATE(1529), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50165] = 6,
-    ACTIONS(2408), 1,
+  [51313] = 5,
+    ACTIONS(403), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2412), 1,
-      anon_sym_EQ,
-    ACTIONS(2467), 1,
-      anon_sym_LBRACE,
-    STATE(1373), 1,
-      sym_moduleAliasBody,
-    STATE(1499), 1,
-      aux_sym_module_repeat2,
+    ACTIONS(2514), 1,
+      anon_sym_PIPE,
+    STATE(1585), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50185] = 6,
-    ACTIONS(2408), 1,
+  [51330] = 4,
+    ACTIONS(2516), 1,
       anon_sym_COMMA,
-    ACTIONS(2412), 1,
-      anon_sym_EQ,
-    ACTIONS(2469), 1,
-      anon_sym_LBRACE,
-    STATE(1263), 1,
-      sym_moduleAliasBody,
-    STATE(1531), 1,
+    STATE(1535), 1,
       aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50205] = 5,
-    ACTIONS(31), 1,
+    ACTIONS(2519), 2,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
+  [51345] = 4,
+    STATE(1242), 1,
+      sym_simpleId,
+    STATE(1300), 1,
+      sym_moduleName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2433), 2,
       sym__upper_id,
-    ACTIONS(2395), 1,
       sym__lower_id,
-    STATE(1442), 1,
-      sym_className,
+  [51360] = 4,
+    STATE(1251), 1,
+      sym_simpleId,
+    STATE(1331), 1,
+      sym_moduleName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50223] = 6,
-    ACTIONS(2436), 1,
+    ACTIONS(2423), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [51375] = 4,
+    ACTIONS(2521), 1,
+      anon_sym_COMMA,
+    STATE(1592), 1,
+      aux_sym_asExprs_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(1406), 2,
+      anon_sym_RPAREN,
+      anon_sym_order,
+  [51390] = 5,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2471), 1,
+    ACTIONS(2523), 1,
       anon_sym_LBRACE,
-    ACTIONS(2473), 1,
+    ACTIONS(2525), 1,
       anon_sym_SEMI,
-    ACTIONS(2475), 1,
-      anon_sym_instanceof,
-    STATE(1502), 1,
+    STATE(1515), 1,
       aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50243] = 5,
-    ACTIONS(2279), 1,
-      sym__upper_id,
-    ACTIONS(2395), 1,
+  [51407] = 5,
+    ACTIONS(2411), 1,
+      anon_sym_COMMA,
+    ACTIONS(2527), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2529), 1,
+      anon_sym_SEMI,
+    STATE(1515), 1,
+      aux_sym_dataclass_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51424] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2531), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2533), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51441] = 5,
+    ACTIONS(2492), 1,
       sym__lower_id,
-    STATE(614), 1,
-      sym_className,
+    ACTIONS(2535), 1,
+      anon_sym_LPAREN,
+    STATE(518), 1,
+      sym_qualifiedRhs,
+    STATE(1549), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50261] = 6,
-    ACTIONS(2412), 1,
+  [51458] = 3,
+    ACTIONS(2354), 1,
+      anon_sym_LPAREN,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    STATE(523), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [51471] = 5,
+    ACTIONS(2405), 1,
       anon_sym_EQ,
-    ACTIONS(2477), 1,
-      anon_sym_LT,
-    ACTIONS(2479), 1,
+    ACTIONS(2537), 1,
       anon_sym_implements,
-    ACTIONS(2481), 1,
+    ACTIONS(2539), 1,
       anon_sym_LBRACE,
-    STATE(1370), 1,
+    STATE(1374), 1,
       sym_moduleAliasBody,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50281] = 6,
-    ACTIONS(2395), 1,
-      sym__upper_id,
-    ACTIONS(2483), 1,
-      sym__lower_id,
-    STATE(1469), 1,
+  [51488] = 4,
+    STATE(1473), 1,
       sym_simpleId,
-    STATE(1480), 1,
+    STATE(1682), 1,
       sym_varName,
-    STATE(1823), 1,
-      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50301] = 5,
-    ACTIONS(2331), 1,
-      sym__lower_id,
-    ACTIONS(2335), 1,
+    ACTIONS(2391), 2,
       sym__upper_id,
-    STATE(1554), 1,
-      sym_literalId,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
-      sym_simpleId,
-  [50319] = 6,
-    ACTIONS(2436), 1,
+      sym__lower_id,
+  [51503] = 5,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2485), 1,
+    ACTIONS(2541), 1,
       anon_sym_LBRACE,
-    ACTIONS(2487), 1,
+    ACTIONS(2543), 1,
       anon_sym_SEMI,
-    ACTIONS(2489), 1,
-      anon_sym_instanceof,
-    STATE(1502), 1,
+    STATE(1576), 1,
       aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50339] = 6,
-    ACTIONS(2408), 1,
-      anon_sym_COMMA,
-    ACTIONS(2416), 1,
+  [51520] = 5,
+    ACTIONS(2409), 1,
       anon_sym_EQ,
-    ACTIONS(2491), 1,
+    ACTIONS(2545), 1,
+      anon_sym_implements,
+    ACTIONS(2547), 1,
       anon_sym_LBRACE,
-    STATE(1317), 1,
+    STATE(1272), 1,
       sym_moduleAliasBody,
-    STATE(1498), 1,
-      aux_sym_module_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50359] = 4,
-    ACTIONS(2493), 1,
+  [51537] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2549), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2551), 1,
+      anon_sym_PIPE,
+    STATE(1557), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51554] = 4,
+    ACTIONS(2553), 1,
       anon_sym_LPAREN,
-    STATE(1820), 1,
+    STATE(1917), 1,
       sym_closure,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
+    ACTIONS(2348), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-  [50374] = 5,
-    ACTIONS(2436), 1,
+  [51569] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2555), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2557), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51586] = 5,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2495), 1,
+    ACTIONS(2559), 1,
       anon_sym_LBRACE,
-    ACTIONS(2497), 1,
+    ACTIONS(2561), 1,
       anon_sym_SEMI,
-    STATE(1502), 1,
+    STATE(1515), 1,
       aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50391] = 5,
-    ACTIONS(2436), 1,
-      anon_sym_COMMA,
-    ACTIONS(2499), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2501), 1,
-      anon_sym_SEMI,
-    STATE(1548), 1,
-      aux_sym_dataclass_repeat1,
+  [51603] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2563), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2565), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51620] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2567), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2569), 1,
+      anon_sym_PIPE,
+    STATE(1541), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51637] = 4,
+    ACTIONS(2571), 1,
+      anon_sym_LPAREN,
+    STATE(1863), 1,
+      sym_closure,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2348), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+  [51652] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2573), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2575), 1,
+      anon_sym_PIPE,
+    STATE(1552), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [51669] = 4,
+    STATE(1520), 1,
+      sym_moduleName,
+    STATE(1586), 1,
+      sym_simpleId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50408] = 5,
-    ACTIONS(407), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2503), 1,
+    ACTIONS(2391), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [51684] = 5,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2505), 1,
+    ACTIONS(2577), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2579), 1,
       anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50425] = 5,
-    ACTIONS(2436), 1,
-      anon_sym_COMMA,
-    ACTIONS(2507), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2509), 1,
-      anon_sym_SEMI,
-    STATE(1502), 1,
-      aux_sym_dataclass_repeat1,
+  [51701] = 3,
+    ACTIONS(2352), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50442] = 2,
+    STATE(896), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [51714] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1929), 4,
-      anon_sym_LT,
-      anon_sym_implements,
-      anon_sym_LBRACE,
+    ACTIONS(2581), 4,
       anon_sym_EQ,
-  [50453] = 5,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2511), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2513), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+      anon_sym_LPAREN,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+  [51725] = 3,
+    ACTIONS(2585), 1,
+      anon_sym_SLASH,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2583), 3,
+      anon_sym_LPAREN,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+  [51738] = 5,
+    ACTIONS(2492), 1,
+      sym__lower_id,
+    ACTIONS(2587), 1,
+      anon_sym_LPAREN,
+    STATE(904), 1,
+      sym_qualifiedRhs,
+    STATE(1584), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50470] = 5,
-    ACTIONS(2503), 1,
+  [51755] = 5,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2515), 1,
+    ACTIONS(2589), 1,
       anon_sym_RPAREN,
-    ACTIONS(2517), 1,
+    ACTIONS(2591), 1,
       anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50487] = 5,
-    ACTIONS(2412), 1,
+  [51772] = 5,
+    ACTIONS(2405), 1,
       anon_sym_EQ,
-    ACTIONS(2519), 1,
+    ACTIONS(2593), 1,
       anon_sym_implements,
-    ACTIONS(2521), 1,
+    ACTIONS(2595), 1,
       anon_sym_LBRACE,
-    STATE(1336), 1,
+    STATE(1357), 1,
       sym_moduleAliasBody,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50504] = 5,
-    ACTIONS(2416), 1,
-      anon_sym_EQ,
-    ACTIONS(2523), 1,
-      anon_sym_implements,
-    ACTIONS(2525), 1,
+  [51789] = 5,
+    ACTIONS(2411), 1,
+      anon_sym_COMMA,
+    ACTIONS(2597), 1,
       anon_sym_LBRACE,
-    STATE(1324), 1,
-      sym_moduleAliasBody,
+    ACTIONS(2599), 1,
+      anon_sym_SEMI,
+    STATE(1539), 1,
+      aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50521] = 4,
-    ACTIONS(2527), 1,
+  [51806] = 4,
+    ACTIONS(2521), 1,
       anon_sym_COMMA,
-    STATE(1531), 1,
-      aux_sym_module_repeat2,
+    STATE(1538), 1,
+      aux_sym_asExprs_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2530), 2,
-      anon_sym_LBRACE,
-      anon_sym_EQ,
-  [50536] = 4,
-    ACTIONS(2532), 1,
-      anon_sym_LPAREN,
-    STATE(1936), 1,
-      sym_closure,
+    ACTIONS(1366), 2,
+      anon_sym_RPAREN,
+      anon_sym_order,
+  [51821] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2601), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2603), 1,
+      anon_sym_PIPE,
+    STATE(1562), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-  [50551] = 5,
-    ACTIONS(2436), 1,
-      anon_sym_COMMA,
-    ACTIONS(2534), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2536), 1,
-      anon_sym_SEMI,
-    STATE(1502), 1,
-      aux_sym_dataclass_repeat1,
+  [51838] = 3,
+    ACTIONS(2346), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50568] = 4,
-    ACTIONS(2538), 1,
+    STATE(880), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [51851] = 4,
+    ACTIONS(2605), 1,
       anon_sym_LPAREN,
-    STATE(1842), 1,
+    STATE(1867), 1,
       sym_closure,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
+    ACTIONS(2348), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-  [50583] = 2,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(2455), 4,
-      anon_sym_COMMA,
-      anon_sym_LBRACE,
-      anon_sym_SEMI,
-      anon_sym_instanceof,
-  [50594] = 5,
-    ACTIONS(2436), 1,
-      anon_sym_COMMA,
-    ACTIONS(2540), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2542), 1,
-      anon_sym_SEMI,
-    STATE(1550), 1,
-      aux_sym_dataclass_repeat1,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [50611] = 3,
-    ACTIONS(2357), 1,
+  [51866] = 5,
+    ACTIONS(2492), 1,
+      sym__lower_id,
+    ACTIONS(2607), 1,
       anon_sym_LPAREN,
+    STATE(1018), 1,
+      sym_qualifiedRhs,
+    STATE(1594), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(549), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [50624] = 4,
-    ACTIONS(2395), 1,
+  [51883] = 5,
+    ACTIONS(2492), 1,
       sym__lower_id,
-    ACTIONS(2450), 1,
-      sym__upper_id,
+    ACTIONS(2609), 1,
+      anon_sym_LPAREN,
+    STATE(556), 1,
+      sym_qualifiedRhs,
+    STATE(1554), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(1779), 2,
-      sym_moduleInstantiation,
+  [51900] = 4,
+    STATE(1512), 1,
+      sym_moduleName,
+    STATE(1586), 1,
       sym_simpleId,
-  [50639] = 5,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2544), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2546), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50656] = 5,
-    ACTIONS(2548), 1,
+    ACTIONS(2391), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [51915] = 5,
+    ACTIONS(2492), 1,
       sym__lower_id,
-    ACTIONS(2550), 1,
+    ACTIONS(2611), 1,
       anon_sym_LPAREN,
-    STATE(553), 1,
+    STATE(719), 1,
       sym_qualifiedRhs,
-    STATE(1534), 1,
+    STATE(1568), 1,
       sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50673] = 5,
-    ACTIONS(2412), 1,
-      anon_sym_EQ,
-    ACTIONS(2552), 1,
-      anon_sym_implements,
-    ACTIONS(2554), 1,
-      anon_sym_LBRACE,
-    STATE(1261), 1,
-      sym_moduleAliasBody,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [50690] = 5,
-    ACTIONS(2416), 1,
-      anon_sym_EQ,
-    ACTIONS(2556), 1,
-      anon_sym_implements,
-    ACTIONS(2558), 1,
-      anon_sym_LBRACE,
-    STATE(1272), 1,
-      sym_moduleAliasBody,
+  [51932] = 3,
+    ACTIONS(2372), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50707] = 5,
-    ACTIONS(1717), 1,
+    STATE(565), 3,
+      sym_call_body,
+      sym_unqual_agg_body,
+      sym__call_or_unqual_agg_body,
+  [51945] = 5,
+    ACTIONS(1721), 1,
       anon_sym_select,
-    ACTIONS(2503), 1,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2560), 1,
+    ACTIONS(2613), 1,
       anon_sym_where,
-    STATE(1479), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50724] = 5,
-    ACTIONS(2436), 1,
+  [51962] = 3,
+    ACTIONS(2617), 1,
+      anon_sym_SLASH,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2615), 3,
+      anon_sym_LPAREN,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+  [51975] = 5,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2562), 1,
+    ACTIONS(2619), 1,
       anon_sym_LBRACE,
-    ACTIONS(2564), 1,
+    ACTIONS(2621), 1,
       anon_sym_SEMI,
-    STATE(1525), 1,
+    STATE(1515), 1,
       aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50741] = 5,
-    ACTIONS(1789), 1,
-      anon_sym_select,
-    ACTIONS(2503), 1,
+  [51992] = 5,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2566), 1,
-      anon_sym_where,
-    STATE(1543), 1,
+    ACTIONS(2623), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2625), 1,
+      anon_sym_SEMI,
+    STATE(1540), 1,
+      aux_sym_dataclass_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [52009] = 5,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2627), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2629), 1,
+      anon_sym_PIPE,
+    STATE(1587), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50758] = 4,
-    STATE(1489), 1,
-      sym_moduleName,
-    STATE(1526), 1,
-      sym_simpleId,
+  [52026] = 5,
+    ACTIONS(2411), 1,
+      anon_sym_COMMA,
+    ACTIONS(2631), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2633), 1,
+      anon_sym_SEMI,
+    STATE(1515), 1,
+      aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2395), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [50773] = 4,
-    ACTIONS(2568), 1,
+  [52043] = 4,
+    ACTIONS(2635), 1,
       anon_sym_LPAREN,
-    STATE(1863), 1,
+    STATE(1812), 1,
       sym_closure,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
+    ACTIONS(2348), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-  [50788] = 5,
-    ACTIONS(2436), 1,
+  [52058] = 5,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2570), 1,
+    ACTIONS(2637), 1,
       anon_sym_LBRACE,
-    ACTIONS(2572), 1,
+    ACTIONS(2639), 1,
       anon_sym_SEMI,
-    STATE(1502), 1,
+    STATE(1579), 1,
       aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50805] = 5,
-    ACTIONS(2436), 1,
-      anon_sym_COMMA,
-    ACTIONS(2574), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2576), 1,
-      anon_sym_SEMI,
-    STATE(1573), 1,
-      aux_sym_dataclass_repeat1,
+  [52075] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50822] = 5,
-    ACTIONS(2436), 1,
+    ACTIONS(2466), 4,
       anon_sym_COMMA,
-    ACTIONS(2578), 1,
       anon_sym_LBRACE,
-    ACTIONS(2580), 1,
       anon_sym_SEMI,
-    STATE(1502), 1,
-      aux_sym_dataclass_repeat1,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [50839] = 5,
-    ACTIONS(2436), 1,
+      anon_sym_instanceof,
+  [52086] = 5,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
-    ACTIONS(2582), 1,
+    ACTIONS(2641), 1,
       anon_sym_LBRACE,
-    ACTIONS(2584), 1,
+    ACTIONS(2643), 1,
       anon_sym_SEMI,
-    STATE(1533), 1,
+    STATE(1515), 1,
       aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50856] = 5,
-    ACTIONS(2436), 1,
-      anon_sym_COMMA,
-    ACTIONS(2586), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2588), 1,
-      anon_sym_SEMI,
-    STATE(1522), 1,
-      aux_sym_dataclass_repeat1,
+  [52103] = 4,
+    ACTIONS(2645), 1,
+      anon_sym_LPAREN,
+    STATE(1890), 1,
+      sym_closure,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50873] = 5,
-    ACTIONS(461), 1,
+    ACTIONS(2348), 2,
+      anon_sym_PLUS,
+      anon_sym_STAR,
+  [52118] = 5,
+    ACTIONS(437), 1,
       anon_sym_RPAREN,
-    ACTIONS(2503), 1,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2590), 1,
+    ACTIONS(2647), 1,
       anon_sym_PIPE,
-    STATE(1524), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50890] = 3,
-    ACTIONS(2594), 1,
-      anon_sym_SLASH,
+  [52135] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2592), 3,
-      anon_sym_LPAREN,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-  [50903] = 5,
-    ACTIONS(2503), 1,
+    ACTIONS(1964), 4,
+      anon_sym_LT,
+      anon_sym_implements,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
+  [52146] = 5,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2596), 1,
+    ACTIONS(2649), 1,
       anon_sym_RPAREN,
-    ACTIONS(2598), 1,
+    ACTIONS(2651), 1,
       anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50920] = 4,
-    ACTIONS(2600), 1,
-      anon_sym_LPAREN,
-    STATE(1832), 1,
-      sym_closure,
+  [52163] = 5,
+    ACTIONS(2411), 1,
+      anon_sym_COMMA,
+    ACTIONS(2653), 1,
+      anon_sym_LBRACE,
+    ACTIONS(2655), 1,
+      anon_sym_SEMI,
+    STATE(1583), 1,
+      aux_sym_dataclass_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-  [50935] = 5,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2602), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2604), 1,
-      anon_sym_PIPE,
-    STATE(1555), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [52180] = 4,
+    STATE(1088), 1,
+      sym_varName,
+    STATE(1147), 1,
+      sym_simpleId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50952] = 5,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2606), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2608), 1,
-      anon_sym_PIPE,
-    STATE(1528), 1,
-      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(2423), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [52195] = 5,
+    ACTIONS(2409), 1,
+      anon_sym_EQ,
+    ACTIONS(2657), 1,
+      anon_sym_implements,
+    ACTIONS(2659), 1,
+      anon_sym_LBRACE,
+    STATE(1336), 1,
+      sym_moduleAliasBody,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50969] = 3,
-    ACTIONS(2387), 1,
+  [52212] = 3,
+    ACTIONS(2350), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(536), 3,
+    STATE(750), 3,
       sym_call_body,
       sym_unqual_agg_body,
       sym__call_or_unqual_agg_body,
-  [50982] = 5,
-    ACTIONS(2548), 1,
-      sym__lower_id,
-    ACTIONS(2610), 1,
-      anon_sym_LPAREN,
-    STATE(512), 1,
-      sym_qualifiedRhs,
-    STATE(1564), 1,
-      sym_predicateName,
+  [52225] = 4,
+    ACTIONS(2661), 1,
+      anon_sym_COMMA,
+    STATE(1592), 1,
+      aux_sym_asExprs_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [50999] = 5,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2612), 1,
+    ACTIONS(1362), 2,
       anon_sym_RPAREN,
-    ACTIONS(2614), 1,
-      anon_sym_PIPE,
-    STATE(1527), 1,
+      anon_sym_order,
+  [52240] = 5,
+    ACTIONS(1849), 1,
+      anon_sym_select,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2664), 1,
+      anon_sym_where,
+    STATE(1530), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51016] = 4,
-    ACTIONS(2616), 1,
+  [52257] = 4,
+    ACTIONS(2666), 1,
       anon_sym_LPAREN,
-    STATE(1889), 1,
+    STATE(1832), 1,
       sym_closure,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
+    ACTIONS(2348), 2,
       anon_sym_PLUS,
       anon_sym_STAR,
-  [51031] = 4,
-    STATE(1516), 1,
-      sym_moduleName,
-    STATE(1526), 1,
+  [52272] = 4,
+    STATE(1473), 1,
       sym_simpleId,
+    STATE(1490), 1,
+      sym_varName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2395), 2,
+    ACTIONS(2391), 2,
       sym__upper_id,
       sym__lower_id,
-  [51046] = 4,
-    ACTIONS(2618), 1,
-      anon_sym_LPAREN,
-    STATE(1916), 1,
-      sym_closure,
+  [52287] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2670), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2359), 2,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-  [51061] = 4,
-    ACTIONS(2620), 1,
+  [52301] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    STATE(1575), 1,
-      aux_sym_asExprs_repeat1,
+    ACTIONS(2672), 1,
+      anon_sym_RPAREN,
+    STATE(1691), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1494), 2,
-      anon_sym_RPAREN,
-      anon_sym_order,
-  [51076] = 4,
-    STATE(1041), 1,
-      sym_varName,
-    STATE(1069), 1,
+  [52315] = 3,
+    STATE(998), 1,
       sym_simpleId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2432), 2,
+    ACTIONS(2433), 2,
       sym__upper_id,
       sym__lower_id,
-  [51091] = 5,
-    ACTIONS(2503), 1,
+  [52327] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2622), 1,
+    ACTIONS(2674), 1,
       anon_sym_RPAREN,
-    ACTIONS(2624), 1,
-      anon_sym_PIPE,
-    STATE(1539), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51108] = 5,
-    ACTIONS(2503), 1,
+  [52341] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2626), 1,
+    ACTIONS(2676), 1,
       anon_sym_RPAREN,
-    ACTIONS(2628), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51125] = 5,
-    ACTIONS(2548), 1,
-      sym__lower_id,
-    ACTIONS(2630), 1,
-      anon_sym_LPAREN,
-    STATE(448), 1,
-      sym_qualifiedRhs,
-    STATE(1547), 1,
-      sym_predicateName,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [51142] = 3,
-    ACTIONS(2371), 1,
-      anon_sym_LPAREN,
+  [52355] = 4,
+    ACTIONS(275), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    STATE(1603), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(736), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [51155] = 4,
-    STATE(1469), 1,
+  [52369] = 3,
+    STATE(1031), 1,
       sym_simpleId,
-    STATE(1618), 1,
-      sym_varName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2395), 2,
+    ACTIONS(2423), 2,
       sym__upper_id,
       sym__lower_id,
-  [51170] = 3,
-    ACTIONS(2385), 1,
-      anon_sym_LPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    STATE(445), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [51183] = 5,
-    ACTIONS(2436), 1,
+  [52381] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2632), 1,
-      anon_sym_LBRACE,
-    ACTIONS(2634), 1,
-      anon_sym_SEMI,
-    STATE(1502), 1,
-      aux_sym_dataclass_repeat1,
+    ACTIONS(2678), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51200] = 4,
-    STATE(1070), 1,
-      sym_simpleId,
-    STATE(1154), 1,
-      sym_varName,
+  [52395] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2678), 1,
+      anon_sym_RPAREN,
+    STATE(1611), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2457), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [51215] = 4,
-    ACTIONS(2620), 1,
+  [52409] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    STATE(1578), 1,
-      aux_sym_asExprs_repeat1,
+    ACTIONS(2680), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1466), 2,
+  [52423] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2682), 1,
       anon_sym_RPAREN,
-      anon_sym_order,
-  [51230] = 3,
-    ACTIONS(2389), 1,
-      anon_sym_LPAREN,
+    STATE(1617), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(495), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [51243] = 5,
-    ACTIONS(2503), 1,
+  [52437] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2636), 1,
+    ACTIONS(2684), 1,
       anon_sym_RPAREN,
-    ACTIONS(2638), 1,
-      anon_sym_PIPE,
-    STATE(1586), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51260] = 4,
-    ACTIONS(2640), 1,
-      anon_sym_COMMA,
-    STATE(1578), 1,
-      aux_sym_asExprs_repeat1,
+  [52451] = 3,
+    STATE(1974), 1,
+      sym_literalId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1421), 2,
-      anon_sym_RPAREN,
-      anon_sym_order,
-  [51275] = 5,
-    ACTIONS(2548), 1,
+    ACTIONS(2686), 2,
+      sym__upper_id,
       sym__lower_id,
-    ACTIONS(2643), 1,
-      anon_sym_LPAREN,
-    STATE(500), 1,
-      sym_qualifiedRhs,
-    STATE(1532), 1,
-      sym_predicateName,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [51292] = 5,
-    ACTIONS(2503), 1,
+  [52463] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2645), 1,
+    ACTIONS(2688), 1,
       anon_sym_RPAREN,
-    ACTIONS(2647), 1,
-      anon_sym_PIPE,
-    STATE(1568), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1599), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51309] = 5,
-    ACTIONS(2548), 1,
-      sym__lower_id,
-    ACTIONS(2649), 1,
-      anon_sym_LPAREN,
-    STATE(739), 1,
-      sym_qualifiedRhs,
-    STATE(1556), 1,
-      sym_predicateName,
+  [52477] = 4,
+    ACTIONS(491), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2690), 1,
+      anon_sym_COMMA,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51326] = 3,
-    ACTIONS(2391), 1,
-      anon_sym_LPAREN,
+  [52491] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2692), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(887), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [51339] = 5,
-    ACTIONS(2548), 1,
-      sym__lower_id,
-    ACTIONS(2651), 1,
-      anon_sym_LPAREN,
-    STATE(895), 1,
-      sym_qualifiedRhs,
-    STATE(1562), 1,
-      sym_predicateName,
+  [52505] = 4,
+    ACTIONS(2694), 1,
+      anon_sym_COMMA,
+    ACTIONS(2696), 1,
+      anon_sym_RPAREN,
+    STATE(1721), 1,
+      aux_sym_higherOrderTerm_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51356] = 5,
-    ACTIONS(1640), 1,
-      anon_sym_select,
-    ACTIONS(2503), 1,
+  [52519] = 4,
+    ACTIONS(1366), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2698), 1,
       anon_sym_COMMA,
-    ACTIONS(2653), 1,
-      anon_sym_where,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1623), 1,
+      aux_sym_asExprs_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51373] = 5,
-    ACTIONS(2503), 1,
+  [52533] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2655), 1,
+    ACTIONS(2700), 1,
       anon_sym_RPAREN,
-    ACTIONS(2657), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51390] = 5,
-    ACTIONS(2503), 1,
+  [52547] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2659), 1,
+    ACTIONS(2702), 1,
       anon_sym_RPAREN,
-    ACTIONS(2661), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51407] = 4,
-    STATE(1221), 1,
-      sym_simpleId,
-    STATE(1308), 1,
-      sym_moduleName,
+  [52561] = 4,
+    ACTIONS(2704), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2706), 1,
+      anon_sym_order,
+    STATE(1925), 1,
+      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2432), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [51422] = 4,
-    STATE(1353), 1,
-      sym_moduleName,
-    STATE(1354), 1,
-      sym_simpleId,
+  [52575] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2708), 1,
+      anon_sym_RPAREN,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2457), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [51437] = 5,
-    ACTIONS(2503), 1,
+  [52589] = 4,
+    ACTIONS(2710), 1,
       anon_sym_COMMA,
-    ACTIONS(2663), 1,
+    ACTIONS(2713), 1,
       anon_sym_RPAREN,
-    ACTIONS(2665), 1,
-      anon_sym_PIPE,
-    STATE(1585), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51454] = 3,
-    ACTIONS(2373), 1,
-      anon_sym_LPAREN,
+  [52603] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2715), 1,
+      anon_sym_RPAREN,
+    STATE(1659), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    STATE(955), 3,
-      sym_call_body,
-      sym_unqual_agg_body,
-      sym__call_or_unqual_agg_body,
-  [51467] = 5,
-    ACTIONS(2548), 1,
-      sym__lower_id,
-    ACTIONS(2667), 1,
-      anon_sym_LPAREN,
-    STATE(966), 1,
-      sym_qualifiedRhs,
-    STATE(1521), 1,
-      sym_predicateName,
+  [52617] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2717), 1,
+      anon_sym_RPAREN,
+    STATE(1664), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51484] = 2,
+  [52631] = 4,
+    ACTIONS(247), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    STATE(1635), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2669), 4,
-      anon_sym_EQ,
-      anon_sym_LPAREN,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-  [51495] = 3,
-    ACTIONS(2673), 1,
-      anon_sym_SLASH,
+  [52645] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2719), 1,
+      anon_sym_RPAREN,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2671), 3,
-      anon_sym_LPAREN,
-      anon_sym_PLUS,
-      anon_sym_STAR,
-  [51508] = 4,
-    STATE(1469), 1,
-      sym_simpleId,
-    STATE(1480), 1,
-      sym_varName,
+  [52659] = 4,
+    ACTIONS(1406), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2698), 1,
+      anon_sym_COMMA,
+    STATE(1629), 1,
+      aux_sym_asExprs_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2395), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [51523] = 5,
-    ACTIONS(1838), 1,
-      anon_sym_select,
-    ACTIONS(2503), 1,
+  [52673] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2675), 1,
-      anon_sym_where,
-    STATE(1584), 1,
-      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(2721), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51540] = 3,
-    ACTIONS(2677), 1,
-      anon_sym_LPAREN,
+  [52687] = 4,
+    ACTIONS(2723), 1,
+      anon_sym_SEMI,
+    ACTIONS(2725), 1,
+      anon_sym_or,
+    STATE(1733), 1,
+      aux_sym_typeUnionBody_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(923), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [51552] = 4,
-    ACTIONS(2679), 1,
+  [52701] = 4,
+    ACTIONS(563), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2727), 1,
       anon_sym_COMMA,
-    ACTIONS(2681), 1,
-      anon_sym_GT,
-    STATE(1681), 1,
-      aux_sym_module_repeat1,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51566] = 4,
-    ACTIONS(2683), 1,
-      anon_sym_EQ,
-    ACTIONS(2685), 1,
-      anon_sym_LPAREN,
-    STATE(1321), 1,
-      sym_predicateAliasBody,
+  [52715] = 4,
+    ACTIONS(1319), 1,
+      anon_sym_COMMA,
+    ACTIONS(2729), 1,
+      anon_sym_RBRACK,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51580] = 4,
-    ACTIONS(207), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+  [52729] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    STATE(1602), 1,
+    ACTIONS(2721), 1,
+      anon_sym_RPAREN,
+    STATE(1665), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51594] = 3,
-    STATE(1973), 1,
-      sym_literalId,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(2689), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [51606] = 4,
-    ACTIONS(191), 1,
+  [52743] = 4,
+    ACTIONS(1362), 1,
       anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+    ACTIONS(2731), 1,
       anon_sym_COMMA,
-    STATE(1604), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    STATE(1629), 1,
+      aux_sym_asExprs_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51620] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2691), 1,
+  [52757] = 4,
+    ACTIONS(2706), 1,
+      anon_sym_order,
+    ACTIONS(2734), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    STATE(1860), 1,
+      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51634] = 4,
-    ACTIONS(2687), 1,
+  [52771] = 4,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(2691), 1,
-      anon_sym_RPAREN,
-    STATE(1610), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2736), 1,
+      anon_sym_RBRACK,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51648] = 4,
-    ACTIONS(271), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+  [52785] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2738), 1,
+      anon_sym_RPAREN,
+    STATE(1722), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51662] = 4,
-    ACTIONS(271), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+  [52799] = 4,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    STATE(1607), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2740), 1,
+      anon_sym_RBRACK,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51676] = 4,
-    ACTIONS(1494), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2693), 1,
+  [52813] = 4,
+    ACTIONS(559), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2742), 1,
       anon_sym_COMMA,
-    STATE(1609), 1,
-      aux_sym_asExprs_repeat1,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51690] = 4,
-    ACTIONS(2687), 1,
+  [52827] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2695), 1,
+    ACTIONS(2744), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
+    STATE(1618), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51704] = 4,
-    ACTIONS(1421), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2697), 1,
-      anon_sym_COMMA,
-    STATE(1608), 1,
-      aux_sym_asExprs_repeat1,
+  [52841] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51718] = 4,
-    ACTIONS(1466), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2693), 1,
+    ACTIONS(2746), 3,
       anon_sym_COMMA,
-    STATE(1608), 1,
-      aux_sym_asExprs_repeat1,
+      anon_sym_LBRACE,
+      anon_sym_EQ,
+  [52851] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2748), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51732] = 4,
-    ACTIONS(2687), 1,
+  [52865] = 4,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(2700), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2750), 1,
+      anon_sym_RBRACK,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51746] = 4,
-    ACTIONS(2687), 1,
+  [52879] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2695), 1,
+    ACTIONS(2752), 1,
       anon_sym_RPAREN,
-    STATE(1612), 1,
+    STATE(1649), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51760] = 4,
-    ACTIONS(2687), 1,
+  [52893] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2702), 1,
+    ACTIONS(2744), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
+    STATE(1615), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51774] = 4,
-    ACTIONS(1316), 1,
+  [52907] = 4,
+    ACTIONS(2754), 1,
       anon_sym_COMMA,
-    ACTIONS(2704), 1,
-      anon_sym_RBRACK,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2757), 1,
+      anon_sym_GT,
+    STATE(1641), 1,
+      aux_sym_module_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51788] = 4,
-    ACTIONS(1316), 1,
+  [52921] = 4,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(2706), 1,
+    ACTIONS(2759), 1,
       anon_sym_RBRACK,
-    STATE(1739), 1,
+    STATE(1742), 1,
       aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51802] = 4,
-    ACTIONS(1316), 1,
+  [52935] = 4,
+    ACTIONS(1774), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2761), 1,
       anon_sym_COMMA,
-    ACTIONS(2708), 1,
-      anon_sym_RBRACK,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    STATE(1643), 1,
+      aux_sym_orderBys_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51816] = 4,
-    ACTIONS(1316), 1,
+  [52949] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2710), 1,
-      anon_sym_RBRACK,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2764), 1,
+      anon_sym_RPAREN,
+    STATE(1637), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51830] = 3,
-    STATE(1141), 1,
-      sym_simpleId,
+  [52963] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2764), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2457), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [51842] = 2,
+  [52977] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2766), 1,
+      anon_sym_RPAREN,
+    STATE(1622), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1630), 3,
+  [52991] = 4,
+    ACTIONS(2694), 1,
       anon_sym_COMMA,
+    ACTIONS(2768), 1,
       anon_sym_RPAREN,
-      anon_sym_order,
-  [51852] = 4,
-    ACTIONS(1316), 1,
-      anon_sym_COMMA,
-    ACTIONS(2712), 1,
-      anon_sym_RBRACK,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    STATE(1721), 1,
+      aux_sym_higherOrderTerm_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51866] = 4,
-    ACTIONS(1646), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2714), 1,
+  [53005] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    STATE(1620), 1,
-      aux_sym_orderBys_repeat1,
+    ACTIONS(2770), 1,
+      anon_sym_RPAREN,
+    STATE(1730), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51880] = 4,
-    ACTIONS(2717), 1,
+  [53019] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2719), 1,
+    ACTIONS(2772), 1,
       anon_sym_RPAREN,
-    STATE(1655), 1,
-      aux_sym_higherOrderTerm_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51894] = 4,
-    ACTIONS(2717), 1,
+  [53033] = 4,
+    ACTIONS(2694), 1,
       anon_sym_COMMA,
-    ACTIONS(2721), 1,
+    ACTIONS(2774), 1,
       anon_sym_RPAREN,
-    STATE(1621), 1,
+    STATE(1647), 1,
       aux_sym_higherOrderTerm_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51908] = 4,
-    ACTIONS(1316), 1,
+  [53047] = 4,
+    ACTIONS(187), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2723), 1,
-      anon_sym_RBRACK,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    STATE(1645), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51922] = 4,
-    ACTIONS(2725), 1,
-      anon_sym_EQ,
-    ACTIONS(2727), 1,
-      anon_sym_LPAREN,
-    STATE(1319), 1,
-      sym_predicateAliasBody,
+  [53061] = 4,
+    ACTIONS(259), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    STATE(1660), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51936] = 3,
-    STATE(903), 1,
-      sym_simpleId,
+  [53075] = 3,
+    ACTIONS(2776), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2457), 2,
+    ACTIONS(931), 2,
       sym__upper_id,
       sym__lower_id,
-  [51948] = 4,
-    ACTIONS(1721), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2729), 1,
+  [53087] = 4,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    STATE(1620), 1,
-      aux_sym_orderBys_repeat1,
+    ACTIONS(2778), 1,
+      anon_sym_RBRACK,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51962] = 4,
-    ACTIONS(465), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2731), 1,
+  [53101] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2780), 1,
+      anon_sym_PIPE,
+    STATE(1729), 1,
+      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [53115] = 4,
+    ACTIONS(2725), 1,
+      anon_sym_or,
+    ACTIONS(2782), 1,
+      anon_sym_SEMI,
+    STATE(1732), 1,
+      aux_sym_typeUnionBody_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51976] = 4,
-    ACTIONS(2687), 1,
+  [53129] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2733), 1,
+    ACTIONS(2784), 1,
       anon_sym_RPAREN,
-    STATE(1631), 1,
+    STATE(1618), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [51990] = 3,
-    STATE(1088), 1,
-      sym_simpleId,
+  [53143] = 4,
+    ACTIONS(2706), 1,
+      anon_sym_order,
+    ACTIONS(2786), 1,
+      anon_sym_RPAREN,
+    STATE(1820), 1,
+      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2432), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [52002] = 3,
-    STATE(1004), 1,
-      sym_simpleId,
+  [53157] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2788), 1,
+      anon_sym_RPAREN,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2432), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [52014] = 4,
-    ACTIONS(2687), 1,
+  [53171] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2735), 1,
+    ACTIONS(2790), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
+    STATE(1618), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52028] = 4,
-    ACTIONS(239), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+  [53185] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    STATE(1639), 1,
+    ACTIONS(2790), 1,
+      anon_sym_RPAREN,
+    STATE(1669), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52042] = 4,
-    ACTIONS(563), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2737), 1,
-      anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+  [53199] = 4,
+    ACTIONS(2706), 1,
+      anon_sym_order,
+    ACTIONS(2792), 1,
+      anon_sym_RPAREN,
+    STATE(1829), 1,
+      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52056] = 4,
-    ACTIONS(1669), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2729), 1,
+  [53213] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    STATE(1626), 1,
-      aux_sym_orderBys_repeat1,
+    ACTIONS(2794), 1,
+      anon_sym_RPAREN,
+    STATE(1713), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52070] = 4,
-    ACTIONS(2503), 1,
+  [53227] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2739), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
+    ACTIONS(2796), 1,
+      anon_sym_RPAREN,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52084] = 4,
-    ACTIONS(2687), 1,
+  [53241] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2741), 1,
+    ACTIONS(2798), 1,
       anon_sym_RPAREN,
-    STATE(1653), 1,
+    STATE(1618), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52098] = 2,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(1421), 3,
-      anon_sym_COMMA,
+  [53255] = 4,
+    ACTIONS(271), 1,
       anon_sym_RPAREN,
-      anon_sym_order,
-  [52108] = 4,
-    ACTIONS(2687), 1,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2743), 1,
-      anon_sym_RPAREN,
-    STATE(1648), 1,
+    STATE(1624), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52122] = 4,
-    ACTIONS(2687), 1,
+  [53269] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2745), 1,
+    ACTIONS(2800), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
+    STATE(1657), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52136] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2747), 1,
-      anon_sym_PIPE,
-    STATE(1635), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [53283] = 3,
+    ACTIONS(1964), 1,
+      anon_sym_LT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52150] = 4,
-    ACTIONS(2687), 1,
+    ACTIONS(706), 2,
+      anon_sym_SEMI,
+      anon_sym_COLON_COLON,
+  [53295] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2745), 1,
+    ACTIONS(2802), 1,
       anon_sym_RPAREN,
-    STATE(1666), 1,
+    STATE(1618), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52164] = 4,
-    ACTIONS(541), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2749), 1,
+  [53309] = 4,
+    ACTIONS(1719), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2804), 1,
       anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    STATE(1704), 1,
+      aux_sym_orderBys_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52178] = 4,
-    ACTIONS(2687), 1,
+  [53323] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2751), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2806), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52192] = 4,
-    ACTIONS(2753), 1,
+  [53337] = 4,
+    ACTIONS(2808), 1,
       anon_sym_COMMA,
-    ACTIONS(2755), 1,
+    ACTIONS(2811), 1,
       anon_sym_GT,
-    STATE(1677), 1,
+    STATE(1672), 1,
       aux_sym_moduleInstantiation_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52206] = 4,
-    ACTIONS(2757), 1,
+  [53351] = 4,
+    ACTIONS(499), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2813), 1,
       anon_sym_COMMA,
-    ACTIONS(2759), 1,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [53365] = 4,
+    ACTIONS(2815), 1,
+      anon_sym_COMMA,
+    ACTIONS(2817), 1,
       anon_sym_RBRACK,
-    STATE(1680), 1,
+    STATE(1738), 1,
       aux_sym_annotation_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52220] = 4,
-    ACTIONS(547), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2761), 1,
+  [53379] = 4,
+    ACTIONS(2819), 1,
       anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2822), 1,
+      anon_sym_RBRACK,
+    STATE(1675), 1,
+      aux_sym_annotation_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52234] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2763), 1,
+  [53393] = 4,
+    ACTIONS(2706), 1,
+      anon_sym_order,
+    ACTIONS(2824), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    STATE(1874), 1,
+      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52248] = 4,
-    ACTIONS(2687), 1,
+  [53407] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2765), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2826), 1,
+      anon_sym_PIPE,
+    STATE(1605), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52262] = 4,
-    ACTIONS(2687), 1,
+  [53421] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2767), 1,
+    ACTIONS(2828), 1,
       anon_sym_RPAREN,
-    STATE(1647), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52276] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2767), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [53435] = 3,
+    STATE(1914), 1,
+      sym_literalId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52290] = 4,
-    ACTIONS(203), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+    ACTIONS(2686), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [53447] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    STATE(1659), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2830), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52304] = 4,
-    ACTIONS(199), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    STATE(1650), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [53461] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52318] = 4,
-    ACTIONS(2687), 1,
+    ACTIONS(1362), 3,
       anon_sym_COMMA,
-    ACTIONS(2769), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+      anon_sym_order,
+  [53471] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52332] = 4,
-    ACTIONS(199), 1,
+    ACTIONS(1661), 3,
+      anon_sym_COMMA,
       anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+      anon_sym_order,
+  [53481] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2832), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52346] = 4,
-    ACTIONS(2771), 1,
+  [53495] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2774), 1,
+    ACTIONS(2834), 1,
       anon_sym_RPAREN,
-    STATE(1655), 1,
-      aux_sym_higherOrderTerm_repeat1,
+    STATE(1614), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52360] = 3,
-    STATE(1790), 1,
-      sym_simpleId,
+  [53509] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2836), 1,
+      anon_sym_PIPE,
+    STATE(1683), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2395), 2,
-      sym__upper_id,
-      sym__lower_id,
-  [52372] = 4,
-    ACTIONS(2503), 1,
+  [53523] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2776), 1,
+    ACTIONS(2838), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
+    STATE(1600), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52386] = 4,
-    ACTIONS(179), 1,
+  [53537] = 4,
+    ACTIONS(2706), 1,
+      anon_sym_order,
+    ACTIONS(2840), 1,
       anon_sym_RPAREN,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    STATE(1654), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    STATE(1958), 1,
+      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52400] = 4,
-    ACTIONS(2687), 1,
+  [53551] = 4,
+    ACTIONS(2842), 1,
       anon_sym_COMMA,
-    ACTIONS(2778), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2844), 1,
+      anon_sym_GT,
+    STATE(1641), 1,
+      aux_sym_module_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52414] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2778), 1,
+  [53565] = 4,
+    ACTIONS(2706), 1,
+      anon_sym_order,
+    ACTIONS(2846), 1,
       anon_sym_RPAREN,
-    STATE(1668), 1,
-      aux_sym_higherOrderTerm_repeat2,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [52428] = 3,
-    ACTIONS(2299), 1,
-      anon_sym_LT,
+    STATE(1950), 1,
+      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(579), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON_COLON,
-  [52440] = 4,
-    ACTIONS(2503), 1,
+  [53579] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2780), 1,
+    ACTIONS(2848), 1,
       anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1671), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52454] = 4,
-    ACTIONS(2503), 1,
+  [53593] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2782), 1,
+    ACTIONS(2850), 1,
       anon_sym_RPAREN,
-    STATE(1674), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52468] = 4,
-    ACTIONS(2717), 1,
+  [53607] = 4,
+    ACTIONS(493), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2852), 1,
       anon_sym_COMMA,
-    ACTIONS(2784), 1,
-      anon_sym_RPAREN,
-    STATE(1655), 1,
-      aux_sym_higherOrderTerm_repeat1,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52482] = 4,
-    ACTIONS(2503), 1,
+  [53621] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2786), 1,
-      anon_sym_PIPE,
-    STATE(1662), 1,
-      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(2854), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52496] = 4,
-    ACTIONS(2687), 1,
+  [53635] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2788), 1,
+    ACTIONS(2856), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
+    STATE(1693), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52510] = 4,
-    ACTIONS(557), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2790), 1,
+  [53649] = 4,
+    ACTIONS(2694), 1,
       anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2858), 1,
+      anon_sym_RPAREN,
+    STATE(1612), 1,
+      aux_sym_higherOrderTerm_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52524] = 4,
-    ACTIONS(2687), 1,
+  [53663] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2792), 1,
+    ACTIONS(2856), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
+    STATE(1618), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52538] = 4,
-    ACTIONS(2687), 1,
+  [53677] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2794), 1,
+    ACTIONS(2860), 1,
       anon_sym_RPAREN,
-    STATE(1697), 1,
+    STATE(1707), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52552] = 4,
-    ACTIONS(2503), 1,
+  [53691] = 4,
+    ACTIONS(215), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2796), 1,
+    STATE(1696), 1,
+      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [53705] = 4,
+    ACTIONS(2484), 1,
+      anon_sym_COMMA,
+    ACTIONS(2862), 1,
       anon_sym_PIPE,
-    STATE(1700), 1,
+    STATE(1680), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52566] = 4,
-    ACTIONS(2798), 1,
-      anon_sym_SEMI,
-    ACTIONS(2800), 1,
-      anon_sym_or,
-    STATE(1690), 1,
-      aux_sym_typeUnionBody_repeat1,
+  [53719] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2672), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52580] = 4,
-    ACTIONS(2802), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2804), 1,
-      anon_sym_order,
-    STATE(1896), 1,
-      sym_orderBys,
+  [53733] = 4,
+    ACTIONS(2864), 1,
+      anon_sym_COMMA,
+    ACTIONS(2866), 1,
+      anon_sym_GT,
+    STATE(1735), 1,
+      aux_sym_moduleInstantiation_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52594] = 4,
-    ACTIONS(2804), 1,
-      anon_sym_order,
-    ACTIONS(2806), 1,
+  [53747] = 4,
+    ACTIONS(215), 1,
       anon_sym_RPAREN,
-    STATE(1826), 1,
-      sym_orderBys,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52608] = 4,
-    ACTIONS(2503), 1,
+  [53761] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2808), 1,
+    ACTIONS(2868), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
+    STATE(1607), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52622] = 4,
-    ACTIONS(2503), 1,
+  [53775] = 4,
+    ACTIONS(1705), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2804), 1,
       anon_sym_COMMA,
-    ACTIONS(2810), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1643), 1,
+      aux_sym_orderBys_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52636] = 4,
-    ACTIONS(2503), 1,
+  [53789] = 4,
+    ACTIONS(223), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2812), 1,
-      anon_sym_PIPE,
-    STATE(1675), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1700), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52650] = 4,
-    ACTIONS(2753), 1,
+  [53803] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2814), 1,
-      anon_sym_GT,
-    STATE(1711), 1,
-      aux_sym_moduleInstantiation_repeat1,
+    ACTIONS(2870), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52664] = 4,
-    ACTIONS(579), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(2299), 1,
-      anon_sym_LT,
-    ACTIONS(2301), 1,
-      anon_sym_SLASH,
+  [53817] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2872), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52678] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2816), 1,
-      anon_sym_RPAREN,
-    STATE(1714), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [53831] = 3,
+    STATE(1760), 1,
+      sym_simpleId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52692] = 4,
-    ACTIONS(2757), 1,
+    ACTIONS(2391), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [53843] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2818), 1,
-      anon_sym_RBRACK,
-    STATE(1720), 1,
-      aux_sym_annotation_repeat1,
+    ACTIONS(2874), 1,
+      anon_sym_PIPE,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52706] = 4,
-    ACTIONS(2679), 1,
+  [53857] = 4,
+    ACTIONS(279), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2820), 1,
-      anon_sym_GT,
-    STATE(1722), 1,
-      aux_sym_module_repeat1,
+    STATE(1718), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52720] = 4,
-    ACTIONS(2503), 1,
+  [53871] = 4,
+    ACTIONS(2842), 1,
       anon_sym_COMMA,
-    ACTIONS(2822), 1,
-      anon_sym_RPAREN,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(2876), 1,
+      anon_sym_GT,
+    STATE(1720), 1,
+      aux_sym_module_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52734] = 4,
-    ACTIONS(2503), 1,
+  [53885] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2824), 1,
+    ACTIONS(2878), 1,
       anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1709), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52748] = 4,
-    ACTIONS(2717), 1,
+  [53899] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2826), 1,
+    ACTIONS(2880), 1,
       anon_sym_RPAREN,
-    STATE(1664), 1,
-      aux_sym_higherOrderTerm_repeat1,
+    STATE(1475), 1,
+      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52762] = 4,
-    ACTIONS(2687), 1,
+  [53913] = 4,
+    ACTIONS(1319), 1,
       anon_sym_COMMA,
-    ACTIONS(2828), 1,
-      anon_sym_RPAREN,
-    STATE(1737), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2882), 1,
+      anon_sym_RBRACK,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52776] = 4,
-    ACTIONS(2687), 1,
+  [53927] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2830), 1,
+    ACTIONS(2884), 1,
       anon_sym_RPAREN,
-    STATE(1643), 1,
+    STATE(1706), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52790] = 4,
-    ACTIONS(2687), 1,
+  [53941] = 4,
+    ACTIONS(2842), 1,
       anon_sym_COMMA,
-    ACTIONS(2830), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2886), 1,
+      anon_sym_GT,
+    STATE(1688), 1,
+      aux_sym_module_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52804] = 4,
-    ACTIONS(2503), 1,
+  [53955] = 4,
+    ACTIONS(553), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2888), 1,
       anon_sym_COMMA,
-    ACTIONS(2832), 1,
-      anon_sym_PIPE,
-    STATE(1683), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52818] = 4,
-    ACTIONS(2503), 1,
+  [53969] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2834), 1,
+    ACTIONS(2890), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52832] = 4,
-    ACTIONS(2836), 1,
-      anon_sym_SEMI,
-    ACTIONS(2838), 1,
-      anon_sym_or,
-    STATE(1690), 1,
-      aux_sym_typeUnionBody_repeat1,
+  [53983] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2890), 1,
+      anon_sym_RPAREN,
+    STATE(1727), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52846] = 4,
-    ACTIONS(559), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2841), 1,
+  [53997] = 4,
+    ACTIONS(2842), 1,
       anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2892), 1,
+      anon_sym_GT,
+    STATE(1641), 1,
+      aux_sym_module_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52860] = 4,
-    ACTIONS(555), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2843), 1,
+  [54011] = 4,
+    ACTIONS(2894), 1,
       anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2897), 1,
+      anon_sym_RPAREN,
+    STATE(1721), 1,
+      aux_sym_higherOrderTerm_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52874] = 4,
-    ACTIONS(2503), 1,
+  [54025] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2845), 1,
+    ACTIONS(2899), 1,
       anon_sym_RPAREN,
-    STATE(1657), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52888] = 4,
-    ACTIONS(2503), 1,
+  [54039] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2847), 1,
+    ACTIONS(2901), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
+    STATE(1678), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52902] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2849), 1,
-      anon_sym_RPAREN,
-    STATE(1724), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54053] = 4,
+    ACTIONS(2903), 1,
+      anon_sym_EQ,
+    ACTIONS(2905), 1,
+      anon_sym_LPAREN,
+    STATE(1338), 1,
+      sym_predicateAliasBody,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52916] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2851), 1,
-      anon_sym_RPAREN,
-    STATE(1706), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54067] = 3,
+    ACTIONS(1964), 1,
+      anon_sym_LT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52930] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2853), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2907), 2,
+      anon_sym_SEMI,
+      anon_sym_COLON_COLON,
+  [54079] = 4,
+    ACTIONS(2725), 1,
+      anon_sym_or,
+    ACTIONS(2909), 1,
+      anon_sym_SEMI,
+    STATE(1656), 1,
+      aux_sym_typeUnionBody_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52944] = 4,
-    ACTIONS(2804), 1,
-      anon_sym_order,
-    ACTIONS(2855), 1,
+  [54093] = 4,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    ACTIONS(2911), 1,
       anon_sym_RPAREN,
-    STATE(1865), 1,
-      sym_orderBys,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52958] = 4,
-    ACTIONS(2804), 1,
-      anon_sym_order,
-    ACTIONS(2857), 1,
+  [54107] = 4,
+    ACTIONS(175), 1,
       anon_sym_RPAREN,
-    STATE(1862), 1,
-      sym_orderBys,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    STATE(1702), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52972] = 4,
-    ACTIONS(2503), 1,
+  [54121] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2859), 1,
+    ACTIONS(2913), 1,
       anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [52986] = 4,
-    ACTIONS(1316), 1,
+  [54135] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2861), 1,
-      anon_sym_RBRACK,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+    ACTIONS(2915), 1,
+      anon_sym_RPAREN,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53000] = 4,
-    ACTIONS(2503), 1,
+  [54149] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2863), 1,
+    ACTIONS(2917), 1,
       anon_sym_PIPE,
-    STATE(1479), 1,
+    STATE(1475), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53014] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2865), 1,
-      anon_sym_PIPE,
-    STATE(1702), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [54163] = 4,
+    ACTIONS(2919), 1,
+      anon_sym_SEMI,
+    ACTIONS(2921), 1,
+      anon_sym_or,
+    STATE(1732), 1,
+      aux_sym_typeUnionBody_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53028] = 4,
-    ACTIONS(2800), 1,
+  [54177] = 4,
+    ACTIONS(2725), 1,
       anon_sym_or,
-    ACTIONS(2867), 1,
+    ACTIONS(2924), 1,
       anon_sym_SEMI,
-    STATE(1671), 1,
+    STATE(1732), 1,
       aux_sym_typeUnionBody_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53042] = 4,
-    ACTIONS(255), 1,
+  [54191] = 4,
+    ACTIONS(207), 1,
       anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    STATE(1687), 1,
+    STATE(1739), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53056] = 4,
-    ACTIONS(2687), 1,
+  [54205] = 4,
+    ACTIONS(2864), 1,
       anon_sym_COMMA,
-    ACTIONS(2869), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    ACTIONS(2926), 1,
+      anon_sym_GT,
+    STATE(1672), 1,
+      aux_sym_moduleInstantiation_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53070] = 4,
-    ACTIONS(2687), 1,
+  [54219] = 3,
+    STATE(1074), 1,
+      sym_simpleId,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2433), 2,
+      sym__upper_id,
+      sym__lower_id,
+  [54231] = 4,
+    ACTIONS(525), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2928), 1,
       anon_sym_COMMA,
-    ACTIONS(2871), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53084] = 4,
-    ACTIONS(2503), 1,
+  [54245] = 4,
+    ACTIONS(2815), 1,
       anon_sym_COMMA,
-    ACTIONS(2873), 1,
+    ACTIONS(2930), 1,
+      anon_sym_RBRACK,
+    STATE(1675), 1,
+      aux_sym_annotation_repeat1,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [54259] = 4,
+    ACTIONS(243), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    ACTIONS(2668), 1,
+      anon_sym_COMMA,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53098] = 4,
-    ACTIONS(219), 1,
+  [54273] = 4,
+    ACTIONS(243), 1,
       anon_sym_RPAREN,
-    ACTIONS(2687), 1,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    STATE(1717), 1,
+    STATE(1746), 1,
       aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53112] = 4,
-    ACTIONS(2503), 1,
+  [54287] = 4,
+    ACTIONS(2484), 1,
       anon_sym_COMMA,
-    ACTIONS(2875), 1,
-      anon_sym_RPAREN,
-    STATE(1682), 1,
+    ACTIONS(2932), 1,
+      anon_sym_PIPE,
+    STATE(1731), 1,
       aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53126] = 4,
-    ACTIONS(2877), 1,
+  [54301] = 4,
+    ACTIONS(1466), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2934), 1,
       anon_sym_COMMA,
-    ACTIONS(2880), 1,
-      anon_sym_GT,
-    STATE(1711), 1,
-      aux_sym_moduleInstantiation_repeat1,
+    STATE(1742), 1,
+      aux_sym_aggregate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53140] = 4,
-    ACTIONS(2503), 1,
+  [54315] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2882), 1,
+    ACTIONS(2937), 1,
       anon_sym_RPAREN,
-    STATE(1689), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1596), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53154] = 3,
-    STATE(1987), 1,
-      sym_literalId,
+  [54329] = 4,
+    ACTIONS(2939), 1,
+      anon_sym_EQ,
+    ACTIONS(2941), 1,
+      anon_sym_LPAREN,
+    STATE(1294), 1,
+      sym_predicateAliasBody,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [54343] = 3,
+    STATE(1050), 1,
+      sym_simpleId,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2689), 2,
+    ACTIONS(2423), 2,
       sym__upper_id,
       sym__lower_id,
-  [53166] = 4,
-    ACTIONS(2503), 1,
+  [54355] = 4,
+    ACTIONS(2668), 1,
       anon_sym_COMMA,
-    ACTIONS(2884), 1,
+    ACTIONS(2937), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+    STATE(1618), 1,
+      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53180] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2886), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54369] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53194] = 4,
-    ACTIONS(2800), 1,
-      anon_sym_or,
-    ACTIONS(2888), 1,
+    ACTIONS(2943), 2,
       anon_sym_SEMI,
-    STATE(1690), 1,
-      aux_sym_typeUnionBody_repeat1,
+      anon_sym_COLON_COLON,
+  [54378] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53208] = 4,
-    ACTIONS(2687), 1,
+    ACTIONS(2811), 2,
       anon_sym_COMMA,
-    ACTIONS(2890), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+      anon_sym_GT,
+  [54387] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53222] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2890), 1,
+    ACTIONS(2945), 2,
+      anon_sym_SEMI,
+      anon_sym_COLON_COLON,
+  [54396] = 3,
+    ACTIONS(2492), 1,
+      sym__lower_id,
+    STATE(1744), 1,
+      sym_predicateName,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [54407] = 3,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1463), 1,
+      sym_className,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [54418] = 2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2919), 2,
+      anon_sym_SEMI,
+      anon_sym_or,
+  [54427] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(2947), 1,
       anon_sym_RPAREN,
-    STATE(1726), 1,
-      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53236] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2892), 1,
+  [54438] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(2949), 1,
       anon_sym_RPAREN,
-    STATE(1694), 1,
-      aux_sym_classlessPredicate_repeat1,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53250] = 4,
-    ACTIONS(2894), 1,
-      anon_sym_COMMA,
-    ACTIONS(2897), 1,
-      anon_sym_RBRACK,
-    STATE(1720), 1,
-      aux_sym_annotation_repeat1,
+  [54449] = 2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2907), 2,
+      anon_sym_SEMI,
+      anon_sym_COLON_COLON,
+  [54458] = 3,
+    ACTIONS(581), 1,
+      anon_sym_SEMI,
+    ACTIONS(2581), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53264] = 4,
-    ACTIONS(2503), 1,
+  [54469] = 2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2897), 2,
       anon_sym_COMMA,
-    ACTIONS(2899), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [54478] = 3,
+    ACTIONS(2951), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2953), 1,
+      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53278] = 4,
-    ACTIONS(2901), 1,
+  [54489] = 3,
+    ACTIONS(2955), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2957), 1,
+      anon_sym_LBRACK,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+  [54500] = 2,
+    ACTIONS(3), 2,
+      sym_line_comment,
+      sym_block_comment,
+    ACTIONS(2959), 2,
       anon_sym_COMMA,
-    ACTIONS(2904), 1,
       anon_sym_GT,
-    STATE(1722), 1,
-      aux_sym_module_repeat1,
+  [54509] = 3,
+    ACTIONS(2961), 1,
+      anon_sym_SEMI,
+    ACTIONS(2963), 1,
+      anon_sym_or,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53292] = 2,
+  [54520] = 3,
+    ACTIONS(2965), 1,
+      anon_sym_SEMI,
+    ACTIONS(2967), 1,
+      anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2906), 3,
-      anon_sym_COMMA,
-      anon_sym_LBRACE,
-      anon_sym_EQ,
-  [53302] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2908), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54531] = 3,
+    ACTIONS(2492), 1,
+      sym__lower_id,
+    STATE(1887), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53316] = 4,
-    ACTIONS(2804), 1,
-      anon_sym_order,
-    ACTIONS(2910), 1,
-      anon_sym_RPAREN,
-    STATE(1829), 1,
-      sym_orderBys,
+  [54542] = 3,
+    ACTIONS(2969), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2971), 1,
+      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53330] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2912), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54553] = 3,
+    ACTIONS(2967), 1,
+      anon_sym_COLON_COLON,
+    ACTIONS(2973), 1,
+      anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53344] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2914), 1,
-      anon_sym_RPAREN,
-    STATE(1746), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [54564] = 3,
+    ACTIONS(2975), 1,
+      anon_sym_SEMI,
+    ACTIONS(2977), 1,
+      anon_sym_or,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53358] = 4,
-    ACTIONS(243), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    STATE(1745), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54575] = 3,
+    ACTIONS(2979), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2981), 1,
+      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53372] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2916), 1,
-      anon_sym_PIPE,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [54586] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53386] = 4,
-    ACTIONS(2804), 1,
-      anon_sym_order,
-    ACTIONS(2918), 1,
+    ACTIONS(2983), 2,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
+  [54595] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(2985), 1,
       anon_sym_RPAREN,
-    STATE(1824), 1,
-      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53400] = 4,
-    ACTIONS(2920), 1,
-      anon_sym_COMMA,
-    ACTIONS(2923), 1,
+  [54606] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(2987), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53414] = 4,
-    ACTIONS(2804), 1,
-      anon_sym_order,
-    ACTIONS(2925), 1,
+  [54617] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(2989), 1,
       anon_sym_RPAREN,
-    STATE(1943), 1,
-      sym_orderBys,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53428] = 4,
-    ACTIONS(2679), 1,
-      anon_sym_COMMA,
-    ACTIONS(2927), 1,
-      anon_sym_GT,
-    STATE(1722), 1,
-      aux_sym_module_repeat1,
+  [54628] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53442] = 4,
-    ACTIONS(2503), 1,
+    ACTIONS(2822), 2,
       anon_sym_COMMA,
-    ACTIONS(2929), 1,
-      anon_sym_PIPE,
-    STATE(1729), 1,
-      aux_sym_classlessPredicate_repeat1,
+      anon_sym_RBRACK,
+  [54637] = 3,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1962), 1,
+      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53456] = 4,
-    ACTIONS(251), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    STATE(1740), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54648] = 3,
+    ACTIONS(2991), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2993), 1,
+      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53470] = 4,
-    ACTIONS(2800), 1,
-      anon_sym_or,
-    ACTIONS(2931), 1,
-      anon_sym_SEMI,
-    STATE(1716), 1,
-      aux_sym_typeUnionBody_repeat1,
+  [54659] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53484] = 4,
-    ACTIONS(2687), 1,
+    ACTIONS(2713), 2,
       anon_sym_COMMA,
-    ACTIONS(2933), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54668] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53498] = 4,
-    ACTIONS(2679), 1,
-      anon_sym_COMMA,
-    ACTIONS(2935), 1,
-      anon_sym_GT,
-    STATE(1733), 1,
-      aux_sym_module_repeat1,
+    ACTIONS(706), 2,
+      anon_sym_SEMI,
+      anon_sym_COLON_COLON,
+  [54677] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53512] = 4,
-    ACTIONS(1410), 1,
-      anon_sym_RBRACK,
-    ACTIONS(2937), 1,
+    ACTIONS(2995), 2,
       anon_sym_COMMA,
-    STATE(1739), 1,
-      aux_sym_aggregate_repeat1,
+      anon_sym_RBRACK,
+  [54686] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53526] = 4,
-    ACTIONS(2687), 1,
+    ACTIONS(1902), 2,
       anon_sym_COMMA,
-    ACTIONS(2940), 1,
       anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54695] = 3,
+    ACTIONS(2334), 1,
+      sym__lower_id,
+    STATE(1967), 1,
+      sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53540] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2940), 1,
-      anon_sym_RPAREN,
-    STATE(1715), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54706] = 3,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1809), 1,
+      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53554] = 4,
-    ACTIONS(2687), 1,
-      anon_sym_COMMA,
-    ACTIONS(2942), 1,
-      anon_sym_RPAREN,
-    STATE(1707), 1,
-      aux_sym_higherOrderTerm_repeat2,
+  [54717] = 3,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1814), 1,
+      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53568] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2944), 1,
-      anon_sym_RPAREN,
-    STATE(1708), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [54728] = 3,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1846), 1,
+      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53582] = 4,
-    ACTIONS(2503), 1,
-      anon_sym_COMMA,
-    ACTIONS(2946), 1,
-      anon_sym_RPAREN,
-    STATE(1721), 1,
-      aux_sym_classlessPredicate_repeat1,
+  [54739] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53596] = 4,
-    ACTIONS(2687), 1,
+    ACTIONS(2997), 2,
       anon_sym_COMMA,
-    ACTIONS(2942), 1,
-      anon_sym_RPAREN,
-    STATE(1731), 1,
-      aux_sym_higherOrderTerm_repeat2,
+      anon_sym_GT,
+  [54748] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53610] = 4,
-    ACTIONS(2503), 1,
+    ACTIONS(1774), 2,
       anon_sym_COMMA,
-    ACTIONS(2948), 1,
       anon_sym_RPAREN,
-    STATE(1479), 1,
-      aux_sym_classlessPredicate_repeat1,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [53624] = 2,
+  [54757] = 3,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1862), 1,
+      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2950), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON_COLON,
-  [53633] = 3,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    STATE(1988), 1,
-      sym_annotName,
+  [54768] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(2999), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53644] = 3,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    STATE(1985), 1,
-      sym_annotName,
+  [54779] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(3001), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53655] = 3,
-    ACTIONS(2341), 1,
+  [54790] = 3,
+    ACTIONS(2492), 1,
       sym__lower_id,
-    STATE(1982), 1,
-      sym_annotName,
+    STATE(1724), 1,
+      sym_predicateName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53666] = 3,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    STATE(1979), 1,
-      sym_annotName,
+  [54801] = 3,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
+    ACTIONS(3003), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53677] = 3,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    STATE(1976), 1,
-      sym_annotName,
+  [54812] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53688] = 3,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    STATE(1972), 1,
-      sym_annotName,
+    ACTIONS(1881), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [54821] = 3,
+    ACTIONS(2338), 1,
+      sym__upper_id,
+    STATE(1471), 1,
+      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53699] = 3,
-    ACTIONS(2345), 1,
+  [54832] = 3,
+    ACTIONS(2338), 1,
       sym__upper_id,
-    STATE(1974), 1,
+    STATE(1923), 1,
       sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53710] = 3,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    STATE(1464), 1,
-      sym_className,
+  [54843] = 3,
+    ACTIONS(2334), 1,
+      sym__lower_id,
+    STATE(1973), 1,
+      sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53721] = 3,
-    ACTIONS(2548), 1,
+  [54854] = 3,
+    ACTIONS(2334), 1,
       sym__lower_id,
-    STATE(1624), 1,
-      sym_predicateName,
+    STATE(1977), 1,
+      sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53732] = 3,
-    ACTIONS(2548), 1,
+  [54865] = 3,
+    ACTIONS(2334), 1,
       sym__lower_id,
-    STATE(1598), 1,
-      sym_predicateName,
+    STATE(1980), 1,
+      sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53743] = 3,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    STATE(1461), 1,
-      sym_className,
+  [54876] = 3,
+    ACTIONS(3005), 1,
+      anon_sym_LPAREN,
+    ACTIONS(3007), 1,
+      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53754] = 2,
+  [54887] = 3,
+    ACTIONS(2334), 1,
+      sym__lower_id,
+    STATE(1983), 1,
+      sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(706), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON_COLON,
-  [53763] = 2,
+  [54898] = 3,
+    ACTIONS(2334), 1,
+      sym__lower_id,
+    STATE(1986), 1,
+      sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2952), 2,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-  [53772] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(2954), 1,
-      anon_sym_RPAREN,
+  [54909] = 3,
+    ACTIONS(2334), 1,
+      sym__lower_id,
+    STATE(1989), 1,
+      sym_annotName,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53783] = 3,
-    ACTIONS(2956), 1,
+  [54920] = 3,
+    ACTIONS(3009), 1,
       anon_sym_LPAREN,
-    ACTIONS(2958), 1,
+    ACTIONS(3011), 1,
       anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53794] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(2960), 1,
-      anon_sym_RPAREN,
+  [54931] = 2,
+    ACTIONS(3013), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53805] = 3,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    STATE(1908), 1,
-      sym_className,
+  [54939] = 2,
+    ACTIONS(3015), 1,
+      anon_sym_by,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53816] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(2962), 1,
-      anon_sym_RPAREN,
+  [54947] = 2,
+    ACTIONS(3017), 1,
+      sym_integer,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53827] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(2964), 1,
+  [54955] = 2,
+    ACTIONS(3019), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53838] = 2,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(1646), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [53847] = 3,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    STATE(1942), 1,
-      sym_className,
+  [54963] = 2,
+    ACTIONS(3021), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53858] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(2966), 1,
-      anon_sym_RPAREN,
+  [54971] = 2,
+    ACTIONS(3023), 1,
+      anon_sym_SLASH,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53869] = 2,
+  [54979] = 2,
+    ACTIONS(3025), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1899), 2,
-      anon_sym_COMMA,
+  [54987] = 2,
+    ACTIONS(3027), 1,
       anon_sym_RPAREN,
-  [53878] = 3,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    STATE(1992), 1,
-      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53889] = 2,
+  [54995] = 2,
+    ACTIONS(3029), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2923), 2,
-      anon_sym_COMMA,
+  [55003] = 2,
+    ACTIONS(3031), 1,
       anon_sym_RPAREN,
-  [53898] = 2,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(1884), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [53907] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(2968), 1,
+  [55011] = 2,
+    ACTIONS(3033), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53918] = 3,
-    ACTIONS(2341), 1,
-      sym__lower_id,
-    STATE(1876), 1,
-      sym_annotName,
+  [55019] = 2,
+    ACTIONS(3035), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53929] = 3,
-    ACTIONS(2970), 1,
-      anon_sym_SEMI,
-    ACTIONS(2972), 1,
-      anon_sym_COLON_COLON,
+  [55027] = 2,
+    ACTIONS(3037), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53940] = 3,
-    ACTIONS(2974), 1,
+  [55035] = 2,
+    ACTIONS(3039), 1,
       anon_sym_LPAREN,
-    ACTIONS(2976), 1,
-      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [53951] = 2,
+  [55043] = 2,
+    ACTIONS(69), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2978), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [53960] = 2,
+  [55051] = 2,
+    ACTIONS(3041), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2980), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON_COLON,
-  [53969] = 2,
+  [55059] = 2,
+    ACTIONS(3043), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2774), 2,
-      anon_sym_COMMA,
+  [55067] = 2,
+    ACTIONS(3045), 1,
       anon_sym_RPAREN,
-  [53978] = 3,
-    ACTIONS(2972), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(2982), 1,
-      anon_sym_SEMI,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [53989] = 3,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    STATE(1839), 1,
-      sym_className,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54000] = 3,
-    ACTIONS(2984), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2986), 1,
-      anon_sym_LBRACK,
+  [55075] = 2,
+    ACTIONS(3047), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54011] = 2,
+  [55083] = 2,
+    ACTIONS(3049), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2880), 2,
-      anon_sym_COMMA,
-      anon_sym_GT,
-  [54020] = 2,
+  [55091] = 2,
+    ACTIONS(3051), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2988), 2,
-      anon_sym_COMMA,
-      anon_sym_GT,
-  [54029] = 3,
-    ACTIONS(2990), 1,
+  [55099] = 2,
+    ACTIONS(3053), 1,
       anon_sym_LPAREN,
-    ACTIONS(2992), 1,
-      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54040] = 2,
+  [55107] = 2,
+    ACTIONS(3055), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2897), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [54049] = 3,
-    ACTIONS(2994), 1,
-      anon_sym_SEMI,
-    ACTIONS(2996), 1,
-      anon_sym_or,
+  [55115] = 2,
+    ACTIONS(3057), 1,
+      anon_sym_by,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54060] = 2,
+  [55123] = 2,
+    ACTIONS(3059), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2836), 2,
-      anon_sym_SEMI,
-      anon_sym_or,
-  [54069] = 2,
+  [55131] = 2,
+    ACTIONS(3061), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(2998), 2,
-      anon_sym_COMMA,
-      anon_sym_GT,
-  [54078] = 3,
-    ACTIONS(579), 1,
-      anon_sym_SEMI,
-    ACTIONS(2669), 1,
-      anon_sym_LPAREN,
+  [55139] = 2,
+    ACTIONS(3063), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54089] = 3,
-    ACTIONS(2345), 1,
-      sym__upper_id,
-    STATE(1903), 1,
-      sym_className,
+  [55147] = 2,
+    ACTIONS(3065), 1,
+      anon_sym_by,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54100] = 3,
-    ACTIONS(3000), 1,
-      anon_sym_SEMI,
-    ACTIONS(3002), 1,
-      anon_sym_or,
+  [55155] = 2,
+    ACTIONS(3067), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54111] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(3004), 1,
+  [55163] = 2,
+    ACTIONS(3069), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54122] = 3,
-    ACTIONS(3006), 1,
+  [55171] = 2,
+    ACTIONS(3071), 1,
       anon_sym_LPAREN,
-    ACTIONS(3008), 1,
-      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54133] = 3,
-    ACTIONS(3010), 1,
+  [55179] = 2,
+    ACTIONS(3073), 1,
       anon_sym_LPAREN,
-    ACTIONS(3012), 1,
-      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54144] = 3,
-    ACTIONS(2548), 1,
-      sym__lower_id,
-    STATE(1823), 1,
-      sym_predicateName,
+  [55187] = 2,
+    ACTIONS(3075), 1,
+      sym_super,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54155] = 2,
+  [55195] = 2,
+    ACTIONS(3077), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-    ACTIONS(3014), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON_COLON,
-  [54164] = 3,
-    ACTIONS(3016), 1,
+  [55203] = 2,
+    ACTIONS(3079), 1,
       anon_sym_LPAREN,
-    ACTIONS(3018), 1,
-      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54175] = 3,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
-    ACTIONS(3020), 1,
+  [55211] = 2,
+    ACTIONS(3081), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54186] = 2,
-    ACTIONS(3022), 1,
-      anon_sym_LPAREN,
+  [55219] = 2,
+    ACTIONS(1285), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54194] = 2,
-    ACTIONS(3024), 1,
-      anon_sym_RPAREN,
+  [55227] = 2,
+    ACTIONS(3083), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54202] = 2,
-    ACTIONS(3026), 1,
-      anon_sym_RPAREN,
+  [55235] = 2,
+    ACTIONS(3085), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54210] = 2,
-    ACTIONS(3028), 1,
-      anon_sym_RPAREN,
+  [55243] = 2,
+    ACTIONS(2459), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54218] = 2,
-    ACTIONS(3030), 1,
+  [55251] = 2,
+    ACTIONS(3087), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54226] = 2,
-    ACTIONS(3032), 1,
-      anon_sym_RPAREN,
+  [55259] = 2,
+    ACTIONS(3089), 1,
+      anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54234] = 2,
-    ACTIONS(3034), 1,
+  [55267] = 2,
+    ACTIONS(3091), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54242] = 2,
-    ACTIONS(3036), 1,
+  [55275] = 2,
+    ACTIONS(3093), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54250] = 2,
-    ACTIONS(3038), 1,
+  [55283] = 2,
+    ACTIONS(3095), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54258] = 2,
-    ACTIONS(3040), 1,
+  [55291] = 2,
+    ACTIONS(3097), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54266] = 2,
-    ACTIONS(3042), 1,
+  [55299] = 2,
+    ACTIONS(3099), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54274] = 2,
-    ACTIONS(3044), 1,
-      anon_sym_LPAREN,
+  [55307] = 2,
+    ACTIONS(3101), 1,
+      sym_super,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54282] = 2,
-    ACTIONS(3046), 1,
+  [55315] = 2,
+    ACTIONS(3103), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54290] = 2,
-    ACTIONS(3048), 1,
-      anon_sym_DOT,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54298] = 2,
-    ACTIONS(3050), 1,
-      anon_sym_by,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54306] = 2,
-    ACTIONS(3052), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54314] = 2,
-    ACTIONS(3054), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54322] = 2,
-    ACTIONS(3056), 1,
-      anon_sym_RPAREN,
+  [55323] = 2,
+    ACTIONS(1309), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54330] = 2,
-    ACTIONS(3058), 1,
+  [55331] = 2,
+    ACTIONS(3105), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54338] = 2,
-    ACTIONS(3060), 1,
+  [55339] = 2,
+    ACTIONS(3107), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54346] = 2,
-    ACTIONS(3062), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54354] = 2,
-    ACTIONS(3064), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54362] = 2,
-    ACTIONS(3066), 1,
+  [55347] = 2,
+    ACTIONS(3109), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54370] = 2,
-    ACTIONS(3068), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54378] = 2,
-    ACTIONS(3070), 1,
-      anon_sym_LPAREN,
+  [55355] = 2,
+    ACTIONS(3111), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54386] = 2,
-    ACTIONS(3072), 1,
+  [55363] = 2,
+    ACTIONS(3113), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54394] = 2,
-    ACTIONS(3074), 1,
-      anon_sym_RPAREN,
+  [55371] = 2,
+    ACTIONS(3115), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54402] = 2,
-    ACTIONS(3076), 1,
+  [55379] = 2,
+    ACTIONS(3117), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54410] = 2,
-    ACTIONS(3078), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54418] = 2,
-    ACTIONS(3080), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54426] = 2,
-    ACTIONS(3082), 1,
-      anon_sym_LPAREN,
+  [55387] = 2,
+    ACTIONS(3119), 1,
+      anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54434] = 2,
-    ACTIONS(3084), 1,
+  [55395] = 2,
+    ACTIONS(3121), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54442] = 2,
-    ACTIONS(3086), 1,
+  [55403] = 2,
+    ACTIONS(3123), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54450] = 2,
-    ACTIONS(3088), 1,
-      anon_sym_RPAREN,
+  [55411] = 2,
+    ACTIONS(3125), 1,
+      anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54458] = 2,
-    ACTIONS(3090), 1,
-      anon_sym_LPAREN,
+  [55419] = 2,
+    ACTIONS(3127), 1,
+      anon_sym_EQ,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54466] = 2,
-    ACTIONS(3092), 1,
+  [55427] = 2,
+    ACTIONS(3129), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54474] = 2,
-    ACTIONS(2420), 1,
-      anon_sym_DOT,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54482] = 2,
-    ACTIONS(3094), 1,
+  [55435] = 2,
+    ACTIONS(3131), 1,
       anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54490] = 2,
-    ACTIONS(3096), 1,
-      anon_sym_LPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54498] = 2,
-    ACTIONS(3098), 1,
+  [55443] = 2,
+    ACTIONS(3133), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54506] = 2,
-    ACTIONS(3100), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54514] = 2,
-    ACTIONS(3102), 1,
+  [55451] = 2,
+    ACTIONS(3135), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54522] = 2,
-    ACTIONS(3104), 1,
-      sym_super,
+  [55459] = 2,
+    ACTIONS(3137), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54530] = 2,
-    ACTIONS(3106), 1,
+  [55467] = 2,
+    ACTIONS(3139), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54538] = 2,
-    ACTIONS(1300), 1,
+  [55475] = 2,
+    ACTIONS(1297), 1,
       anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54546] = 2,
-    ACTIONS(3108), 1,
+  [55483] = 2,
+    ACTIONS(3141), 1,
       sym_super,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54554] = 2,
-    ACTIONS(3110), 1,
+  [55491] = 2,
+    ACTIONS(3143), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54562] = 2,
-    ACTIONS(3112), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54570] = 2,
-    ACTIONS(3114), 1,
+  [55499] = 2,
+    ACTIONS(3145), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54578] = 2,
-    ACTIONS(3116), 1,
+  [55507] = 2,
+    ACTIONS(3147), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54586] = 2,
-    ACTIONS(3118), 1,
-      anon_sym_SEMI,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54594] = 2,
-    ACTIONS(3120), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54602] = 2,
-    ACTIONS(3122), 1,
+  [55515] = 2,
+    ACTIONS(3149), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54610] = 2,
-    ACTIONS(3124), 1,
-      sym_integer,
+  [55523] = 2,
+    ACTIONS(3151), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54618] = 2,
-    ACTIONS(3126), 1,
-      anon_sym_LPAREN,
+  [55531] = 2,
+    ACTIONS(83), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54626] = 2,
-    ACTIONS(3128), 1,
+  [55539] = 2,
+    ACTIONS(3153), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54634] = 2,
-    ACTIONS(3130), 1,
-      anon_sym_DOT,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54642] = 2,
-    ACTIONS(3132), 1,
+  [55547] = 2,
+    ACTIONS(3155), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54650] = 2,
-    ACTIONS(95), 1,
-      anon_sym_RPAREN,
+  [55555] = 2,
+    ACTIONS(3157), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54658] = 2,
-    ACTIONS(1306), 1,
-      anon_sym_RBRACK,
+  [55563] = 2,
+    ACTIONS(3159), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54666] = 2,
-    ACTIONS(3134), 1,
-      anon_sym_RPAREN,
+  [55571] = 2,
+    ACTIONS(3161), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54674] = 2,
-    ACTIONS(3136), 1,
+  [55579] = 2,
+    ACTIONS(3163), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54682] = 2,
-    ACTIONS(3138), 1,
+  [55587] = 2,
+    ACTIONS(3165), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54690] = 2,
-    ACTIONS(3140), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54698] = 2,
-    ACTIONS(3142), 1,
-      anon_sym_RPAREN,
+  [55595] = 2,
+    ACTIONS(3167), 1,
+      anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54706] = 2,
-    ACTIONS(3144), 1,
+  [55603] = 2,
+    ACTIONS(3169), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54714] = 2,
-    ACTIONS(3146), 1,
+  [55611] = 2,
+    ACTIONS(3171), 1,
       anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54722] = 2,
-    ACTIONS(3148), 1,
-      anon_sym_SEMI,
+  [55619] = 2,
+    ACTIONS(3173), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54730] = 2,
-    ACTIONS(3150), 1,
+  [55627] = 2,
+    ACTIONS(3175), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54738] = 2,
-    ACTIONS(3152), 1,
-      anon_sym_RPAREN,
+  [55635] = 2,
+    ACTIONS(2461), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54746] = 2,
-    ACTIONS(3154), 1,
+  [55643] = 2,
+    ACTIONS(3177), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54754] = 2,
-    ACTIONS(3156), 1,
+  [55651] = 2,
+    ACTIONS(3179), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54762] = 2,
-    ACTIONS(3158), 1,
+  [55659] = 2,
+    ACTIONS(3181), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54770] = 2,
-    ACTIONS(3160), 1,
-      anon_sym_RPAREN,
+  [55667] = 2,
+    ACTIONS(3183), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54778] = 2,
-    ACTIONS(3162), 1,
+  [55675] = 2,
+    ACTIONS(3185), 1,
       anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54786] = 2,
-    ACTIONS(3164), 1,
-      anon_sym_RBRACK,
+  [55683] = 2,
+    ACTIONS(3187), 1,
+      anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54794] = 2,
-    ACTIONS(3166), 1,
+  [55691] = 2,
+    ACTIONS(3189), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54802] = 2,
-    ACTIONS(3168), 1,
-      anon_sym_LPAREN,
+  [55699] = 2,
+    ACTIONS(3191), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54810] = 2,
-    ACTIONS(3170), 1,
-      anon_sym_LPAREN,
+  [55707] = 2,
+    ACTIONS(3193), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54818] = 2,
-    ACTIONS(3172), 1,
-      anon_sym_DOT,
+  [55715] = 2,
+    ACTIONS(3195), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54826] = 2,
-    ACTIONS(3174), 1,
-      anon_sym_DOT,
+  [55723] = 2,
+    ACTIONS(3197), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54834] = 2,
-    ACTIONS(3176), 1,
-      anon_sym_RPAREN,
+  [55731] = 2,
+    ACTIONS(3199), 1,
+      anon_sym_SEMI,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54842] = 2,
-    ACTIONS(3178), 1,
+  [55739] = 2,
+    ACTIONS(3201), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54850] = 2,
-    ACTIONS(1294), 1,
-      anon_sym_RBRACK,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54858] = 2,
-    ACTIONS(3180), 1,
+  [55747] = 2,
+    ACTIONS(3203), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54866] = 2,
-    ACTIONS(3182), 1,
-      anon_sym_LPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54874] = 2,
-    ACTIONS(77), 1,
+  [55755] = 2,
+    ACTIONS(79), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54882] = 2,
-    ACTIONS(3184), 1,
+  [55763] = 2,
+    ACTIONS(3205), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54890] = 2,
-    ACTIONS(3186), 1,
+  [55771] = 2,
+    ACTIONS(3207), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54898] = 2,
-    ACTIONS(3188), 1,
+  [55779] = 2,
+    ACTIONS(3209), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54906] = 2,
-    ACTIONS(3190), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54914] = 2,
-    ACTIONS(3192), 1,
-      anon_sym_LPAREN,
+  [55787] = 2,
+    ACTIONS(3211), 1,
+      anon_sym_DOT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54922] = 2,
-    ACTIONS(3194), 1,
+  [55795] = 2,
+    ACTIONS(39), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54930] = 2,
-    ACTIONS(71), 1,
+  [55803] = 2,
+    ACTIONS(3213), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54938] = 2,
-    ACTIONS(3196), 1,
-      anon_sym_SEMI,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [54946] = 2,
-    ACTIONS(3198), 1,
+  [55811] = 2,
+    ACTIONS(3215), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54954] = 2,
-    ACTIONS(91), 1,
+  [55819] = 2,
+    ACTIONS(3217), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54962] = 2,
-    ACTIONS(3200), 1,
-      anon_sym_LPAREN,
+  [55827] = 2,
+    ACTIONS(3219), 1,
+      sym_super,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54970] = 2,
-    ACTIONS(3202), 1,
+  [55835] = 2,
+    ACTIONS(3221), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54978] = 2,
-    ACTIONS(3204), 1,
+  [55843] = 2,
+    ACTIONS(3223), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54986] = 2,
-    ACTIONS(69), 1,
-      anon_sym_RPAREN,
+  [55851] = 2,
+    ACTIONS(3225), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [54994] = 2,
-    ACTIONS(3206), 1,
+  [55859] = 2,
+    ACTIONS(3227), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55002] = 2,
-    ACTIONS(3208), 1,
+  [55867] = 2,
+    ACTIONS(3229), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55010] = 2,
-    ACTIONS(3210), 1,
-      anon_sym_RPAREN,
+  [55875] = 2,
+    ACTIONS(3231), 1,
+      anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55018] = 2,
-    ACTIONS(3212), 1,
+  [55883] = 2,
+    ACTIONS(3233), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55026] = 2,
-    ACTIONS(3214), 1,
+  [55891] = 2,
+    ACTIONS(583), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55034] = 2,
-    ACTIONS(3216), 1,
-      anon_sym_DOT,
+  [55899] = 2,
+    ACTIONS(3235), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55042] = 2,
-    ACTIONS(3218), 1,
-      anon_sym_LPAREN,
+  [55907] = 2,
+    ACTIONS(3237), 1,
+      anon_sym_EQ,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55050] = 2,
-    ACTIONS(3220), 1,
-      anon_sym_SLASH,
+  [55915] = 2,
+    ACTIONS(1303), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55058] = 2,
-    ACTIONS(3222), 1,
-      sym_super,
+  [55923] = 2,
+    ACTIONS(3239), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55066] = 2,
-    ACTIONS(3224), 1,
-      anon_sym_RPAREN,
+  [55931] = 2,
+    ACTIONS(3241), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55074] = 2,
-    ACTIONS(3226), 1,
+  [55939] = 2,
+    ACTIONS(3243), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55082] = 2,
-    ACTIONS(3228), 1,
-      sym_super,
+  [55947] = 2,
+    ACTIONS(1291), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55090] = 2,
-    ACTIONS(3230), 1,
-      anon_sym_LPAREN,
+  [55955] = 2,
+    ACTIONS(3245), 1,
+      sym_super,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55098] = 2,
-    ACTIONS(3232), 1,
-      anon_sym_by,
+  [55963] = 2,
+    ACTIONS(3247), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55106] = 2,
-    ACTIONS(3234), 1,
-      anon_sym_LPAREN,
+  [55971] = 2,
+    ACTIONS(3249), 1,
+      anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55114] = 2,
-    ACTIONS(3236), 1,
+  [55979] = 2,
+    ACTIONS(3251), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55122] = 2,
-    ACTIONS(3238), 1,
+  [55987] = 2,
+    ACTIONS(3253), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55130] = 2,
-    ACTIONS(3240), 1,
-      anon_sym_LPAREN,
+  [55995] = 2,
+    ACTIONS(3255), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55138] = 2,
-    ACTIONS(3242), 1,
+  [56003] = 2,
+    ACTIONS(3257), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55146] = 2,
-    ACTIONS(3244), 1,
-      anon_sym_LPAREN,
+  [56011] = 2,
+    ACTIONS(3259), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55154] = 2,
-    ACTIONS(3246), 1,
-      sym_super,
+  [56019] = 2,
+    ACTIONS(3261), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55162] = 2,
-    ACTIONS(3248), 1,
+  [56027] = 2,
+    ACTIONS(87), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55170] = 2,
-    ACTIONS(3250), 1,
+  [56035] = 2,
+    ACTIONS(3263), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55178] = 2,
-    ACTIONS(3252), 1,
+  [56043] = 2,
+    ACTIONS(3265), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55186] = 2,
-    ACTIONS(3254), 1,
+  [56051] = 2,
+    ACTIONS(3267), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55194] = 2,
-    ACTIONS(1288), 1,
-      anon_sym_RBRACK,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55202] = 2,
-    ACTIONS(3256), 1,
-      anon_sym_RPAREN,
+  [56059] = 2,
+    ACTIONS(3269), 1,
+      anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55210] = 2,
-    ACTIONS(3258), 1,
+  [56067] = 2,
+    ACTIONS(3271), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55218] = 2,
-    ACTIONS(3260), 1,
+  [56075] = 2,
+    ACTIONS(3273), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55226] = 2,
-    ACTIONS(1282), 1,
-      anon_sym_RBRACK,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55234] = 2,
-    ACTIONS(3262), 1,
+  [56083] = 2,
+    ACTIONS(3275), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55242] = 2,
-    ACTIONS(3264), 1,
+  [56091] = 2,
+    ACTIONS(3277), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55250] = 2,
-    ACTIONS(99), 1,
+  [56099] = 2,
+    ACTIONS(3279), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55258] = 2,
-    ACTIONS(3266), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55266] = 2,
-    ACTIONS(3268), 1,
+  [56107] = 2,
+    ACTIONS(3281), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55274] = 2,
-    ACTIONS(3270), 1,
+  [56115] = 2,
+    ACTIONS(3283), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55282] = 2,
-    ACTIONS(3272), 1,
-      sym_super,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55290] = 2,
-    ACTIONS(3274), 1,
+  [56123] = 2,
+    ACTIONS(3285), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55298] = 2,
-    ACTIONS(3276), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55306] = 2,
-    ACTIONS(3278), 1,
-      sym_super,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55314] = 2,
-    ACTIONS(3280), 1,
-      anon_sym_LPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55322] = 2,
-    ACTIONS(3282), 1,
+  [56131] = 2,
+    ACTIONS(3287), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55330] = 2,
-    ACTIONS(3284), 1,
+  [56139] = 2,
+    ACTIONS(3289), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55338] = 2,
-    ACTIONS(1312), 1,
-      anon_sym_RBRACK,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55346] = 2,
-    ACTIONS(1256), 1,
-      anon_sym_RBRACK,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55354] = 2,
-    ACTIONS(3286), 1,
+  [56147] = 2,
+    ACTIONS(3291), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55362] = 2,
-    ACTIONS(3288), 1,
-      anon_sym_LPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55370] = 2,
-    ACTIONS(3290), 1,
+  [56155] = 2,
+    ACTIONS(3293), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55378] = 2,
-    ACTIONS(3292), 1,
-      anon_sym_LBRACE,
+  [56163] = 2,
+    ACTIONS(101), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55386] = 2,
-    ACTIONS(3294), 1,
+  [56171] = 2,
+    ACTIONS(3295), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55394] = 2,
-    ACTIONS(3296), 1,
+  [56179] = 2,
+    ACTIONS(3297), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55402] = 2,
-    ACTIONS(3298), 1,
+  [56187] = 2,
+    ACTIONS(3299), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55410] = 2,
-    ACTIONS(2444), 1,
-      anon_sym_DOT,
+  [56195] = 2,
+    ACTIONS(3301), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55418] = 2,
-    ACTIONS(3300), 1,
+  [56203] = 2,
+    ACTIONS(3303), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55426] = 2,
-    ACTIONS(3302), 1,
-      anon_sym_COLON_COLON,
+  [56211] = 2,
+    ACTIONS(3305), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55434] = 2,
-    ACTIONS(3304), 1,
-      anon_sym_COLON_COLON,
+  [56219] = 2,
+    ACTIONS(3307), 1,
+      anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55442] = 2,
-    ACTIONS(3306), 1,
-      anon_sym_LBRACK,
+  [56227] = 2,
+    ACTIONS(3309), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55450] = 2,
-    ACTIONS(3308), 1,
+  [56235] = 2,
+    ACTIONS(3311), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55458] = 2,
-    ACTIONS(3310), 1,
+  [56243] = 2,
+    ACTIONS(3313), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55466] = 2,
-    ACTIONS(3312), 1,
+  [56251] = 2,
+    ACTIONS(3315), 1,
       anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55474] = 2,
-    ACTIONS(3314), 1,
-      anon_sym_LPAREN,
+  [56259] = 2,
+    ACTIONS(3317), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55482] = 2,
-    ACTIONS(3316), 1,
+  [56267] = 2,
+    ACTIONS(3319), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55490] = 2,
-    ACTIONS(3318), 1,
-      anon_sym_RPAREN,
+  [56275] = 2,
+    ACTIONS(3321), 1,
+      sym_super,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55498] = 2,
-    ACTIONS(3320), 1,
+  [56283] = 2,
+    ACTIONS(3323), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55506] = 2,
-    ACTIONS(3322), 1,
-      anon_sym_LPAREN,
+  [56291] = 2,
+    ACTIONS(3325), 1,
+      anon_sym_LT,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55514] = 2,
-    ACTIONS(3324), 1,
-      anon_sym_LPAREN,
+  [56299] = 2,
+    ACTIONS(3327), 1,
+      anon_sym_LBRACE,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55522] = 2,
-    ACTIONS(3326), 1,
-      anon_sym_RPAREN,
+  [56307] = 2,
+    ACTIONS(3329), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55530] = 2,
-    ACTIONS(3328), 1,
+  [56315] = 2,
+    ACTIONS(3331), 1,
       anon_sym_LPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55538] = 2,
-    ACTIONS(3330), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55546] = 2,
-    ACTIONS(3332), 1,
-      anon_sym_RPAREN,
+  [56323] = 2,
+    ACTIONS(3333), 1,
+      ts_builtin_sym_end,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55554] = 2,
-    ACTIONS(3334), 1,
+  [56331] = 2,
+    ACTIONS(1255), 1,
       anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55562] = 2,
-    ACTIONS(3336), 1,
-      anon_sym_LPAREN,
+  [56339] = 2,
+    ACTIONS(3335), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55570] = 2,
-    ACTIONS(3338), 1,
-      anon_sym_EQ,
+  [56347] = 2,
+    ACTIONS(1265), 1,
+      anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55578] = 2,
-    ACTIONS(39), 1,
+  [56355] = 2,
+    ACTIONS(3337), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55586] = 2,
-    ACTIONS(3340), 1,
+  [56363] = 2,
+    ACTIONS(3339), 1,
       anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55594] = 2,
-    ACTIONS(3342), 1,
+  [56371] = 2,
+    ACTIONS(3341), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55602] = 2,
-    ACTIONS(3344), 1,
+  [56379] = 2,
+    ACTIONS(3343), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55610] = 2,
-    ACTIONS(3346), 1,
+  [56387] = 2,
+    ACTIONS(3345), 1,
       anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55618] = 2,
-    ACTIONS(3348), 1,
+  [56395] = 2,
+    ACTIONS(3347), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55626] = 2,
-    ACTIONS(3350), 1,
-      anon_sym_COLON_COLON,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55634] = 2,
-    ACTIONS(3352), 1,
-      anon_sym_RBRACK,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55642] = 2,
-    ACTIONS(3354), 1,
-      ts_builtin_sym_end,
-    ACTIONS(3), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [55650] = 2,
-    ACTIONS(3356), 1,
-      anon_sym_LPAREN,
+  [56403] = 2,
+    ACTIONS(3349), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55658] = 2,
-    ACTIONS(3358), 1,
+  [56411] = 2,
+    ACTIONS(3351), 1,
       anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55666] = 2,
-    ACTIONS(583), 1,
-      anon_sym_LPAREN,
+  [56419] = 2,
+    ACTIONS(3353), 1,
+      anon_sym_COLON_COLON,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55674] = 2,
-    ACTIONS(3360), 1,
-      anon_sym_LPAREN,
+  [56427] = 2,
+    ACTIONS(3355), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55682] = 2,
-    ACTIONS(3362), 1,
+  [56435] = 2,
+    ACTIONS(3357), 1,
       anon_sym_RBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55690] = 2,
-    ACTIONS(3364), 1,
-      anon_sym_COLON_COLON,
+  [56443] = 2,
+    ACTIONS(3359), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55698] = 2,
-    ACTIONS(3366), 1,
+  [56451] = 2,
+    ACTIONS(3361), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55706] = 2,
-    ACTIONS(3368), 1,
+  [56459] = 2,
+    ACTIONS(3363), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55714] = 2,
-    ACTIONS(3370), 1,
-      anon_sym_EQ,
+  [56467] = 2,
+    ACTIONS(99), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55722] = 2,
-    ACTIONS(3372), 1,
-      anon_sym_by,
+  [56475] = 2,
+    ACTIONS(3365), 1,
+      sym_super,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55730] = 2,
-    ACTIONS(3374), 1,
+  [56483] = 2,
+    ACTIONS(3367), 1,
       anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55738] = 2,
-    ACTIONS(3376), 1,
-      anon_sym_LPAREN,
+  [56491] = 2,
+    ACTIONS(3369), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55746] = 2,
-    ACTIONS(3378), 1,
-      anon_sym_LPAREN,
+  [56499] = 2,
+    ACTIONS(3371), 1,
+      anon_sym_RPAREN,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55754] = 2,
-    ACTIONS(3380), 1,
+  [56507] = 2,
+    ACTIONS(3373), 1,
       anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55762] = 2,
-    ACTIONS(3382), 1,
+  [56515] = 2,
+    ACTIONS(3375), 1,
       anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55770] = 2,
-    ACTIONS(3384), 1,
+  [56523] = 2,
+    ACTIONS(3377), 1,
       anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55778] = 2,
-    ACTIONS(3386), 1,
+  [56531] = 2,
+    ACTIONS(3379), 1,
       anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55786] = 2,
-    ACTIONS(3388), 1,
+  [56539] = 2,
+    ACTIONS(3381), 1,
       anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
       sym_block_comment,
-  [55794] = 2,
-    ACTIONS(3390), 1,
+  [56547] = 2,
+    ACTIONS(3383), 1,
       anon_sym_LBRACK,
     ACTIONS(3), 2,
       sym_line_comment,
@@ -79826,1649 +80643,1650 @@ static const uint16_t ts_small_parse_table[] = {
 
 static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(359)] = 0,
-  [SMALL_STATE(360)] = 108,
-  [SMALL_STATE(361)] = 216,
-  [SMALL_STATE(362)] = 324,
-  [SMALL_STATE(363)] = 432,
-  [SMALL_STATE(364)] = 540,
-  [SMALL_STATE(365)] = 648,
-  [SMALL_STATE(366)] = 756,
-  [SMALL_STATE(367)] = 864,
-  [SMALL_STATE(368)] = 922,
-  [SMALL_STATE(369)] = 1004,
-  [SMALL_STATE(370)] = 1062,
+  [SMALL_STATE(360)] = 111,
+  [SMALL_STATE(361)] = 222,
+  [SMALL_STATE(362)] = 333,
+  [SMALL_STATE(363)] = 444,
+  [SMALL_STATE(364)] = 555,
+  [SMALL_STATE(365)] = 666,
+  [SMALL_STATE(366)] = 777,
+  [SMALL_STATE(367)] = 888,
+  [SMALL_STATE(368)] = 946,
+  [SMALL_STATE(369)] = 1028,
+  [SMALL_STATE(370)] = 1086,
   [SMALL_STATE(371)] = 1144,
-  [SMALL_STATE(372)] = 1202,
-  [SMALL_STATE(373)] = 1260,
-  [SMALL_STATE(374)] = 1319,
-  [SMALL_STATE(375)] = 1378,
-  [SMALL_STATE(376)] = 1457,
+  [SMALL_STATE(372)] = 1226,
+  [SMALL_STATE(373)] = 1284,
+  [SMALL_STATE(374)] = 1341,
+  [SMALL_STATE(375)] = 1398,
+  [SMALL_STATE(376)] = 1455,
   [SMALL_STATE(377)] = 1528,
-  [SMALL_STATE(378)] = 1601,
-  [SMALL_STATE(379)] = 1678,
+  [SMALL_STATE(378)] = 1599,
+  [SMALL_STATE(379)] = 1674,
   [SMALL_STATE(380)] = 1739,
   [SMALL_STATE(381)] = 1796,
-  [SMALL_STATE(382)] = 1853,
-  [SMALL_STATE(383)] = 1910,
-  [SMALL_STATE(384)] = 1981,
-  [SMALL_STATE(385)] = 2060,
-  [SMALL_STATE(386)] = 2131,
+  [SMALL_STATE(382)] = 1857,
+  [SMALL_STATE(383)] = 1934,
+  [SMALL_STATE(384)] = 2005,
+  [SMALL_STATE(385)] = 2062,
+  [SMALL_STATE(386)] = 2123,
   [SMALL_STATE(387)] = 2202,
   [SMALL_STATE(388)] = 2273,
-  [SMALL_STATE(389)] = 2350,
-  [SMALL_STATE(390)] = 2409,
-  [SMALL_STATE(391)] = 2486,
-  [SMALL_STATE(392)] = 2557,
-  [SMALL_STATE(393)] = 2614,
+  [SMALL_STATE(389)] = 2344,
+  [SMALL_STATE(390)] = 2421,
+  [SMALL_STATE(391)] = 2482,
+  [SMALL_STATE(392)] = 2539,
+  [SMALL_STATE(393)] = 2604,
   [SMALL_STATE(394)] = 2679,
-  [SMALL_STATE(395)] = 2754,
-  [SMALL_STATE(396)] = 2825,
-  [SMALL_STATE(397)] = 2896,
-  [SMALL_STATE(398)] = 2971,
-  [SMALL_STATE(399)] = 3032,
-  [SMALL_STATE(400)] = 3097,
-  [SMALL_STATE(401)] = 3154,
-  [SMALL_STATE(402)] = 3219,
+  [SMALL_STATE(395)] = 2750,
+  [SMALL_STATE(396)] = 2823,
+  [SMALL_STATE(397)] = 2880,
+  [SMALL_STATE(398)] = 2953,
+  [SMALL_STATE(399)] = 3024,
+  [SMALL_STATE(400)] = 3095,
+  [SMALL_STATE(401)] = 3170,
+  [SMALL_STATE(402)] = 3235,
   [SMALL_STATE(403)] = 3292,
-  [SMALL_STATE(404)] = 3365,
-  [SMALL_STATE(405)] = 3422,
-  [SMALL_STATE(406)] = 3493,
-  [SMALL_STATE(407)] = 3568,
-  [SMALL_STATE(408)] = 3627,
-  [SMALL_STATE(409)] = 3692,
-  [SMALL_STATE(410)] = 3749,
-  [SMALL_STATE(411)] = 3810,
-  [SMALL_STATE(412)] = 3871,
-  [SMALL_STATE(413)] = 3928,
-  [SMALL_STATE(414)] = 4005,
-  [SMALL_STATE(415)] = 4076,
-  [SMALL_STATE(416)] = 4149,
-  [SMALL_STATE(417)] = 4220,
-  [SMALL_STATE(418)] = 4291,
-  [SMALL_STATE(419)] = 4366,
-  [SMALL_STATE(420)] = 4418,
-  [SMALL_STATE(421)] = 4470,
-  [SMALL_STATE(422)] = 4522,
-  [SMALL_STATE(423)] = 4574,
-  [SMALL_STATE(424)] = 4623,
-  [SMALL_STATE(425)] = 4672,
-  [SMALL_STATE(426)] = 4721,
-  [SMALL_STATE(427)] = 4770,
-  [SMALL_STATE(428)] = 4819,
-  [SMALL_STATE(429)] = 4868,
-  [SMALL_STATE(430)] = 4917,
-  [SMALL_STATE(431)] = 4966,
-  [SMALL_STATE(432)] = 5015,
-  [SMALL_STATE(433)] = 5064,
-  [SMALL_STATE(434)] = 5113,
-  [SMALL_STATE(435)] = 5162,
-  [SMALL_STATE(436)] = 5211,
-  [SMALL_STATE(437)] = 5260,
-  [SMALL_STATE(438)] = 5309,
-  [SMALL_STATE(439)] = 5358,
-  [SMALL_STATE(440)] = 5407,
-  [SMALL_STATE(441)] = 5456,
-  [SMALL_STATE(442)] = 5505,
-  [SMALL_STATE(443)] = 5554,
-  [SMALL_STATE(444)] = 5603,
-  [SMALL_STATE(445)] = 5652,
-  [SMALL_STATE(446)] = 5701,
-  [SMALL_STATE(447)] = 5750,
-  [SMALL_STATE(448)] = 5799,
-  [SMALL_STATE(449)] = 5848,
-  [SMALL_STATE(450)] = 5897,
-  [SMALL_STATE(451)] = 5946,
-  [SMALL_STATE(452)] = 5995,
-  [SMALL_STATE(453)] = 6044,
-  [SMALL_STATE(454)] = 6093,
-  [SMALL_STATE(455)] = 6142,
-  [SMALL_STATE(456)] = 6191,
-  [SMALL_STATE(457)] = 6242,
-  [SMALL_STATE(458)] = 6291,
-  [SMALL_STATE(459)] = 6338,
-  [SMALL_STATE(460)] = 6387,
-  [SMALL_STATE(461)] = 6436,
-  [SMALL_STATE(462)] = 6485,
-  [SMALL_STATE(463)] = 6534,
-  [SMALL_STATE(464)] = 6583,
-  [SMALL_STATE(465)] = 6632,
-  [SMALL_STATE(466)] = 6681,
-  [SMALL_STATE(467)] = 6730,
-  [SMALL_STATE(468)] = 6779,
-  [SMALL_STATE(469)] = 6828,
-  [SMALL_STATE(470)] = 6877,
-  [SMALL_STATE(471)] = 6926,
-  [SMALL_STATE(472)] = 6975,
-  [SMALL_STATE(473)] = 7024,
-  [SMALL_STATE(474)] = 7073,
-  [SMALL_STATE(475)] = 7122,
-  [SMALL_STATE(476)] = 7171,
-  [SMALL_STATE(477)] = 7220,
-  [SMALL_STATE(478)] = 7269,
-  [SMALL_STATE(479)] = 7318,
-  [SMALL_STATE(480)] = 7367,
-  [SMALL_STATE(481)] = 7420,
-  [SMALL_STATE(482)] = 7469,
-  [SMALL_STATE(483)] = 7518,
-  [SMALL_STATE(484)] = 7569,
-  [SMALL_STATE(485)] = 7618,
-  [SMALL_STATE(486)] = 7667,
-  [SMALL_STATE(487)] = 7716,
-  [SMALL_STATE(488)] = 7765,
-  [SMALL_STATE(489)] = 7814,
-  [SMALL_STATE(490)] = 7863,
-  [SMALL_STATE(491)] = 7914,
-  [SMALL_STATE(492)] = 7963,
-  [SMALL_STATE(493)] = 8012,
-  [SMALL_STATE(494)] = 8061,
-  [SMALL_STATE(495)] = 8110,
-  [SMALL_STATE(496)] = 8159,
-  [SMALL_STATE(497)] = 8212,
-  [SMALL_STATE(498)] = 8261,
-  [SMALL_STATE(499)] = 8310,
-  [SMALL_STATE(500)] = 8359,
-  [SMALL_STATE(501)] = 8408,
-  [SMALL_STATE(502)] = 8457,
-  [SMALL_STATE(503)] = 8508,
-  [SMALL_STATE(504)] = 8557,
-  [SMALL_STATE(505)] = 8608,
-  [SMALL_STATE(506)] = 8657,
-  [SMALL_STATE(507)] = 8706,
-  [SMALL_STATE(508)] = 8755,
-  [SMALL_STATE(509)] = 8804,
-  [SMALL_STATE(510)] = 8853,
-  [SMALL_STATE(511)] = 8902,
-  [SMALL_STATE(512)] = 8951,
-  [SMALL_STATE(513)] = 9000,
-  [SMALL_STATE(514)] = 9049,
-  [SMALL_STATE(515)] = 9098,
-  [SMALL_STATE(516)] = 9147,
-  [SMALL_STATE(517)] = 9196,
-  [SMALL_STATE(518)] = 9245,
-  [SMALL_STATE(519)] = 9294,
-  [SMALL_STATE(520)] = 9343,
-  [SMALL_STATE(521)] = 9392,
-  [SMALL_STATE(522)] = 9441,
-  [SMALL_STATE(523)] = 9490,
-  [SMALL_STATE(524)] = 9539,
-  [SMALL_STATE(525)] = 9588,
-  [SMALL_STATE(526)] = 9637,
-  [SMALL_STATE(527)] = 9686,
-  [SMALL_STATE(528)] = 9735,
-  [SMALL_STATE(529)] = 9784,
-  [SMALL_STATE(530)] = 9833,
-  [SMALL_STATE(531)] = 9882,
-  [SMALL_STATE(532)] = 9931,
-  [SMALL_STATE(533)] = 9980,
-  [SMALL_STATE(534)] = 10029,
-  [SMALL_STATE(535)] = 10078,
-  [SMALL_STATE(536)] = 10127,
-  [SMALL_STATE(537)] = 10176,
-  [SMALL_STATE(538)] = 10225,
-  [SMALL_STATE(539)] = 10274,
-  [SMALL_STATE(540)] = 10323,
-  [SMALL_STATE(541)] = 10376,
-  [SMALL_STATE(542)] = 10425,
-  [SMALL_STATE(543)] = 10474,
-  [SMALL_STATE(544)] = 10523,
-  [SMALL_STATE(545)] = 10572,
-  [SMALL_STATE(546)] = 10619,
-  [SMALL_STATE(547)] = 10666,
-  [SMALL_STATE(548)] = 10715,
-  [SMALL_STATE(549)] = 10764,
-  [SMALL_STATE(550)] = 10813,
-  [SMALL_STATE(551)] = 10862,
-  [SMALL_STATE(552)] = 10911,
-  [SMALL_STATE(553)] = 10960,
-  [SMALL_STATE(554)] = 11009,
-  [SMALL_STATE(555)] = 11056,
-  [SMALL_STATE(556)] = 11105,
-  [SMALL_STATE(557)] = 11154,
-  [SMALL_STATE(558)] = 11205,
-  [SMALL_STATE(559)] = 11258,
-  [SMALL_STATE(560)] = 11307,
-  [SMALL_STATE(561)] = 11356,
-  [SMALL_STATE(562)] = 11405,
-  [SMALL_STATE(563)] = 11454,
-  [SMALL_STATE(564)] = 11503,
-  [SMALL_STATE(565)] = 11552,
-  [SMALL_STATE(566)] = 11601,
-  [SMALL_STATE(567)] = 11650,
-  [SMALL_STATE(568)] = 11699,
-  [SMALL_STATE(569)] = 11748,
-  [SMALL_STATE(570)] = 11797,
-  [SMALL_STATE(571)] = 11846,
-  [SMALL_STATE(572)] = 11895,
-  [SMALL_STATE(573)] = 11944,
-  [SMALL_STATE(574)] = 11993,
-  [SMALL_STATE(575)] = 12042,
-  [SMALL_STATE(576)] = 12093,
-  [SMALL_STATE(577)] = 12142,
-  [SMALL_STATE(578)] = 12191,
-  [SMALL_STATE(579)] = 12240,
-  [SMALL_STATE(580)] = 12289,
-  [SMALL_STATE(581)] = 12338,
-  [SMALL_STATE(582)] = 12387,
-  [SMALL_STATE(583)] = 12436,
-  [SMALL_STATE(584)] = 12485,
-  [SMALL_STATE(585)] = 12536,
-  [SMALL_STATE(586)] = 12585,
-  [SMALL_STATE(587)] = 12634,
-  [SMALL_STATE(588)] = 12683,
-  [SMALL_STATE(589)] = 12732,
-  [SMALL_STATE(590)] = 12781,
-  [SMALL_STATE(591)] = 12830,
-  [SMALL_STATE(592)] = 12879,
-  [SMALL_STATE(593)] = 12928,
-  [SMALL_STATE(594)] = 12977,
-  [SMALL_STATE(595)] = 13026,
-  [SMALL_STATE(596)] = 13075,
-  [SMALL_STATE(597)] = 13124,
-  [SMALL_STATE(598)] = 13173,
-  [SMALL_STATE(599)] = 13222,
-  [SMALL_STATE(600)] = 13270,
-  [SMALL_STATE(601)] = 13318,
-  [SMALL_STATE(602)] = 13366,
-  [SMALL_STATE(603)] = 13414,
-  [SMALL_STATE(604)] = 13462,
-  [SMALL_STATE(605)] = 13510,
-  [SMALL_STATE(606)] = 13558,
-  [SMALL_STATE(607)] = 13606,
-  [SMALL_STATE(608)] = 13654,
-  [SMALL_STATE(609)] = 13702,
-  [SMALL_STATE(610)] = 13750,
-  [SMALL_STATE(611)] = 13798,
-  [SMALL_STATE(612)] = 13846,
-  [SMALL_STATE(613)] = 13894,
-  [SMALL_STATE(614)] = 13942,
-  [SMALL_STATE(615)] = 13990,
-  [SMALL_STATE(616)] = 14038,
-  [SMALL_STATE(617)] = 14086,
-  [SMALL_STATE(618)] = 14134,
-  [SMALL_STATE(619)] = 14182,
-  [SMALL_STATE(620)] = 14230,
-  [SMALL_STATE(621)] = 14278,
-  [SMALL_STATE(622)] = 14326,
-  [SMALL_STATE(623)] = 14374,
-  [SMALL_STATE(624)] = 14422,
-  [SMALL_STATE(625)] = 14470,
-  [SMALL_STATE(626)] = 14518,
-  [SMALL_STATE(627)] = 14566,
-  [SMALL_STATE(628)] = 14614,
-  [SMALL_STATE(629)] = 14662,
-  [SMALL_STATE(630)] = 14710,
-  [SMALL_STATE(631)] = 14758,
-  [SMALL_STATE(632)] = 14806,
-  [SMALL_STATE(633)] = 14854,
-  [SMALL_STATE(634)] = 14902,
-  [SMALL_STATE(635)] = 14950,
-  [SMALL_STATE(636)] = 14998,
-  [SMALL_STATE(637)] = 15046,
-  [SMALL_STATE(638)] = 15094,
-  [SMALL_STATE(639)] = 15142,
-  [SMALL_STATE(640)] = 15190,
-  [SMALL_STATE(641)] = 15238,
-  [SMALL_STATE(642)] = 15286,
-  [SMALL_STATE(643)] = 15334,
-  [SMALL_STATE(644)] = 15382,
-  [SMALL_STATE(645)] = 15430,
-  [SMALL_STATE(646)] = 15478,
-  [SMALL_STATE(647)] = 15526,
-  [SMALL_STATE(648)] = 15574,
-  [SMALL_STATE(649)] = 15622,
-  [SMALL_STATE(650)] = 15670,
-  [SMALL_STATE(651)] = 15718,
-  [SMALL_STATE(652)] = 15766,
-  [SMALL_STATE(653)] = 15814,
-  [SMALL_STATE(654)] = 15862,
-  [SMALL_STATE(655)] = 15910,
-  [SMALL_STATE(656)] = 15958,
-  [SMALL_STATE(657)] = 16006,
-  [SMALL_STATE(658)] = 16054,
-  [SMALL_STATE(659)] = 16102,
-  [SMALL_STATE(660)] = 16150,
-  [SMALL_STATE(661)] = 16198,
-  [SMALL_STATE(662)] = 16246,
-  [SMALL_STATE(663)] = 16294,
-  [SMALL_STATE(664)] = 16382,
-  [SMALL_STATE(665)] = 16470,
-  [SMALL_STATE(666)] = 16558,
-  [SMALL_STATE(667)] = 16646,
-  [SMALL_STATE(668)] = 16734,
-  [SMALL_STATE(669)] = 16822,
-  [SMALL_STATE(670)] = 16910,
-  [SMALL_STATE(671)] = 16998,
-  [SMALL_STATE(672)] = 17086,
-  [SMALL_STATE(673)] = 17174,
-  [SMALL_STATE(674)] = 17262,
-  [SMALL_STATE(675)] = 17350,
-  [SMALL_STATE(676)] = 17438,
-  [SMALL_STATE(677)] = 17526,
-  [SMALL_STATE(678)] = 17614,
-  [SMALL_STATE(679)] = 17702,
-  [SMALL_STATE(680)] = 17790,
-  [SMALL_STATE(681)] = 17878,
-  [SMALL_STATE(682)] = 17966,
-  [SMALL_STATE(683)] = 18054,
-  [SMALL_STATE(684)] = 18142,
-  [SMALL_STATE(685)] = 18230,
-  [SMALL_STATE(686)] = 18318,
-  [SMALL_STATE(687)] = 18406,
-  [SMALL_STATE(688)] = 18494,
-  [SMALL_STATE(689)] = 18582,
-  [SMALL_STATE(690)] = 18670,
-  [SMALL_STATE(691)] = 18758,
-  [SMALL_STATE(692)] = 18846,
-  [SMALL_STATE(693)] = 18934,
-  [SMALL_STATE(694)] = 19022,
-  [SMALL_STATE(695)] = 19110,
-  [SMALL_STATE(696)] = 19198,
-  [SMALL_STATE(697)] = 19286,
-  [SMALL_STATE(698)] = 19374,
-  [SMALL_STATE(699)] = 19462,
-  [SMALL_STATE(700)] = 19550,
-  [SMALL_STATE(701)] = 19638,
-  [SMALL_STATE(702)] = 19726,
-  [SMALL_STATE(703)] = 19802,
-  [SMALL_STATE(704)] = 19878,
-  [SMALL_STATE(705)] = 19923,
-  [SMALL_STATE(706)] = 19962,
-  [SMALL_STATE(707)] = 19998,
-  [SMALL_STATE(708)] = 20034,
-  [SMALL_STATE(709)] = 20074,
-  [SMALL_STATE(710)] = 20110,
-  [SMALL_STATE(711)] = 20146,
-  [SMALL_STATE(712)] = 20182,
-  [SMALL_STATE(713)] = 20218,
-  [SMALL_STATE(714)] = 20254,
-  [SMALL_STATE(715)] = 20300,
-  [SMALL_STATE(716)] = 20336,
-  [SMALL_STATE(717)] = 20372,
-  [SMALL_STATE(718)] = 20408,
-  [SMALL_STATE(719)] = 20444,
-  [SMALL_STATE(720)] = 20480,
-  [SMALL_STATE(721)] = 20516,
-  [SMALL_STATE(722)] = 20552,
-  [SMALL_STATE(723)] = 20590,
-  [SMALL_STATE(724)] = 20626,
-  [SMALL_STATE(725)] = 20662,
-  [SMALL_STATE(726)] = 20698,
-  [SMALL_STATE(727)] = 20734,
-  [SMALL_STATE(728)] = 20770,
-  [SMALL_STATE(729)] = 20806,
-  [SMALL_STATE(730)] = 20842,
-  [SMALL_STATE(731)] = 20878,
-  [SMALL_STATE(732)] = 20914,
-  [SMALL_STATE(733)] = 20950,
-  [SMALL_STATE(734)] = 20986,
-  [SMALL_STATE(735)] = 21022,
-  [SMALL_STATE(736)] = 21058,
-  [SMALL_STATE(737)] = 21094,
-  [SMALL_STATE(738)] = 21130,
-  [SMALL_STATE(739)] = 21166,
-  [SMALL_STATE(740)] = 21202,
-  [SMALL_STATE(741)] = 21238,
-  [SMALL_STATE(742)] = 21274,
-  [SMALL_STATE(743)] = 21312,
-  [SMALL_STATE(744)] = 21348,
-  [SMALL_STATE(745)] = 21384,
-  [SMALL_STATE(746)] = 21420,
-  [SMALL_STATE(747)] = 21456,
-  [SMALL_STATE(748)] = 21492,
-  [SMALL_STATE(749)] = 21528,
-  [SMALL_STATE(750)] = 21564,
-  [SMALL_STATE(751)] = 21619,
-  [SMALL_STATE(752)] = 21686,
-  [SMALL_STATE(753)] = 21727,
-  [SMALL_STATE(754)] = 21794,
-  [SMALL_STATE(755)] = 21861,
-  [SMALL_STATE(756)] = 21928,
-  [SMALL_STATE(757)] = 21995,
-  [SMALL_STATE(758)] = 22062,
-  [SMALL_STATE(759)] = 22097,
-  [SMALL_STATE(760)] = 22164,
-  [SMALL_STATE(761)] = 22199,
-  [SMALL_STATE(762)] = 22234,
-  [SMALL_STATE(763)] = 22269,
-  [SMALL_STATE(764)] = 22336,
-  [SMALL_STATE(765)] = 22389,
-  [SMALL_STATE(766)] = 22446,
-  [SMALL_STATE(767)] = 22495,
-  [SMALL_STATE(768)] = 22562,
-  [SMALL_STATE(769)] = 22603,
-  [SMALL_STATE(770)] = 22648,
-  [SMALL_STATE(771)] = 22701,
-  [SMALL_STATE(772)] = 22736,
-  [SMALL_STATE(773)] = 22803,
-  [SMALL_STATE(774)] = 22870,
-  [SMALL_STATE(775)] = 22937,
-  [SMALL_STATE(776)] = 22972,
-  [SMALL_STATE(777)] = 23007,
-  [SMALL_STATE(778)] = 23074,
-  [SMALL_STATE(779)] = 23141,
-  [SMALL_STATE(780)] = 23208,
-  [SMALL_STATE(781)] = 23275,
-  [SMALL_STATE(782)] = 23342,
-  [SMALL_STATE(783)] = 23409,
-  [SMALL_STATE(784)] = 23476,
-  [SMALL_STATE(785)] = 23543,
-  [SMALL_STATE(786)] = 23610,
-  [SMALL_STATE(787)] = 23677,
-  [SMALL_STATE(788)] = 23712,
-  [SMALL_STATE(789)] = 23765,
-  [SMALL_STATE(790)] = 23800,
-  [SMALL_STATE(791)] = 23835,
-  [SMALL_STATE(792)] = 23902,
-  [SMALL_STATE(793)] = 23961,
-  [SMALL_STATE(794)] = 24028,
-  [SMALL_STATE(795)] = 24063,
-  [SMALL_STATE(796)] = 24098,
-  [SMALL_STATE(797)] = 24165,
-  [SMALL_STATE(798)] = 24232,
-  [SMALL_STATE(799)] = 24299,
-  [SMALL_STATE(800)] = 24366,
-  [SMALL_STATE(801)] = 24433,
-  [SMALL_STATE(802)] = 24500,
-  [SMALL_STATE(803)] = 24567,
-  [SMALL_STATE(804)] = 24634,
-  [SMALL_STATE(805)] = 24669,
-  [SMALL_STATE(806)] = 24704,
-  [SMALL_STATE(807)] = 24771,
-  [SMALL_STATE(808)] = 24838,
-  [SMALL_STATE(809)] = 24873,
-  [SMALL_STATE(810)] = 24940,
-  [SMALL_STATE(811)] = 24975,
-  [SMALL_STATE(812)] = 25042,
-  [SMALL_STATE(813)] = 25109,
-  [SMALL_STATE(814)] = 25155,
-  [SMALL_STATE(815)] = 25201,
-  [SMALL_STATE(816)] = 25240,
-  [SMALL_STATE(817)] = 25279,
-  [SMALL_STATE(818)] = 25340,
-  [SMALL_STATE(819)] = 25382,
-  [SMALL_STATE(820)] = 25444,
-  [SMALL_STATE(821)] = 25502,
-  [SMALL_STATE(822)] = 25536,
-  [SMALL_STATE(823)] = 25588,
-  [SMALL_STATE(824)] = 25640,
-  [SMALL_STATE(825)] = 25690,
-  [SMALL_STATE(826)] = 25744,
-  [SMALL_STATE(827)] = 25790,
-  [SMALL_STATE(828)] = 25828,
-  [SMALL_STATE(829)] = 25870,
-  [SMALL_STATE(830)] = 25926,
-  [SMALL_STATE(831)] = 25976,
-  [SMALL_STATE(832)] = 26026,
-  [SMALL_STATE(833)] = 26082,
-  [SMALL_STATE(834)] = 26136,
-  [SMALL_STATE(835)] = 26176,
-  [SMALL_STATE(836)] = 26226,
-  [SMALL_STATE(837)] = 26278,
-  [SMALL_STATE(838)] = 26340,
-  [SMALL_STATE(839)] = 26402,
-  [SMALL_STATE(840)] = 26454,
-  [SMALL_STATE(841)] = 26508,
-  [SMALL_STATE(842)] = 26570,
-  [SMALL_STATE(843)] = 26608,
-  [SMALL_STATE(844)] = 26650,
-  [SMALL_STATE(845)] = 26712,
-  [SMALL_STATE(846)] = 26750,
-  [SMALL_STATE(847)] = 26784,
-  [SMALL_STATE(848)] = 26822,
-  [SMALL_STATE(849)] = 26860,
-  [SMALL_STATE(850)] = 26906,
-  [SMALL_STATE(851)] = 26962,
-  [SMALL_STATE(852)] = 27012,
-  [SMALL_STATE(853)] = 27074,
-  [SMALL_STATE(854)] = 27112,
-  [SMALL_STATE(855)] = 27164,
-  [SMALL_STATE(856)] = 27210,
-  [SMALL_STATE(857)] = 27272,
-  [SMALL_STATE(858)] = 27322,
-  [SMALL_STATE(859)] = 27376,
-  [SMALL_STATE(860)] = 27435,
-  [SMALL_STATE(861)] = 27494,
-  [SMALL_STATE(862)] = 27553,
-  [SMALL_STATE(863)] = 27612,
-  [SMALL_STATE(864)] = 27649,
-  [SMALL_STATE(865)] = 27686,
-  [SMALL_STATE(866)] = 27723,
-  [SMALL_STATE(867)] = 27760,
-  [SMALL_STATE(868)] = 27819,
-  [SMALL_STATE(869)] = 27852,
-  [SMALL_STATE(870)] = 27911,
-  [SMALL_STATE(871)] = 27966,
-  [SMALL_STATE(872)] = 28025,
-  [SMALL_STATE(873)] = 28058,
-  [SMALL_STATE(874)] = 28095,
-  [SMALL_STATE(875)] = 28152,
-  [SMALL_STATE(876)] = 28189,
-  [SMALL_STATE(877)] = 28219,
-  [SMALL_STATE(878)] = 28275,
-  [SMALL_STATE(879)] = 28305,
-  [SMALL_STATE(880)] = 28335,
-  [SMALL_STATE(881)] = 28365,
-  [SMALL_STATE(882)] = 28395,
-  [SMALL_STATE(883)] = 28431,
-  [SMALL_STATE(884)] = 28461,
-  [SMALL_STATE(885)] = 28497,
-  [SMALL_STATE(886)] = 28527,
-  [SMALL_STATE(887)] = 28557,
-  [SMALL_STATE(888)] = 28587,
-  [SMALL_STATE(889)] = 28617,
-  [SMALL_STATE(890)] = 28647,
-  [SMALL_STATE(891)] = 28677,
-  [SMALL_STATE(892)] = 28707,
-  [SMALL_STATE(893)] = 28737,
-  [SMALL_STATE(894)] = 28767,
-  [SMALL_STATE(895)] = 28797,
-  [SMALL_STATE(896)] = 28827,
-  [SMALL_STATE(897)] = 28863,
-  [SMALL_STATE(898)] = 28895,
-  [SMALL_STATE(899)] = 28951,
-  [SMALL_STATE(900)] = 28981,
-  [SMALL_STATE(901)] = 29011,
-  [SMALL_STATE(902)] = 29041,
-  [SMALL_STATE(903)] = 29071,
-  [SMALL_STATE(904)] = 29103,
-  [SMALL_STATE(905)] = 29133,
-  [SMALL_STATE(906)] = 29163,
-  [SMALL_STATE(907)] = 29193,
-  [SMALL_STATE(908)] = 29223,
-  [SMALL_STATE(909)] = 29253,
-  [SMALL_STATE(910)] = 29283,
-  [SMALL_STATE(911)] = 29313,
-  [SMALL_STATE(912)] = 29343,
-  [SMALL_STATE(913)] = 29373,
-  [SMALL_STATE(914)] = 29403,
-  [SMALL_STATE(915)] = 29433,
-  [SMALL_STATE(916)] = 29463,
-  [SMALL_STATE(917)] = 29493,
-  [SMALL_STATE(918)] = 29523,
-  [SMALL_STATE(919)] = 29553,
-  [SMALL_STATE(920)] = 29583,
-  [SMALL_STATE(921)] = 29613,
-  [SMALL_STATE(922)] = 29647,
-  [SMALL_STATE(923)] = 29677,
-  [SMALL_STATE(924)] = 29707,
-  [SMALL_STATE(925)] = 29763,
-  [SMALL_STATE(926)] = 29819,
-  [SMALL_STATE(927)] = 29855,
-  [SMALL_STATE(928)] = 29885,
-  [SMALL_STATE(929)] = 29941,
-  [SMALL_STATE(930)] = 29971,
-  [SMALL_STATE(931)] = 30001,
-  [SMALL_STATE(932)] = 30033,
-  [SMALL_STATE(933)] = 30089,
-  [SMALL_STATE(934)] = 30119,
-  [SMALL_STATE(935)] = 30149,
-  [SMALL_STATE(936)] = 30179,
-  [SMALL_STATE(937)] = 30209,
-  [SMALL_STATE(938)] = 30265,
-  [SMALL_STATE(939)] = 30295,
-  [SMALL_STATE(940)] = 30325,
-  [SMALL_STATE(941)] = 30355,
-  [SMALL_STATE(942)] = 30411,
-  [SMALL_STATE(943)] = 30465,
-  [SMALL_STATE(944)] = 30495,
-  [SMALL_STATE(945)] = 30525,
-  [SMALL_STATE(946)] = 30581,
-  [SMALL_STATE(947)] = 30611,
-  [SMALL_STATE(948)] = 30647,
-  [SMALL_STATE(949)] = 30677,
-  [SMALL_STATE(950)] = 30713,
-  [SMALL_STATE(951)] = 30743,
-  [SMALL_STATE(952)] = 30799,
-  [SMALL_STATE(953)] = 30855,
-  [SMALL_STATE(954)] = 30891,
-  [SMALL_STATE(955)] = 30921,
-  [SMALL_STATE(956)] = 30951,
-  [SMALL_STATE(957)] = 31007,
-  [SMALL_STATE(958)] = 31037,
-  [SMALL_STATE(959)] = 31067,
-  [SMALL_STATE(960)] = 31097,
-  [SMALL_STATE(961)] = 31153,
-  [SMALL_STATE(962)] = 31209,
-  [SMALL_STATE(963)] = 31239,
-  [SMALL_STATE(964)] = 31295,
-  [SMALL_STATE(965)] = 31325,
-  [SMALL_STATE(966)] = 31355,
-  [SMALL_STATE(967)] = 31385,
-  [SMALL_STATE(968)] = 31421,
-  [SMALL_STATE(969)] = 31453,
-  [SMALL_STATE(970)] = 31483,
-  [SMALL_STATE(971)] = 31513,
-  [SMALL_STATE(972)] = 31543,
-  [SMALL_STATE(973)] = 31573,
-  [SMALL_STATE(974)] = 31603,
-  [SMALL_STATE(975)] = 31633,
-  [SMALL_STATE(976)] = 31663,
-  [SMALL_STATE(977)] = 31693,
-  [SMALL_STATE(978)] = 31723,
-  [SMALL_STATE(979)] = 31757,
-  [SMALL_STATE(980)] = 31793,
-  [SMALL_STATE(981)] = 31823,
-  [SMALL_STATE(982)] = 31859,
-  [SMALL_STATE(983)] = 31895,
-  [SMALL_STATE(984)] = 31931,
-  [SMALL_STATE(985)] = 31985,
-  [SMALL_STATE(986)] = 32041,
-  [SMALL_STATE(987)] = 32077,
-  [SMALL_STATE(988)] = 32133,
-  [SMALL_STATE(989)] = 32169,
-  [SMALL_STATE(990)] = 32199,
-  [SMALL_STATE(991)] = 32255,
-  [SMALL_STATE(992)] = 32311,
-  [SMALL_STATE(993)] = 32347,
-  [SMALL_STATE(994)] = 32383,
-  [SMALL_STATE(995)] = 32439,
-  [SMALL_STATE(996)] = 32495,
-  [SMALL_STATE(997)] = 32551,
-  [SMALL_STATE(998)] = 32607,
-  [SMALL_STATE(999)] = 32643,
-  [SMALL_STATE(1000)] = 32699,
-  [SMALL_STATE(1001)] = 32755,
-  [SMALL_STATE(1002)] = 32811,
-  [SMALL_STATE(1003)] = 32847,
-  [SMALL_STATE(1004)] = 32903,
-  [SMALL_STATE(1005)] = 32935,
-  [SMALL_STATE(1006)] = 32971,
-  [SMALL_STATE(1007)] = 33027,
-  [SMALL_STATE(1008)] = 33083,
-  [SMALL_STATE(1009)] = 33119,
-  [SMALL_STATE(1010)] = 33155,
-  [SMALL_STATE(1011)] = 33211,
-  [SMALL_STATE(1012)] = 33247,
-  [SMALL_STATE(1013)] = 33303,
-  [SMALL_STATE(1014)] = 33339,
-  [SMALL_STATE(1015)] = 33395,
-  [SMALL_STATE(1016)] = 33451,
-  [SMALL_STATE(1017)] = 33507,
-  [SMALL_STATE(1018)] = 33543,
-  [SMALL_STATE(1019)] = 33599,
-  [SMALL_STATE(1020)] = 33655,
-  [SMALL_STATE(1021)] = 33711,
-  [SMALL_STATE(1022)] = 33747,
-  [SMALL_STATE(1023)] = 33777,
-  [SMALL_STATE(1024)] = 33813,
-  [SMALL_STATE(1025)] = 33843,
-  [SMALL_STATE(1026)] = 33899,
-  [SMALL_STATE(1027)] = 33935,
-  [SMALL_STATE(1028)] = 33991,
-  [SMALL_STATE(1029)] = 34027,
-  [SMALL_STATE(1030)] = 34083,
-  [SMALL_STATE(1031)] = 34139,
-  [SMALL_STATE(1032)] = 34169,
-  [SMALL_STATE(1033)] = 34205,
-  [SMALL_STATE(1034)] = 34241,
-  [SMALL_STATE(1035)] = 34297,
-  [SMALL_STATE(1036)] = 34353,
-  [SMALL_STATE(1037)] = 34383,
-  [SMALL_STATE(1038)] = 34439,
-  [SMALL_STATE(1039)] = 34471,
-  [SMALL_STATE(1040)] = 34501,
-  [SMALL_STATE(1041)] = 34557,
-  [SMALL_STATE(1042)] = 34588,
-  [SMALL_STATE(1043)] = 34641,
-  [SMALL_STATE(1044)] = 34694,
-  [SMALL_STATE(1045)] = 34747,
-  [SMALL_STATE(1046)] = 34800,
-  [SMALL_STATE(1047)] = 34853,
-  [SMALL_STATE(1048)] = 34906,
-  [SMALL_STATE(1049)] = 34941,
-  [SMALL_STATE(1050)] = 34970,
-  [SMALL_STATE(1051)] = 34999,
-  [SMALL_STATE(1052)] = 35028,
-  [SMALL_STATE(1053)] = 35063,
-  [SMALL_STATE(1054)] = 35116,
-  [SMALL_STATE(1055)] = 35169,
-  [SMALL_STATE(1056)] = 35222,
-  [SMALL_STATE(1057)] = 35257,
-  [SMALL_STATE(1058)] = 35286,
-  [SMALL_STATE(1059)] = 35339,
-  [SMALL_STATE(1060)] = 35392,
-  [SMALL_STATE(1061)] = 35445,
-  [SMALL_STATE(1062)] = 35498,
-  [SMALL_STATE(1063)] = 35551,
-  [SMALL_STATE(1064)] = 35604,
-  [SMALL_STATE(1065)] = 35639,
-  [SMALL_STATE(1066)] = 35692,
-  [SMALL_STATE(1067)] = 35745,
-  [SMALL_STATE(1068)] = 35780,
-  [SMALL_STATE(1069)] = 35833,
-  [SMALL_STATE(1070)] = 35864,
-  [SMALL_STATE(1071)] = 35895,
-  [SMALL_STATE(1072)] = 35924,
-  [SMALL_STATE(1073)] = 35977,
-  [SMALL_STATE(1074)] = 36012,
-  [SMALL_STATE(1075)] = 36065,
-  [SMALL_STATE(1076)] = 36118,
-  [SMALL_STATE(1077)] = 36171,
-  [SMALL_STATE(1078)] = 36224,
-  [SMALL_STATE(1079)] = 36277,
-  [SMALL_STATE(1080)] = 36330,
-  [SMALL_STATE(1081)] = 36383,
-  [SMALL_STATE(1082)] = 36418,
-  [SMALL_STATE(1083)] = 36471,
-  [SMALL_STATE(1084)] = 36524,
-  [SMALL_STATE(1085)] = 36559,
-  [SMALL_STATE(1086)] = 36612,
-  [SMALL_STATE(1087)] = 36665,
-  [SMALL_STATE(1088)] = 36718,
-  [SMALL_STATE(1089)] = 36749,
-  [SMALL_STATE(1090)] = 36778,
-  [SMALL_STATE(1091)] = 36831,
-  [SMALL_STATE(1092)] = 36866,
-  [SMALL_STATE(1093)] = 36919,
-  [SMALL_STATE(1094)] = 36948,
-  [SMALL_STATE(1095)] = 37001,
-  [SMALL_STATE(1096)] = 37054,
-  [SMALL_STATE(1097)] = 37107,
-  [SMALL_STATE(1098)] = 37136,
-  [SMALL_STATE(1099)] = 37189,
-  [SMALL_STATE(1100)] = 37242,
-  [SMALL_STATE(1101)] = 37295,
-  [SMALL_STATE(1102)] = 37348,
-  [SMALL_STATE(1103)] = 37383,
-  [SMALL_STATE(1104)] = 37418,
-  [SMALL_STATE(1105)] = 37453,
-  [SMALL_STATE(1106)] = 37482,
-  [SMALL_STATE(1107)] = 37517,
-  [SMALL_STATE(1108)] = 37570,
-  [SMALL_STATE(1109)] = 37605,
-  [SMALL_STATE(1110)] = 37640,
-  [SMALL_STATE(1111)] = 37693,
-  [SMALL_STATE(1112)] = 37722,
-  [SMALL_STATE(1113)] = 37751,
-  [SMALL_STATE(1114)] = 37804,
-  [SMALL_STATE(1115)] = 37857,
-  [SMALL_STATE(1116)] = 37892,
-  [SMALL_STATE(1117)] = 37945,
-  [SMALL_STATE(1118)] = 37980,
-  [SMALL_STATE(1119)] = 38009,
-  [SMALL_STATE(1120)] = 38062,
-  [SMALL_STATE(1121)] = 38115,
-  [SMALL_STATE(1122)] = 38150,
-  [SMALL_STATE(1123)] = 38185,
-  [SMALL_STATE(1124)] = 38214,
-  [SMALL_STATE(1125)] = 38243,
-  [SMALL_STATE(1126)] = 38278,
-  [SMALL_STATE(1127)] = 38307,
-  [SMALL_STATE(1128)] = 38360,
-  [SMALL_STATE(1129)] = 38395,
-  [SMALL_STATE(1130)] = 38448,
-  [SMALL_STATE(1131)] = 38501,
-  [SMALL_STATE(1132)] = 38530,
-  [SMALL_STATE(1133)] = 38559,
-  [SMALL_STATE(1134)] = 38588,
-  [SMALL_STATE(1135)] = 38617,
-  [SMALL_STATE(1136)] = 38646,
-  [SMALL_STATE(1137)] = 38675,
-  [SMALL_STATE(1138)] = 38728,
-  [SMALL_STATE(1139)] = 38781,
-  [SMALL_STATE(1140)] = 38810,
-  [SMALL_STATE(1141)] = 38863,
-  [SMALL_STATE(1142)] = 38894,
-  [SMALL_STATE(1143)] = 38923,
-  [SMALL_STATE(1144)] = 38976,
-  [SMALL_STATE(1145)] = 39029,
-  [SMALL_STATE(1146)] = 39082,
-  [SMALL_STATE(1147)] = 39135,
-  [SMALL_STATE(1148)] = 39188,
-  [SMALL_STATE(1149)] = 39241,
-  [SMALL_STATE(1150)] = 39294,
-  [SMALL_STATE(1151)] = 39323,
-  [SMALL_STATE(1152)] = 39352,
-  [SMALL_STATE(1153)] = 39405,
-  [SMALL_STATE(1154)] = 39440,
-  [SMALL_STATE(1155)] = 39471,
-  [SMALL_STATE(1156)] = 39524,
-  [SMALL_STATE(1157)] = 39553,
-  [SMALL_STATE(1158)] = 39582,
-  [SMALL_STATE(1159)] = 39613,
-  [SMALL_STATE(1160)] = 39666,
-  [SMALL_STATE(1161)] = 39719,
-  [SMALL_STATE(1162)] = 39772,
-  [SMALL_STATE(1163)] = 39825,
-  [SMALL_STATE(1164)] = 39878,
-  [SMALL_STATE(1165)] = 39907,
-  [SMALL_STATE(1166)] = 39960,
-  [SMALL_STATE(1167)] = 39989,
-  [SMALL_STATE(1168)] = 40042,
-  [SMALL_STATE(1169)] = 40095,
-  [SMALL_STATE(1170)] = 40124,
-  [SMALL_STATE(1171)] = 40153,
-  [SMALL_STATE(1172)] = 40188,
-  [SMALL_STATE(1173)] = 40217,
-  [SMALL_STATE(1174)] = 40248,
-  [SMALL_STATE(1175)] = 40301,
-  [SMALL_STATE(1176)] = 40354,
-  [SMALL_STATE(1177)] = 40407,
-  [SMALL_STATE(1178)] = 40460,
-  [SMALL_STATE(1179)] = 40513,
-  [SMALL_STATE(1180)] = 40566,
-  [SMALL_STATE(1181)] = 40601,
-  [SMALL_STATE(1182)] = 40631,
-  [SMALL_STATE(1183)] = 40661,
-  [SMALL_STATE(1184)] = 40691,
-  [SMALL_STATE(1185)] = 40723,
-  [SMALL_STATE(1186)] = 40753,
-  [SMALL_STATE(1187)] = 40783,
-  [SMALL_STATE(1188)] = 40813,
-  [SMALL_STATE(1189)] = 40843,
-  [SMALL_STATE(1190)] = 40873,
-  [SMALL_STATE(1191)] = 40925,
-  [SMALL_STATE(1192)] = 40955,
-  [SMALL_STATE(1193)] = 40985,
-  [SMALL_STATE(1194)] = 41015,
-  [SMALL_STATE(1195)] = 41045,
-  [SMALL_STATE(1196)] = 41075,
-  [SMALL_STATE(1197)] = 41105,
-  [SMALL_STATE(1198)] = 41135,
-  [SMALL_STATE(1199)] = 41165,
-  [SMALL_STATE(1200)] = 41195,
-  [SMALL_STATE(1201)] = 41225,
-  [SMALL_STATE(1202)] = 41259,
-  [SMALL_STATE(1203)] = 41289,
-  [SMALL_STATE(1204)] = 41319,
-  [SMALL_STATE(1205)] = 41371,
-  [SMALL_STATE(1206)] = 41401,
-  [SMALL_STATE(1207)] = 41431,
-  [SMALL_STATE(1208)] = 41461,
-  [SMALL_STATE(1209)] = 41491,
-  [SMALL_STATE(1210)] = 41521,
-  [SMALL_STATE(1211)] = 41551,
-  [SMALL_STATE(1212)] = 41583,
-  [SMALL_STATE(1213)] = 41635,
-  [SMALL_STATE(1214)] = 41665,
-  [SMALL_STATE(1215)] = 41695,
-  [SMALL_STATE(1216)] = 41724,
-  [SMALL_STATE(1217)] = 41753,
-  [SMALL_STATE(1218)] = 41782,
-  [SMALL_STATE(1219)] = 41811,
-  [SMALL_STATE(1220)] = 41840,
-  [SMALL_STATE(1221)] = 41869,
-  [SMALL_STATE(1222)] = 41898,
-  [SMALL_STATE(1223)] = 41947,
-  [SMALL_STATE(1224)] = 41976,
-  [SMALL_STATE(1225)] = 42005,
-  [SMALL_STATE(1226)] = 42034,
-  [SMALL_STATE(1227)] = 42063,
-  [SMALL_STATE(1228)] = 42092,
-  [SMALL_STATE(1229)] = 42121,
-  [SMALL_STATE(1230)] = 42150,
-  [SMALL_STATE(1231)] = 42179,
-  [SMALL_STATE(1232)] = 42208,
-  [SMALL_STATE(1233)] = 42237,
-  [SMALL_STATE(1234)] = 42266,
-  [SMALL_STATE(1235)] = 42295,
-  [SMALL_STATE(1236)] = 42324,
-  [SMALL_STATE(1237)] = 42353,
-  [SMALL_STATE(1238)] = 42382,
-  [SMALL_STATE(1239)] = 42411,
-  [SMALL_STATE(1240)] = 42440,
-  [SMALL_STATE(1241)] = 42469,
-  [SMALL_STATE(1242)] = 42498,
-  [SMALL_STATE(1243)] = 42527,
-  [SMALL_STATE(1244)] = 42556,
-  [SMALL_STATE(1245)] = 42585,
-  [SMALL_STATE(1246)] = 42614,
-  [SMALL_STATE(1247)] = 42643,
-  [SMALL_STATE(1248)] = 42672,
-  [SMALL_STATE(1249)] = 42701,
-  [SMALL_STATE(1250)] = 42730,
-  [SMALL_STATE(1251)] = 42759,
-  [SMALL_STATE(1252)] = 42788,
-  [SMALL_STATE(1253)] = 42837,
-  [SMALL_STATE(1254)] = 42866,
-  [SMALL_STATE(1255)] = 42895,
-  [SMALL_STATE(1256)] = 42944,
-  [SMALL_STATE(1257)] = 42973,
-  [SMALL_STATE(1258)] = 43002,
-  [SMALL_STATE(1259)] = 43031,
-  [SMALL_STATE(1260)] = 43060,
-  [SMALL_STATE(1261)] = 43089,
-  [SMALL_STATE(1262)] = 43118,
-  [SMALL_STATE(1263)] = 43147,
-  [SMALL_STATE(1264)] = 43176,
-  [SMALL_STATE(1265)] = 43205,
-  [SMALL_STATE(1266)] = 43234,
-  [SMALL_STATE(1267)] = 43283,
-  [SMALL_STATE(1268)] = 43312,
-  [SMALL_STATE(1269)] = 43341,
-  [SMALL_STATE(1270)] = 43370,
-  [SMALL_STATE(1271)] = 43399,
-  [SMALL_STATE(1272)] = 43428,
-  [SMALL_STATE(1273)] = 43457,
-  [SMALL_STATE(1274)] = 43486,
-  [SMALL_STATE(1275)] = 43515,
-  [SMALL_STATE(1276)] = 43544,
-  [SMALL_STATE(1277)] = 43573,
-  [SMALL_STATE(1278)] = 43602,
-  [SMALL_STATE(1279)] = 43631,
-  [SMALL_STATE(1280)] = 43660,
-  [SMALL_STATE(1281)] = 43689,
-  [SMALL_STATE(1282)] = 43718,
-  [SMALL_STATE(1283)] = 43747,
-  [SMALL_STATE(1284)] = 43776,
-  [SMALL_STATE(1285)] = 43805,
-  [SMALL_STATE(1286)] = 43834,
-  [SMALL_STATE(1287)] = 43863,
-  [SMALL_STATE(1288)] = 43892,
-  [SMALL_STATE(1289)] = 43921,
-  [SMALL_STATE(1290)] = 43950,
-  [SMALL_STATE(1291)] = 43979,
-  [SMALL_STATE(1292)] = 44008,
-  [SMALL_STATE(1293)] = 44037,
-  [SMALL_STATE(1294)] = 44066,
-  [SMALL_STATE(1295)] = 44095,
-  [SMALL_STATE(1296)] = 44124,
-  [SMALL_STATE(1297)] = 44153,
-  [SMALL_STATE(1298)] = 44182,
-  [SMALL_STATE(1299)] = 44211,
-  [SMALL_STATE(1300)] = 44240,
-  [SMALL_STATE(1301)] = 44269,
-  [SMALL_STATE(1302)] = 44298,
-  [SMALL_STATE(1303)] = 44327,
-  [SMALL_STATE(1304)] = 44356,
-  [SMALL_STATE(1305)] = 44385,
-  [SMALL_STATE(1306)] = 44414,
-  [SMALL_STATE(1307)] = 44443,
-  [SMALL_STATE(1308)] = 44472,
-  [SMALL_STATE(1309)] = 44501,
-  [SMALL_STATE(1310)] = 44530,
-  [SMALL_STATE(1311)] = 44559,
-  [SMALL_STATE(1312)] = 44588,
-  [SMALL_STATE(1313)] = 44617,
-  [SMALL_STATE(1314)] = 44646,
-  [SMALL_STATE(1315)] = 44673,
-  [SMALL_STATE(1316)] = 44702,
-  [SMALL_STATE(1317)] = 44731,
-  [SMALL_STATE(1318)] = 44760,
-  [SMALL_STATE(1319)] = 44789,
-  [SMALL_STATE(1320)] = 44818,
-  [SMALL_STATE(1321)] = 44847,
-  [SMALL_STATE(1322)] = 44876,
-  [SMALL_STATE(1323)] = 44905,
-  [SMALL_STATE(1324)] = 44934,
-  [SMALL_STATE(1325)] = 44963,
-  [SMALL_STATE(1326)] = 44992,
-  [SMALL_STATE(1327)] = 45021,
-  [SMALL_STATE(1328)] = 45050,
-  [SMALL_STATE(1329)] = 45079,
-  [SMALL_STATE(1330)] = 45108,
-  [SMALL_STATE(1331)] = 45137,
-  [SMALL_STATE(1332)] = 45166,
-  [SMALL_STATE(1333)] = 45195,
-  [SMALL_STATE(1334)] = 45244,
-  [SMALL_STATE(1335)] = 45273,
-  [SMALL_STATE(1336)] = 45322,
-  [SMALL_STATE(1337)] = 45351,
-  [SMALL_STATE(1338)] = 45380,
-  [SMALL_STATE(1339)] = 45409,
-  [SMALL_STATE(1340)] = 45438,
-  [SMALL_STATE(1341)] = 45467,
-  [SMALL_STATE(1342)] = 45496,
-  [SMALL_STATE(1343)] = 45525,
-  [SMALL_STATE(1344)] = 45574,
-  [SMALL_STATE(1345)] = 45603,
-  [SMALL_STATE(1346)] = 45632,
-  [SMALL_STATE(1347)] = 45661,
-  [SMALL_STATE(1348)] = 45690,
-  [SMALL_STATE(1349)] = 45719,
-  [SMALL_STATE(1350)] = 45748,
-  [SMALL_STATE(1351)] = 45777,
-  [SMALL_STATE(1352)] = 45806,
-  [SMALL_STATE(1353)] = 45835,
-  [SMALL_STATE(1354)] = 45864,
-  [SMALL_STATE(1355)] = 45893,
-  [SMALL_STATE(1356)] = 45922,
-  [SMALL_STATE(1357)] = 45951,
-  [SMALL_STATE(1358)] = 45980,
-  [SMALL_STATE(1359)] = 46009,
-  [SMALL_STATE(1360)] = 46038,
-  [SMALL_STATE(1361)] = 46067,
-  [SMALL_STATE(1362)] = 46096,
-  [SMALL_STATE(1363)] = 46125,
-  [SMALL_STATE(1364)] = 46154,
-  [SMALL_STATE(1365)] = 46183,
-  [SMALL_STATE(1366)] = 46212,
-  [SMALL_STATE(1367)] = 46241,
-  [SMALL_STATE(1368)] = 46270,
-  [SMALL_STATE(1369)] = 46299,
-  [SMALL_STATE(1370)] = 46328,
-  [SMALL_STATE(1371)] = 46357,
-  [SMALL_STATE(1372)] = 46386,
-  [SMALL_STATE(1373)] = 46415,
-  [SMALL_STATE(1374)] = 46444,
-  [SMALL_STATE(1375)] = 46473,
-  [SMALL_STATE(1376)] = 46502,
-  [SMALL_STATE(1377)] = 46531,
-  [SMALL_STATE(1378)] = 46560,
-  [SMALL_STATE(1379)] = 46609,
-  [SMALL_STATE(1380)] = 46638,
-  [SMALL_STATE(1381)] = 46667,
-  [SMALL_STATE(1382)] = 46696,
-  [SMALL_STATE(1383)] = 46725,
-  [SMALL_STATE(1384)] = 46774,
-  [SMALL_STATE(1385)] = 46803,
-  [SMALL_STATE(1386)] = 46832,
-  [SMALL_STATE(1387)] = 46861,
-  [SMALL_STATE(1388)] = 46890,
-  [SMALL_STATE(1389)] = 46918,
-  [SMALL_STATE(1390)] = 46964,
-  [SMALL_STATE(1391)] = 47010,
-  [SMALL_STATE(1392)] = 47053,
-  [SMALL_STATE(1393)] = 47078,
-  [SMALL_STATE(1394)] = 47121,
-  [SMALL_STATE(1395)] = 47164,
-  [SMALL_STATE(1396)] = 47189,
-  [SMALL_STATE(1397)] = 47232,
-  [SMALL_STATE(1398)] = 47275,
-  [SMALL_STATE(1399)] = 47318,
-  [SMALL_STATE(1400)] = 47361,
-  [SMALL_STATE(1401)] = 47404,
-  [SMALL_STATE(1402)] = 47447,
-  [SMALL_STATE(1403)] = 47487,
-  [SMALL_STATE(1404)] = 47527,
-  [SMALL_STATE(1405)] = 47567,
-  [SMALL_STATE(1406)] = 47604,
-  [SMALL_STATE(1407)] = 47641,
-  [SMALL_STATE(1408)] = 47678,
-  [SMALL_STATE(1409)] = 47715,
-  [SMALL_STATE(1410)] = 47752,
-  [SMALL_STATE(1411)] = 47789,
-  [SMALL_STATE(1412)] = 47826,
-  [SMALL_STATE(1413)] = 47863,
-  [SMALL_STATE(1414)] = 47900,
-  [SMALL_STATE(1415)] = 47937,
-  [SMALL_STATE(1416)] = 47974,
-  [SMALL_STATE(1417)] = 48011,
-  [SMALL_STATE(1418)] = 48048,
-  [SMALL_STATE(1419)] = 48085,
-  [SMALL_STATE(1420)] = 48122,
-  [SMALL_STATE(1421)] = 48159,
-  [SMALL_STATE(1422)] = 48196,
-  [SMALL_STATE(1423)] = 48233,
-  [SMALL_STATE(1424)] = 48254,
-  [SMALL_STATE(1425)] = 48291,
-  [SMALL_STATE(1426)] = 48328,
-  [SMALL_STATE(1427)] = 48365,
-  [SMALL_STATE(1428)] = 48402,
-  [SMALL_STATE(1429)] = 48439,
-  [SMALL_STATE(1430)] = 48468,
-  [SMALL_STATE(1431)] = 48505,
-  [SMALL_STATE(1432)] = 48542,
-  [SMALL_STATE(1433)] = 48579,
-  [SMALL_STATE(1434)] = 48601,
-  [SMALL_STATE(1435)] = 48623,
-  [SMALL_STATE(1436)] = 48645,
-  [SMALL_STATE(1437)] = 48667,
-  [SMALL_STATE(1438)] = 48689,
-  [SMALL_STATE(1439)] = 48709,
-  [SMALL_STATE(1440)] = 48731,
-  [SMALL_STATE(1441)] = 48755,
-  [SMALL_STATE(1442)] = 48777,
-  [SMALL_STATE(1443)] = 48797,
-  [SMALL_STATE(1444)] = 48817,
-  [SMALL_STATE(1445)] = 48837,
-  [SMALL_STATE(1446)] = 48867,
-  [SMALL_STATE(1447)] = 48897,
-  [SMALL_STATE(1448)] = 48912,
-  [SMALL_STATE(1449)] = 48943,
-  [SMALL_STATE(1450)] = 48970,
-  [SMALL_STATE(1451)] = 49001,
-  [SMALL_STATE(1452)] = 49028,
-  [SMALL_STATE(1453)] = 49055,
-  [SMALL_STATE(1454)] = 49075,
-  [SMALL_STATE(1455)] = 49095,
-  [SMALL_STATE(1456)] = 49123,
-  [SMALL_STATE(1457)] = 49143,
-  [SMALL_STATE(1458)] = 49163,
-  [SMALL_STATE(1459)] = 49191,
-  [SMALL_STATE(1460)] = 49211,
-  [SMALL_STATE(1461)] = 49231,
-  [SMALL_STATE(1462)] = 49255,
-  [SMALL_STATE(1463)] = 49275,
-  [SMALL_STATE(1464)] = 49295,
-  [SMALL_STATE(1465)] = 49319,
-  [SMALL_STATE(1466)] = 49339,
-  [SMALL_STATE(1467)] = 49359,
-  [SMALL_STATE(1468)] = 49379,
-  [SMALL_STATE(1469)] = 49399,
-  [SMALL_STATE(1470)] = 49413,
-  [SMALL_STATE(1471)] = 49433,
-  [SMALL_STATE(1472)] = 49453,
-  [SMALL_STATE(1473)] = 49473,
-  [SMALL_STATE(1474)] = 49493,
-  [SMALL_STATE(1475)] = 49506,
-  [SMALL_STATE(1476)] = 49527,
-  [SMALL_STATE(1477)] = 49540,
-  [SMALL_STATE(1478)] = 49561,
-  [SMALL_STATE(1479)] = 49582,
-  [SMALL_STATE(1480)] = 49599,
-  [SMALL_STATE(1481)] = 49612,
-  [SMALL_STATE(1482)] = 49625,
-  [SMALL_STATE(1483)] = 49645,
-  [SMALL_STATE(1484)] = 49663,
-  [SMALL_STATE(1485)] = 49683,
-  [SMALL_STATE(1486)] = 49703,
-  [SMALL_STATE(1487)] = 49721,
-  [SMALL_STATE(1488)] = 49739,
-  [SMALL_STATE(1489)] = 49759,
-  [SMALL_STATE(1490)] = 49779,
-  [SMALL_STATE(1491)] = 49799,
-  [SMALL_STATE(1492)] = 49819,
-  [SMALL_STATE(1493)] = 49831,
-  [SMALL_STATE(1494)] = 49849,
-  [SMALL_STATE(1495)] = 49869,
-  [SMALL_STATE(1496)] = 49889,
-  [SMALL_STATE(1497)] = 49907,
-  [SMALL_STATE(1498)] = 49927,
-  [SMALL_STATE(1499)] = 49947,
-  [SMALL_STATE(1500)] = 49967,
-  [SMALL_STATE(1501)] = 49985,
-  [SMALL_STATE(1502)] = 50003,
-  [SMALL_STATE(1503)] = 50019,
-  [SMALL_STATE(1504)] = 50037,
-  [SMALL_STATE(1505)] = 50053,
-  [SMALL_STATE(1506)] = 50071,
-  [SMALL_STATE(1507)] = 50091,
-  [SMALL_STATE(1508)] = 50111,
-  [SMALL_STATE(1509)] = 50129,
-  [SMALL_STATE(1510)] = 50147,
-  [SMALL_STATE(1511)] = 50165,
-  [SMALL_STATE(1512)] = 50185,
-  [SMALL_STATE(1513)] = 50205,
-  [SMALL_STATE(1514)] = 50223,
-  [SMALL_STATE(1515)] = 50243,
-  [SMALL_STATE(1516)] = 50261,
-  [SMALL_STATE(1517)] = 50281,
-  [SMALL_STATE(1518)] = 50301,
-  [SMALL_STATE(1519)] = 50319,
-  [SMALL_STATE(1520)] = 50339,
-  [SMALL_STATE(1521)] = 50359,
-  [SMALL_STATE(1522)] = 50374,
-  [SMALL_STATE(1523)] = 50391,
-  [SMALL_STATE(1524)] = 50408,
-  [SMALL_STATE(1525)] = 50425,
-  [SMALL_STATE(1526)] = 50442,
-  [SMALL_STATE(1527)] = 50453,
-  [SMALL_STATE(1528)] = 50470,
-  [SMALL_STATE(1529)] = 50487,
-  [SMALL_STATE(1530)] = 50504,
-  [SMALL_STATE(1531)] = 50521,
-  [SMALL_STATE(1532)] = 50536,
-  [SMALL_STATE(1533)] = 50551,
-  [SMALL_STATE(1534)] = 50568,
-  [SMALL_STATE(1535)] = 50583,
-  [SMALL_STATE(1536)] = 50594,
-  [SMALL_STATE(1537)] = 50611,
-  [SMALL_STATE(1538)] = 50624,
-  [SMALL_STATE(1539)] = 50639,
-  [SMALL_STATE(1540)] = 50656,
-  [SMALL_STATE(1541)] = 50673,
-  [SMALL_STATE(1542)] = 50690,
-  [SMALL_STATE(1543)] = 50707,
-  [SMALL_STATE(1544)] = 50724,
-  [SMALL_STATE(1545)] = 50741,
-  [SMALL_STATE(1546)] = 50758,
-  [SMALL_STATE(1547)] = 50773,
-  [SMALL_STATE(1548)] = 50788,
-  [SMALL_STATE(1549)] = 50805,
-  [SMALL_STATE(1550)] = 50822,
-  [SMALL_STATE(1551)] = 50839,
-  [SMALL_STATE(1552)] = 50856,
-  [SMALL_STATE(1553)] = 50873,
-  [SMALL_STATE(1554)] = 50890,
-  [SMALL_STATE(1555)] = 50903,
-  [SMALL_STATE(1556)] = 50920,
-  [SMALL_STATE(1557)] = 50935,
-  [SMALL_STATE(1558)] = 50952,
-  [SMALL_STATE(1559)] = 50969,
-  [SMALL_STATE(1560)] = 50982,
-  [SMALL_STATE(1561)] = 50999,
-  [SMALL_STATE(1562)] = 51016,
-  [SMALL_STATE(1563)] = 51031,
-  [SMALL_STATE(1564)] = 51046,
-  [SMALL_STATE(1565)] = 51061,
-  [SMALL_STATE(1566)] = 51076,
-  [SMALL_STATE(1567)] = 51091,
-  [SMALL_STATE(1568)] = 51108,
-  [SMALL_STATE(1569)] = 51125,
-  [SMALL_STATE(1570)] = 51142,
-  [SMALL_STATE(1571)] = 51155,
-  [SMALL_STATE(1572)] = 51170,
-  [SMALL_STATE(1573)] = 51183,
-  [SMALL_STATE(1574)] = 51200,
-  [SMALL_STATE(1575)] = 51215,
-  [SMALL_STATE(1576)] = 51230,
-  [SMALL_STATE(1577)] = 51243,
-  [SMALL_STATE(1578)] = 51260,
-  [SMALL_STATE(1579)] = 51275,
-  [SMALL_STATE(1580)] = 51292,
-  [SMALL_STATE(1581)] = 51309,
-  [SMALL_STATE(1582)] = 51326,
-  [SMALL_STATE(1583)] = 51339,
-  [SMALL_STATE(1584)] = 51356,
-  [SMALL_STATE(1585)] = 51373,
-  [SMALL_STATE(1586)] = 51390,
-  [SMALL_STATE(1587)] = 51407,
-  [SMALL_STATE(1588)] = 51422,
-  [SMALL_STATE(1589)] = 51437,
-  [SMALL_STATE(1590)] = 51454,
-  [SMALL_STATE(1591)] = 51467,
-  [SMALL_STATE(1592)] = 51484,
-  [SMALL_STATE(1593)] = 51495,
-  [SMALL_STATE(1594)] = 51508,
-  [SMALL_STATE(1595)] = 51523,
-  [SMALL_STATE(1596)] = 51540,
-  [SMALL_STATE(1597)] = 51552,
-  [SMALL_STATE(1598)] = 51566,
-  [SMALL_STATE(1599)] = 51580,
-  [SMALL_STATE(1600)] = 51594,
-  [SMALL_STATE(1601)] = 51606,
-  [SMALL_STATE(1602)] = 51620,
-  [SMALL_STATE(1603)] = 51634,
-  [SMALL_STATE(1604)] = 51648,
-  [SMALL_STATE(1605)] = 51662,
-  [SMALL_STATE(1606)] = 51676,
-  [SMALL_STATE(1607)] = 51690,
-  [SMALL_STATE(1608)] = 51704,
-  [SMALL_STATE(1609)] = 51718,
-  [SMALL_STATE(1610)] = 51732,
-  [SMALL_STATE(1611)] = 51746,
-  [SMALL_STATE(1612)] = 51760,
-  [SMALL_STATE(1613)] = 51774,
-  [SMALL_STATE(1614)] = 51788,
-  [SMALL_STATE(1615)] = 51802,
-  [SMALL_STATE(1616)] = 51816,
-  [SMALL_STATE(1617)] = 51830,
-  [SMALL_STATE(1618)] = 51842,
-  [SMALL_STATE(1619)] = 51852,
-  [SMALL_STATE(1620)] = 51866,
-  [SMALL_STATE(1621)] = 51880,
-  [SMALL_STATE(1622)] = 51894,
-  [SMALL_STATE(1623)] = 51908,
-  [SMALL_STATE(1624)] = 51922,
-  [SMALL_STATE(1625)] = 51936,
-  [SMALL_STATE(1626)] = 51948,
-  [SMALL_STATE(1627)] = 51962,
-  [SMALL_STATE(1628)] = 51976,
-  [SMALL_STATE(1629)] = 51990,
-  [SMALL_STATE(1630)] = 52002,
-  [SMALL_STATE(1631)] = 52014,
-  [SMALL_STATE(1632)] = 52028,
-  [SMALL_STATE(1633)] = 52042,
-  [SMALL_STATE(1634)] = 52056,
-  [SMALL_STATE(1635)] = 52070,
-  [SMALL_STATE(1636)] = 52084,
-  [SMALL_STATE(1637)] = 52098,
-  [SMALL_STATE(1638)] = 52108,
-  [SMALL_STATE(1639)] = 52122,
-  [SMALL_STATE(1640)] = 52136,
-  [SMALL_STATE(1641)] = 52150,
-  [SMALL_STATE(1642)] = 52164,
-  [SMALL_STATE(1643)] = 52178,
-  [SMALL_STATE(1644)] = 52192,
-  [SMALL_STATE(1645)] = 52206,
-  [SMALL_STATE(1646)] = 52220,
-  [SMALL_STATE(1647)] = 52234,
-  [SMALL_STATE(1648)] = 52248,
-  [SMALL_STATE(1649)] = 52262,
-  [SMALL_STATE(1650)] = 52276,
-  [SMALL_STATE(1651)] = 52290,
-  [SMALL_STATE(1652)] = 52304,
-  [SMALL_STATE(1653)] = 52318,
-  [SMALL_STATE(1654)] = 52332,
-  [SMALL_STATE(1655)] = 52346,
-  [SMALL_STATE(1656)] = 52360,
-  [SMALL_STATE(1657)] = 52372,
-  [SMALL_STATE(1658)] = 52386,
-  [SMALL_STATE(1659)] = 52400,
-  [SMALL_STATE(1660)] = 52414,
-  [SMALL_STATE(1661)] = 52428,
-  [SMALL_STATE(1662)] = 52440,
-  [SMALL_STATE(1663)] = 52454,
-  [SMALL_STATE(1664)] = 52468,
-  [SMALL_STATE(1665)] = 52482,
-  [SMALL_STATE(1666)] = 52496,
-  [SMALL_STATE(1667)] = 52510,
-  [SMALL_STATE(1668)] = 52524,
-  [SMALL_STATE(1669)] = 52538,
-  [SMALL_STATE(1670)] = 52552,
-  [SMALL_STATE(1671)] = 52566,
-  [SMALL_STATE(1672)] = 52580,
-  [SMALL_STATE(1673)] = 52594,
-  [SMALL_STATE(1674)] = 52608,
-  [SMALL_STATE(1675)] = 52622,
-  [SMALL_STATE(1676)] = 52636,
-  [SMALL_STATE(1677)] = 52650,
-  [SMALL_STATE(1678)] = 52664,
-  [SMALL_STATE(1679)] = 52678,
-  [SMALL_STATE(1680)] = 52692,
-  [SMALL_STATE(1681)] = 52706,
-  [SMALL_STATE(1682)] = 52720,
-  [SMALL_STATE(1683)] = 52734,
-  [SMALL_STATE(1684)] = 52748,
-  [SMALL_STATE(1685)] = 52762,
-  [SMALL_STATE(1686)] = 52776,
-  [SMALL_STATE(1687)] = 52790,
-  [SMALL_STATE(1688)] = 52804,
-  [SMALL_STATE(1689)] = 52818,
-  [SMALL_STATE(1690)] = 52832,
-  [SMALL_STATE(1691)] = 52846,
-  [SMALL_STATE(1692)] = 52860,
-  [SMALL_STATE(1693)] = 52874,
-  [SMALL_STATE(1694)] = 52888,
-  [SMALL_STATE(1695)] = 52902,
-  [SMALL_STATE(1696)] = 52916,
-  [SMALL_STATE(1697)] = 52930,
-  [SMALL_STATE(1698)] = 52944,
-  [SMALL_STATE(1699)] = 52958,
-  [SMALL_STATE(1700)] = 52972,
-  [SMALL_STATE(1701)] = 52986,
-  [SMALL_STATE(1702)] = 53000,
-  [SMALL_STATE(1703)] = 53014,
-  [SMALL_STATE(1704)] = 53028,
-  [SMALL_STATE(1705)] = 53042,
-  [SMALL_STATE(1706)] = 53056,
-  [SMALL_STATE(1707)] = 53070,
-  [SMALL_STATE(1708)] = 53084,
-  [SMALL_STATE(1709)] = 53098,
-  [SMALL_STATE(1710)] = 53112,
-  [SMALL_STATE(1711)] = 53126,
-  [SMALL_STATE(1712)] = 53140,
-  [SMALL_STATE(1713)] = 53154,
-  [SMALL_STATE(1714)] = 53166,
-  [SMALL_STATE(1715)] = 53180,
-  [SMALL_STATE(1716)] = 53194,
-  [SMALL_STATE(1717)] = 53208,
-  [SMALL_STATE(1718)] = 53222,
-  [SMALL_STATE(1719)] = 53236,
-  [SMALL_STATE(1720)] = 53250,
-  [SMALL_STATE(1721)] = 53264,
-  [SMALL_STATE(1722)] = 53278,
-  [SMALL_STATE(1723)] = 53292,
-  [SMALL_STATE(1724)] = 53302,
-  [SMALL_STATE(1725)] = 53316,
-  [SMALL_STATE(1726)] = 53330,
-  [SMALL_STATE(1727)] = 53344,
-  [SMALL_STATE(1728)] = 53358,
-  [SMALL_STATE(1729)] = 53372,
-  [SMALL_STATE(1730)] = 53386,
-  [SMALL_STATE(1731)] = 53400,
-  [SMALL_STATE(1732)] = 53414,
-  [SMALL_STATE(1733)] = 53428,
-  [SMALL_STATE(1734)] = 53442,
-  [SMALL_STATE(1735)] = 53456,
-  [SMALL_STATE(1736)] = 53470,
-  [SMALL_STATE(1737)] = 53484,
-  [SMALL_STATE(1738)] = 53498,
-  [SMALL_STATE(1739)] = 53512,
-  [SMALL_STATE(1740)] = 53526,
-  [SMALL_STATE(1741)] = 53540,
-  [SMALL_STATE(1742)] = 53554,
-  [SMALL_STATE(1743)] = 53568,
-  [SMALL_STATE(1744)] = 53582,
-  [SMALL_STATE(1745)] = 53596,
-  [SMALL_STATE(1746)] = 53610,
-  [SMALL_STATE(1747)] = 53624,
-  [SMALL_STATE(1748)] = 53633,
-  [SMALL_STATE(1749)] = 53644,
-  [SMALL_STATE(1750)] = 53655,
-  [SMALL_STATE(1751)] = 53666,
-  [SMALL_STATE(1752)] = 53677,
-  [SMALL_STATE(1753)] = 53688,
-  [SMALL_STATE(1754)] = 53699,
-  [SMALL_STATE(1755)] = 53710,
-  [SMALL_STATE(1756)] = 53721,
-  [SMALL_STATE(1757)] = 53732,
-  [SMALL_STATE(1758)] = 53743,
-  [SMALL_STATE(1759)] = 53754,
-  [SMALL_STATE(1760)] = 53763,
-  [SMALL_STATE(1761)] = 53772,
-  [SMALL_STATE(1762)] = 53783,
-  [SMALL_STATE(1763)] = 53794,
-  [SMALL_STATE(1764)] = 53805,
-  [SMALL_STATE(1765)] = 53816,
-  [SMALL_STATE(1766)] = 53827,
-  [SMALL_STATE(1767)] = 53838,
-  [SMALL_STATE(1768)] = 53847,
-  [SMALL_STATE(1769)] = 53858,
-  [SMALL_STATE(1770)] = 53869,
-  [SMALL_STATE(1771)] = 53878,
-  [SMALL_STATE(1772)] = 53889,
-  [SMALL_STATE(1773)] = 53898,
-  [SMALL_STATE(1774)] = 53907,
-  [SMALL_STATE(1775)] = 53918,
-  [SMALL_STATE(1776)] = 53929,
-  [SMALL_STATE(1777)] = 53940,
-  [SMALL_STATE(1778)] = 53951,
-  [SMALL_STATE(1779)] = 53960,
-  [SMALL_STATE(1780)] = 53969,
-  [SMALL_STATE(1781)] = 53978,
-  [SMALL_STATE(1782)] = 53989,
-  [SMALL_STATE(1783)] = 54000,
-  [SMALL_STATE(1784)] = 54011,
-  [SMALL_STATE(1785)] = 54020,
-  [SMALL_STATE(1786)] = 54029,
-  [SMALL_STATE(1787)] = 54040,
-  [SMALL_STATE(1788)] = 54049,
-  [SMALL_STATE(1789)] = 54060,
-  [SMALL_STATE(1790)] = 54069,
-  [SMALL_STATE(1791)] = 54078,
-  [SMALL_STATE(1792)] = 54089,
-  [SMALL_STATE(1793)] = 54100,
-  [SMALL_STATE(1794)] = 54111,
-  [SMALL_STATE(1795)] = 54122,
-  [SMALL_STATE(1796)] = 54133,
-  [SMALL_STATE(1797)] = 54144,
-  [SMALL_STATE(1798)] = 54155,
-  [SMALL_STATE(1799)] = 54164,
-  [SMALL_STATE(1800)] = 54175,
-  [SMALL_STATE(1801)] = 54186,
-  [SMALL_STATE(1802)] = 54194,
-  [SMALL_STATE(1803)] = 54202,
-  [SMALL_STATE(1804)] = 54210,
-  [SMALL_STATE(1805)] = 54218,
-  [SMALL_STATE(1806)] = 54226,
-  [SMALL_STATE(1807)] = 54234,
-  [SMALL_STATE(1808)] = 54242,
-  [SMALL_STATE(1809)] = 54250,
-  [SMALL_STATE(1810)] = 54258,
-  [SMALL_STATE(1811)] = 54266,
-  [SMALL_STATE(1812)] = 54274,
-  [SMALL_STATE(1813)] = 54282,
-  [SMALL_STATE(1814)] = 54290,
-  [SMALL_STATE(1815)] = 54298,
-  [SMALL_STATE(1816)] = 54306,
-  [SMALL_STATE(1817)] = 54314,
-  [SMALL_STATE(1818)] = 54322,
-  [SMALL_STATE(1819)] = 54330,
-  [SMALL_STATE(1820)] = 54338,
-  [SMALL_STATE(1821)] = 54346,
-  [SMALL_STATE(1822)] = 54354,
-  [SMALL_STATE(1823)] = 54362,
-  [SMALL_STATE(1824)] = 54370,
-  [SMALL_STATE(1825)] = 54378,
-  [SMALL_STATE(1826)] = 54386,
-  [SMALL_STATE(1827)] = 54394,
-  [SMALL_STATE(1828)] = 54402,
-  [SMALL_STATE(1829)] = 54410,
-  [SMALL_STATE(1830)] = 54418,
-  [SMALL_STATE(1831)] = 54426,
-  [SMALL_STATE(1832)] = 54434,
-  [SMALL_STATE(1833)] = 54442,
-  [SMALL_STATE(1834)] = 54450,
-  [SMALL_STATE(1835)] = 54458,
-  [SMALL_STATE(1836)] = 54466,
-  [SMALL_STATE(1837)] = 54474,
-  [SMALL_STATE(1838)] = 54482,
-  [SMALL_STATE(1839)] = 54490,
-  [SMALL_STATE(1840)] = 54498,
-  [SMALL_STATE(1841)] = 54506,
-  [SMALL_STATE(1842)] = 54514,
-  [SMALL_STATE(1843)] = 54522,
-  [SMALL_STATE(1844)] = 54530,
-  [SMALL_STATE(1845)] = 54538,
-  [SMALL_STATE(1846)] = 54546,
-  [SMALL_STATE(1847)] = 54554,
-  [SMALL_STATE(1848)] = 54562,
-  [SMALL_STATE(1849)] = 54570,
-  [SMALL_STATE(1850)] = 54578,
-  [SMALL_STATE(1851)] = 54586,
-  [SMALL_STATE(1852)] = 54594,
-  [SMALL_STATE(1853)] = 54602,
-  [SMALL_STATE(1854)] = 54610,
-  [SMALL_STATE(1855)] = 54618,
-  [SMALL_STATE(1856)] = 54626,
-  [SMALL_STATE(1857)] = 54634,
-  [SMALL_STATE(1858)] = 54642,
-  [SMALL_STATE(1859)] = 54650,
-  [SMALL_STATE(1860)] = 54658,
-  [SMALL_STATE(1861)] = 54666,
-  [SMALL_STATE(1862)] = 54674,
-  [SMALL_STATE(1863)] = 54682,
-  [SMALL_STATE(1864)] = 54690,
-  [SMALL_STATE(1865)] = 54698,
-  [SMALL_STATE(1866)] = 54706,
-  [SMALL_STATE(1867)] = 54714,
-  [SMALL_STATE(1868)] = 54722,
-  [SMALL_STATE(1869)] = 54730,
-  [SMALL_STATE(1870)] = 54738,
-  [SMALL_STATE(1871)] = 54746,
-  [SMALL_STATE(1872)] = 54754,
-  [SMALL_STATE(1873)] = 54762,
-  [SMALL_STATE(1874)] = 54770,
-  [SMALL_STATE(1875)] = 54778,
-  [SMALL_STATE(1876)] = 54786,
-  [SMALL_STATE(1877)] = 54794,
-  [SMALL_STATE(1878)] = 54802,
-  [SMALL_STATE(1879)] = 54810,
-  [SMALL_STATE(1880)] = 54818,
-  [SMALL_STATE(1881)] = 54826,
-  [SMALL_STATE(1882)] = 54834,
-  [SMALL_STATE(1883)] = 54842,
-  [SMALL_STATE(1884)] = 54850,
-  [SMALL_STATE(1885)] = 54858,
-  [SMALL_STATE(1886)] = 54866,
-  [SMALL_STATE(1887)] = 54874,
-  [SMALL_STATE(1888)] = 54882,
-  [SMALL_STATE(1889)] = 54890,
-  [SMALL_STATE(1890)] = 54898,
-  [SMALL_STATE(1891)] = 54906,
-  [SMALL_STATE(1892)] = 54914,
-  [SMALL_STATE(1893)] = 54922,
-  [SMALL_STATE(1894)] = 54930,
-  [SMALL_STATE(1895)] = 54938,
-  [SMALL_STATE(1896)] = 54946,
-  [SMALL_STATE(1897)] = 54954,
-  [SMALL_STATE(1898)] = 54962,
-  [SMALL_STATE(1899)] = 54970,
-  [SMALL_STATE(1900)] = 54978,
-  [SMALL_STATE(1901)] = 54986,
-  [SMALL_STATE(1902)] = 54994,
-  [SMALL_STATE(1903)] = 55002,
-  [SMALL_STATE(1904)] = 55010,
-  [SMALL_STATE(1905)] = 55018,
-  [SMALL_STATE(1906)] = 55026,
-  [SMALL_STATE(1907)] = 55034,
-  [SMALL_STATE(1908)] = 55042,
-  [SMALL_STATE(1909)] = 55050,
-  [SMALL_STATE(1910)] = 55058,
-  [SMALL_STATE(1911)] = 55066,
-  [SMALL_STATE(1912)] = 55074,
-  [SMALL_STATE(1913)] = 55082,
-  [SMALL_STATE(1914)] = 55090,
-  [SMALL_STATE(1915)] = 55098,
-  [SMALL_STATE(1916)] = 55106,
-  [SMALL_STATE(1917)] = 55114,
-  [SMALL_STATE(1918)] = 55122,
-  [SMALL_STATE(1919)] = 55130,
-  [SMALL_STATE(1920)] = 55138,
-  [SMALL_STATE(1921)] = 55146,
-  [SMALL_STATE(1922)] = 55154,
-  [SMALL_STATE(1923)] = 55162,
-  [SMALL_STATE(1924)] = 55170,
-  [SMALL_STATE(1925)] = 55178,
-  [SMALL_STATE(1926)] = 55186,
-  [SMALL_STATE(1927)] = 55194,
-  [SMALL_STATE(1928)] = 55202,
-  [SMALL_STATE(1929)] = 55210,
-  [SMALL_STATE(1930)] = 55218,
-  [SMALL_STATE(1931)] = 55226,
-  [SMALL_STATE(1932)] = 55234,
-  [SMALL_STATE(1933)] = 55242,
-  [SMALL_STATE(1934)] = 55250,
-  [SMALL_STATE(1935)] = 55258,
-  [SMALL_STATE(1936)] = 55266,
-  [SMALL_STATE(1937)] = 55274,
-  [SMALL_STATE(1938)] = 55282,
-  [SMALL_STATE(1939)] = 55290,
-  [SMALL_STATE(1940)] = 55298,
-  [SMALL_STATE(1941)] = 55306,
-  [SMALL_STATE(1942)] = 55314,
-  [SMALL_STATE(1943)] = 55322,
-  [SMALL_STATE(1944)] = 55330,
-  [SMALL_STATE(1945)] = 55338,
-  [SMALL_STATE(1946)] = 55346,
-  [SMALL_STATE(1947)] = 55354,
-  [SMALL_STATE(1948)] = 55362,
-  [SMALL_STATE(1949)] = 55370,
-  [SMALL_STATE(1950)] = 55378,
-  [SMALL_STATE(1951)] = 55386,
-  [SMALL_STATE(1952)] = 55394,
-  [SMALL_STATE(1953)] = 55402,
-  [SMALL_STATE(1954)] = 55410,
-  [SMALL_STATE(1955)] = 55418,
-  [SMALL_STATE(1956)] = 55426,
-  [SMALL_STATE(1957)] = 55434,
-  [SMALL_STATE(1958)] = 55442,
-  [SMALL_STATE(1959)] = 55450,
-  [SMALL_STATE(1960)] = 55458,
-  [SMALL_STATE(1961)] = 55466,
-  [SMALL_STATE(1962)] = 55474,
-  [SMALL_STATE(1963)] = 55482,
-  [SMALL_STATE(1964)] = 55490,
-  [SMALL_STATE(1965)] = 55498,
-  [SMALL_STATE(1966)] = 55506,
-  [SMALL_STATE(1967)] = 55514,
-  [SMALL_STATE(1968)] = 55522,
-  [SMALL_STATE(1969)] = 55530,
-  [SMALL_STATE(1970)] = 55538,
-  [SMALL_STATE(1971)] = 55546,
-  [SMALL_STATE(1972)] = 55554,
-  [SMALL_STATE(1973)] = 55562,
-  [SMALL_STATE(1974)] = 55570,
-  [SMALL_STATE(1975)] = 55578,
-  [SMALL_STATE(1976)] = 55586,
-  [SMALL_STATE(1977)] = 55594,
-  [SMALL_STATE(1978)] = 55602,
-  [SMALL_STATE(1979)] = 55610,
-  [SMALL_STATE(1980)] = 55618,
-  [SMALL_STATE(1981)] = 55626,
-  [SMALL_STATE(1982)] = 55634,
-  [SMALL_STATE(1983)] = 55642,
-  [SMALL_STATE(1984)] = 55650,
-  [SMALL_STATE(1985)] = 55658,
-  [SMALL_STATE(1986)] = 55666,
-  [SMALL_STATE(1987)] = 55674,
-  [SMALL_STATE(1988)] = 55682,
-  [SMALL_STATE(1989)] = 55690,
-  [SMALL_STATE(1990)] = 55698,
-  [SMALL_STATE(1991)] = 55706,
-  [SMALL_STATE(1992)] = 55714,
-  [SMALL_STATE(1993)] = 55722,
-  [SMALL_STATE(1994)] = 55730,
-  [SMALL_STATE(1995)] = 55738,
-  [SMALL_STATE(1996)] = 55746,
-  [SMALL_STATE(1997)] = 55754,
-  [SMALL_STATE(1998)] = 55762,
-  [SMALL_STATE(1999)] = 55770,
-  [SMALL_STATE(2000)] = 55778,
-  [SMALL_STATE(2001)] = 55786,
-  [SMALL_STATE(2002)] = 55794,
+  [SMALL_STATE(404)] = 3353,
+  [SMALL_STATE(405)] = 3410,
+  [SMALL_STATE(406)] = 3487,
+  [SMALL_STATE(407)] = 3558,
+  [SMALL_STATE(408)] = 3637,
+  [SMALL_STATE(409)] = 3708,
+  [SMALL_STATE(410)] = 3779,
+  [SMALL_STATE(411)] = 3836,
+  [SMALL_STATE(412)] = 3893,
+  [SMALL_STATE(413)] = 3970,
+  [SMALL_STATE(414)] = 4041,
+  [SMALL_STATE(415)] = 4098,
+  [SMALL_STATE(416)] = 4171,
+  [SMALL_STATE(417)] = 4242,
+  [SMALL_STATE(418)] = 4317,
+  [SMALL_STATE(419)] = 4382,
+  [SMALL_STATE(420)] = 4436,
+  [SMALL_STATE(421)] = 4490,
+  [SMALL_STATE(422)] = 4544,
+  [SMALL_STATE(423)] = 4598,
+  [SMALL_STATE(424)] = 4647,
+  [SMALL_STATE(425)] = 4696,
+  [SMALL_STATE(426)] = 4745,
+  [SMALL_STATE(427)] = 4794,
+  [SMALL_STATE(428)] = 4843,
+  [SMALL_STATE(429)] = 4892,
+  [SMALL_STATE(430)] = 4941,
+  [SMALL_STATE(431)] = 4990,
+  [SMALL_STATE(432)] = 5039,
+  [SMALL_STATE(433)] = 5090,
+  [SMALL_STATE(434)] = 5139,
+  [SMALL_STATE(435)] = 5188,
+  [SMALL_STATE(436)] = 5237,
+  [SMALL_STATE(437)] = 5286,
+  [SMALL_STATE(438)] = 5335,
+  [SMALL_STATE(439)] = 5384,
+  [SMALL_STATE(440)] = 5433,
+  [SMALL_STATE(441)] = 5480,
+  [SMALL_STATE(442)] = 5529,
+  [SMALL_STATE(443)] = 5578,
+  [SMALL_STATE(444)] = 5627,
+  [SMALL_STATE(445)] = 5676,
+  [SMALL_STATE(446)] = 5727,
+  [SMALL_STATE(447)] = 5776,
+  [SMALL_STATE(448)] = 5825,
+  [SMALL_STATE(449)] = 5874,
+  [SMALL_STATE(450)] = 5923,
+  [SMALL_STATE(451)] = 5972,
+  [SMALL_STATE(452)] = 6021,
+  [SMALL_STATE(453)] = 6070,
+  [SMALL_STATE(454)] = 6119,
+  [SMALL_STATE(455)] = 6168,
+  [SMALL_STATE(456)] = 6217,
+  [SMALL_STATE(457)] = 6266,
+  [SMALL_STATE(458)] = 6313,
+  [SMALL_STATE(459)] = 6362,
+  [SMALL_STATE(460)] = 6409,
+  [SMALL_STATE(461)] = 6456,
+  [SMALL_STATE(462)] = 6505,
+  [SMALL_STATE(463)] = 6554,
+  [SMALL_STATE(464)] = 6607,
+  [SMALL_STATE(465)] = 6656,
+  [SMALL_STATE(466)] = 6709,
+  [SMALL_STATE(467)] = 6758,
+  [SMALL_STATE(468)] = 6807,
+  [SMALL_STATE(469)] = 6856,
+  [SMALL_STATE(470)] = 6905,
+  [SMALL_STATE(471)] = 6954,
+  [SMALL_STATE(472)] = 7003,
+  [SMALL_STATE(473)] = 7052,
+  [SMALL_STATE(474)] = 7103,
+  [SMALL_STATE(475)] = 7152,
+  [SMALL_STATE(476)] = 7201,
+  [SMALL_STATE(477)] = 7250,
+  [SMALL_STATE(478)] = 7299,
+  [SMALL_STATE(479)] = 7348,
+  [SMALL_STATE(480)] = 7397,
+  [SMALL_STATE(481)] = 7446,
+  [SMALL_STATE(482)] = 7495,
+  [SMALL_STATE(483)] = 7544,
+  [SMALL_STATE(484)] = 7593,
+  [SMALL_STATE(485)] = 7642,
+  [SMALL_STATE(486)] = 7691,
+  [SMALL_STATE(487)] = 7740,
+  [SMALL_STATE(488)] = 7789,
+  [SMALL_STATE(489)] = 7838,
+  [SMALL_STATE(490)] = 7887,
+  [SMALL_STATE(491)] = 7936,
+  [SMALL_STATE(492)] = 7985,
+  [SMALL_STATE(493)] = 8034,
+  [SMALL_STATE(494)] = 8083,
+  [SMALL_STATE(495)] = 8132,
+  [SMALL_STATE(496)] = 8181,
+  [SMALL_STATE(497)] = 8230,
+  [SMALL_STATE(498)] = 8279,
+  [SMALL_STATE(499)] = 8328,
+  [SMALL_STATE(500)] = 8377,
+  [SMALL_STATE(501)] = 8426,
+  [SMALL_STATE(502)] = 8475,
+  [SMALL_STATE(503)] = 8524,
+  [SMALL_STATE(504)] = 8573,
+  [SMALL_STATE(505)] = 8622,
+  [SMALL_STATE(506)] = 8671,
+  [SMALL_STATE(507)] = 8720,
+  [SMALL_STATE(508)] = 8769,
+  [SMALL_STATE(509)] = 8818,
+  [SMALL_STATE(510)] = 8867,
+  [SMALL_STATE(511)] = 8918,
+  [SMALL_STATE(512)] = 8967,
+  [SMALL_STATE(513)] = 9020,
+  [SMALL_STATE(514)] = 9069,
+  [SMALL_STATE(515)] = 9120,
+  [SMALL_STATE(516)] = 9169,
+  [SMALL_STATE(517)] = 9218,
+  [SMALL_STATE(518)] = 9267,
+  [SMALL_STATE(519)] = 9316,
+  [SMALL_STATE(520)] = 9365,
+  [SMALL_STATE(521)] = 9414,
+  [SMALL_STATE(522)] = 9463,
+  [SMALL_STATE(523)] = 9512,
+  [SMALL_STATE(524)] = 9561,
+  [SMALL_STATE(525)] = 9610,
+  [SMALL_STATE(526)] = 9659,
+  [SMALL_STATE(527)] = 9708,
+  [SMALL_STATE(528)] = 9757,
+  [SMALL_STATE(529)] = 9806,
+  [SMALL_STATE(530)] = 9855,
+  [SMALL_STATE(531)] = 9904,
+  [SMALL_STATE(532)] = 9953,
+  [SMALL_STATE(533)] = 10002,
+  [SMALL_STATE(534)] = 10051,
+  [SMALL_STATE(535)] = 10100,
+  [SMALL_STATE(536)] = 10149,
+  [SMALL_STATE(537)] = 10198,
+  [SMALL_STATE(538)] = 10247,
+  [SMALL_STATE(539)] = 10296,
+  [SMALL_STATE(540)] = 10345,
+  [SMALL_STATE(541)] = 10396,
+  [SMALL_STATE(542)] = 10445,
+  [SMALL_STATE(543)] = 10494,
+  [SMALL_STATE(544)] = 10543,
+  [SMALL_STATE(545)] = 10592,
+  [SMALL_STATE(546)] = 10641,
+  [SMALL_STATE(547)] = 10690,
+  [SMALL_STATE(548)] = 10739,
+  [SMALL_STATE(549)] = 10788,
+  [SMALL_STATE(550)] = 10837,
+  [SMALL_STATE(551)] = 10886,
+  [SMALL_STATE(552)] = 10935,
+  [SMALL_STATE(553)] = 10984,
+  [SMALL_STATE(554)] = 11033,
+  [SMALL_STATE(555)] = 11084,
+  [SMALL_STATE(556)] = 11133,
+  [SMALL_STATE(557)] = 11182,
+  [SMALL_STATE(558)] = 11231,
+  [SMALL_STATE(559)] = 11280,
+  [SMALL_STATE(560)] = 11329,
+  [SMALL_STATE(561)] = 11378,
+  [SMALL_STATE(562)] = 11429,
+  [SMALL_STATE(563)] = 11478,
+  [SMALL_STATE(564)] = 11527,
+  [SMALL_STATE(565)] = 11576,
+  [SMALL_STATE(566)] = 11625,
+  [SMALL_STATE(567)] = 11674,
+  [SMALL_STATE(568)] = 11723,
+  [SMALL_STATE(569)] = 11772,
+  [SMALL_STATE(570)] = 11821,
+  [SMALL_STATE(571)] = 11870,
+  [SMALL_STATE(572)] = 11919,
+  [SMALL_STATE(573)] = 11968,
+  [SMALL_STATE(574)] = 12017,
+  [SMALL_STATE(575)] = 12066,
+  [SMALL_STATE(576)] = 12115,
+  [SMALL_STATE(577)] = 12164,
+  [SMALL_STATE(578)] = 12213,
+  [SMALL_STATE(579)] = 12262,
+  [SMALL_STATE(580)] = 12311,
+  [SMALL_STATE(581)] = 12360,
+  [SMALL_STATE(582)] = 12409,
+  [SMALL_STATE(583)] = 12458,
+  [SMALL_STATE(584)] = 12507,
+  [SMALL_STATE(585)] = 12556,
+  [SMALL_STATE(586)] = 12605,
+  [SMALL_STATE(587)] = 12654,
+  [SMALL_STATE(588)] = 12703,
+  [SMALL_STATE(589)] = 12756,
+  [SMALL_STATE(590)] = 12805,
+  [SMALL_STATE(591)] = 12854,
+  [SMALL_STATE(592)] = 12903,
+  [SMALL_STATE(593)] = 12952,
+  [SMALL_STATE(594)] = 13001,
+  [SMALL_STATE(595)] = 13050,
+  [SMALL_STATE(596)] = 13099,
+  [SMALL_STATE(597)] = 13148,
+  [SMALL_STATE(598)] = 13197,
+  [SMALL_STATE(599)] = 13246,
+  [SMALL_STATE(600)] = 13294,
+  [SMALL_STATE(601)] = 13342,
+  [SMALL_STATE(602)] = 13390,
+  [SMALL_STATE(603)] = 13438,
+  [SMALL_STATE(604)] = 13486,
+  [SMALL_STATE(605)] = 13534,
+  [SMALL_STATE(606)] = 13582,
+  [SMALL_STATE(607)] = 13630,
+  [SMALL_STATE(608)] = 13678,
+  [SMALL_STATE(609)] = 13726,
+  [SMALL_STATE(610)] = 13774,
+  [SMALL_STATE(611)] = 13822,
+  [SMALL_STATE(612)] = 13870,
+  [SMALL_STATE(613)] = 13918,
+  [SMALL_STATE(614)] = 13966,
+  [SMALL_STATE(615)] = 14014,
+  [SMALL_STATE(616)] = 14062,
+  [SMALL_STATE(617)] = 14110,
+  [SMALL_STATE(618)] = 14158,
+  [SMALL_STATE(619)] = 14206,
+  [SMALL_STATE(620)] = 14254,
+  [SMALL_STATE(621)] = 14302,
+  [SMALL_STATE(622)] = 14350,
+  [SMALL_STATE(623)] = 14398,
+  [SMALL_STATE(624)] = 14446,
+  [SMALL_STATE(625)] = 14494,
+  [SMALL_STATE(626)] = 14542,
+  [SMALL_STATE(627)] = 14590,
+  [SMALL_STATE(628)] = 14638,
+  [SMALL_STATE(629)] = 14686,
+  [SMALL_STATE(630)] = 14734,
+  [SMALL_STATE(631)] = 14782,
+  [SMALL_STATE(632)] = 14830,
+  [SMALL_STATE(633)] = 14878,
+  [SMALL_STATE(634)] = 14926,
+  [SMALL_STATE(635)] = 14974,
+  [SMALL_STATE(636)] = 15022,
+  [SMALL_STATE(637)] = 15070,
+  [SMALL_STATE(638)] = 15118,
+  [SMALL_STATE(639)] = 15166,
+  [SMALL_STATE(640)] = 15214,
+  [SMALL_STATE(641)] = 15262,
+  [SMALL_STATE(642)] = 15310,
+  [SMALL_STATE(643)] = 15358,
+  [SMALL_STATE(644)] = 15406,
+  [SMALL_STATE(645)] = 15454,
+  [SMALL_STATE(646)] = 15502,
+  [SMALL_STATE(647)] = 15550,
+  [SMALL_STATE(648)] = 15598,
+  [SMALL_STATE(649)] = 15646,
+  [SMALL_STATE(650)] = 15694,
+  [SMALL_STATE(651)] = 15742,
+  [SMALL_STATE(652)] = 15790,
+  [SMALL_STATE(653)] = 15838,
+  [SMALL_STATE(654)] = 15886,
+  [SMALL_STATE(655)] = 15934,
+  [SMALL_STATE(656)] = 15982,
+  [SMALL_STATE(657)] = 16030,
+  [SMALL_STATE(658)] = 16078,
+  [SMALL_STATE(659)] = 16126,
+  [SMALL_STATE(660)] = 16174,
+  [SMALL_STATE(661)] = 16222,
+  [SMALL_STATE(662)] = 16270,
+  [SMALL_STATE(663)] = 16318,
+  [SMALL_STATE(664)] = 16411,
+  [SMALL_STATE(665)] = 16504,
+  [SMALL_STATE(666)] = 16597,
+  [SMALL_STATE(667)] = 16690,
+  [SMALL_STATE(668)] = 16783,
+  [SMALL_STATE(669)] = 16876,
+  [SMALL_STATE(670)] = 16969,
+  [SMALL_STATE(671)] = 17062,
+  [SMALL_STATE(672)] = 17155,
+  [SMALL_STATE(673)] = 17248,
+  [SMALL_STATE(674)] = 17341,
+  [SMALL_STATE(675)] = 17434,
+  [SMALL_STATE(676)] = 17527,
+  [SMALL_STATE(677)] = 17620,
+  [SMALL_STATE(678)] = 17713,
+  [SMALL_STATE(679)] = 17806,
+  [SMALL_STATE(680)] = 17899,
+  [SMALL_STATE(681)] = 17992,
+  [SMALL_STATE(682)] = 18085,
+  [SMALL_STATE(683)] = 18178,
+  [SMALL_STATE(684)] = 18271,
+  [SMALL_STATE(685)] = 18364,
+  [SMALL_STATE(686)] = 18457,
+  [SMALL_STATE(687)] = 18550,
+  [SMALL_STATE(688)] = 18643,
+  [SMALL_STATE(689)] = 18736,
+  [SMALL_STATE(690)] = 18829,
+  [SMALL_STATE(691)] = 18922,
+  [SMALL_STATE(692)] = 19015,
+  [SMALL_STATE(693)] = 19108,
+  [SMALL_STATE(694)] = 19201,
+  [SMALL_STATE(695)] = 19294,
+  [SMALL_STATE(696)] = 19387,
+  [SMALL_STATE(697)] = 19480,
+  [SMALL_STATE(698)] = 19573,
+  [SMALL_STATE(699)] = 19666,
+  [SMALL_STATE(700)] = 19759,
+  [SMALL_STATE(701)] = 19852,
+  [SMALL_STATE(702)] = 19945,
+  [SMALL_STATE(703)] = 20026,
+  [SMALL_STATE(704)] = 20107,
+  [SMALL_STATE(705)] = 20152,
+  [SMALL_STATE(706)] = 20193,
+  [SMALL_STATE(707)] = 20265,
+  [SMALL_STATE(708)] = 20301,
+  [SMALL_STATE(709)] = 20373,
+  [SMALL_STATE(710)] = 20409,
+  [SMALL_STATE(711)] = 20481,
+  [SMALL_STATE(712)] = 20517,
+  [SMALL_STATE(713)] = 20553,
+  [SMALL_STATE(714)] = 20625,
+  [SMALL_STATE(715)] = 20697,
+  [SMALL_STATE(716)] = 20769,
+  [SMALL_STATE(717)] = 20841,
+  [SMALL_STATE(718)] = 20879,
+  [SMALL_STATE(719)] = 20915,
+  [SMALL_STATE(720)] = 20951,
+  [SMALL_STATE(721)] = 20987,
+  [SMALL_STATE(722)] = 21023,
+  [SMALL_STATE(723)] = 21063,
+  [SMALL_STATE(724)] = 21135,
+  [SMALL_STATE(725)] = 21171,
+  [SMALL_STATE(726)] = 21207,
+  [SMALL_STATE(727)] = 21243,
+  [SMALL_STATE(728)] = 21279,
+  [SMALL_STATE(729)] = 21315,
+  [SMALL_STATE(730)] = 21351,
+  [SMALL_STATE(731)] = 21387,
+  [SMALL_STATE(732)] = 21431,
+  [SMALL_STATE(733)] = 21467,
+  [SMALL_STATE(734)] = 21503,
+  [SMALL_STATE(735)] = 21539,
+  [SMALL_STATE(736)] = 21575,
+  [SMALL_STATE(737)] = 21647,
+  [SMALL_STATE(738)] = 21683,
+  [SMALL_STATE(739)] = 21755,
+  [SMALL_STATE(740)] = 21791,
+  [SMALL_STATE(741)] = 21827,
+  [SMALL_STATE(742)] = 21863,
+  [SMALL_STATE(743)] = 21899,
+  [SMALL_STATE(744)] = 21935,
+  [SMALL_STATE(745)] = 21971,
+  [SMALL_STATE(746)] = 22007,
+  [SMALL_STATE(747)] = 22043,
+  [SMALL_STATE(748)] = 22115,
+  [SMALL_STATE(749)] = 22151,
+  [SMALL_STATE(750)] = 22187,
+  [SMALL_STATE(751)] = 22223,
+  [SMALL_STATE(752)] = 22259,
+  [SMALL_STATE(753)] = 22331,
+  [SMALL_STATE(754)] = 22369,
+  [SMALL_STATE(755)] = 22441,
+  [SMALL_STATE(756)] = 22513,
+  [SMALL_STATE(757)] = 22549,
+  [SMALL_STATE(758)] = 22621,
+  [SMALL_STATE(759)] = 22693,
+  [SMALL_STATE(760)] = 22765,
+  [SMALL_STATE(761)] = 22837,
+  [SMALL_STATE(762)] = 22873,
+  [SMALL_STATE(763)] = 22945,
+  [SMALL_STATE(764)] = 22981,
+  [SMALL_STATE(765)] = 23017,
+  [SMALL_STATE(766)] = 23053,
+  [SMALL_STATE(767)] = 23125,
+  [SMALL_STATE(768)] = 23197,
+  [SMALL_STATE(769)] = 23269,
+  [SMALL_STATE(770)] = 23341,
+  [SMALL_STATE(771)] = 23413,
+  [SMALL_STATE(772)] = 23485,
+  [SMALL_STATE(773)] = 23557,
+  [SMALL_STATE(774)] = 23593,
+  [SMALL_STATE(775)] = 23629,
+  [SMALL_STATE(776)] = 23701,
+  [SMALL_STATE(777)] = 23773,
+  [SMALL_STATE(778)] = 23845,
+  [SMALL_STATE(779)] = 23917,
+  [SMALL_STATE(780)] = 23953,
+  [SMALL_STATE(781)] = 24025,
+  [SMALL_STATE(782)] = 24097,
+  [SMALL_STATE(783)] = 24169,
+  [SMALL_STATE(784)] = 24241,
+  [SMALL_STATE(785)] = 24313,
+  [SMALL_STATE(786)] = 24385,
+  [SMALL_STATE(787)] = 24457,
+  [SMALL_STATE(788)] = 24492,
+  [SMALL_STATE(789)] = 24527,
+  [SMALL_STATE(790)] = 24568,
+  [SMALL_STATE(791)] = 24603,
+  [SMALL_STATE(792)] = 24656,
+  [SMALL_STATE(793)] = 24691,
+  [SMALL_STATE(794)] = 24726,
+  [SMALL_STATE(795)] = 24761,
+  [SMALL_STATE(796)] = 24796,
+  [SMALL_STATE(797)] = 24831,
+  [SMALL_STATE(798)] = 24890,
+  [SMALL_STATE(799)] = 24935,
+  [SMALL_STATE(800)] = 24970,
+  [SMALL_STATE(801)] = 25005,
+  [SMALL_STATE(802)] = 25040,
+  [SMALL_STATE(803)] = 25075,
+  [SMALL_STATE(804)] = 25110,
+  [SMALL_STATE(805)] = 25151,
+  [SMALL_STATE(806)] = 25200,
+  [SMALL_STATE(807)] = 25257,
+  [SMALL_STATE(808)] = 25310,
+  [SMALL_STATE(809)] = 25363,
+  [SMALL_STATE(810)] = 25398,
+  [SMALL_STATE(811)] = 25453,
+  [SMALL_STATE(812)] = 25488,
+  [SMALL_STATE(813)] = 25523,
+  [SMALL_STATE(814)] = 25567,
+  [SMALL_STATE(815)] = 25611,
+  [SMALL_STATE(816)] = 25650,
+  [SMALL_STATE(817)] = 25711,
+  [SMALL_STATE(818)] = 25750,
+  [SMALL_STATE(819)] = 25800,
+  [SMALL_STATE(820)] = 25838,
+  [SMALL_STATE(821)] = 25900,
+  [SMALL_STATE(822)] = 25952,
+  [SMALL_STATE(823)] = 25986,
+  [SMALL_STATE(824)] = 26048,
+  [SMALL_STATE(825)] = 26106,
+  [SMALL_STATE(826)] = 26162,
+  [SMALL_STATE(827)] = 26196,
+  [SMALL_STATE(828)] = 26258,
+  [SMALL_STATE(829)] = 26320,
+  [SMALL_STATE(830)] = 26376,
+  [SMALL_STATE(831)] = 26436,
+  [SMALL_STATE(832)] = 26498,
+  [SMALL_STATE(833)] = 26548,
+  [SMALL_STATE(834)] = 26590,
+  [SMALL_STATE(835)] = 26632,
+  [SMALL_STATE(836)] = 26670,
+  [SMALL_STATE(837)] = 26732,
+  [SMALL_STATE(838)] = 26784,
+  [SMALL_STATE(839)] = 26846,
+  [SMALL_STATE(840)] = 26892,
+  [SMALL_STATE(841)] = 26930,
+  [SMALL_STATE(842)] = 26984,
+  [SMALL_STATE(843)] = 27036,
+  [SMALL_STATE(844)] = 27074,
+  [SMALL_STATE(845)] = 27124,
+  [SMALL_STATE(846)] = 27178,
+  [SMALL_STATE(847)] = 27216,
+  [SMALL_STATE(848)] = 27272,
+  [SMALL_STATE(849)] = 27314,
+  [SMALL_STATE(850)] = 27352,
+  [SMALL_STATE(851)] = 27398,
+  [SMALL_STATE(852)] = 27444,
+  [SMALL_STATE(853)] = 27498,
+  [SMALL_STATE(854)] = 27548,
+  [SMALL_STATE(855)] = 27600,
+  [SMALL_STATE(856)] = 27652,
+  [SMALL_STATE(857)] = 27690,
+  [SMALL_STATE(858)] = 27740,
+  [SMALL_STATE(859)] = 27790,
+  [SMALL_STATE(860)] = 27844,
+  [SMALL_STATE(861)] = 27881,
+  [SMALL_STATE(862)] = 27940,
+  [SMALL_STATE(863)] = 27977,
+  [SMALL_STATE(864)] = 28036,
+  [SMALL_STATE(865)] = 28071,
+  [SMALL_STATE(866)] = 28130,
+  [SMALL_STATE(867)] = 28165,
+  [SMALL_STATE(868)] = 28224,
+  [SMALL_STATE(869)] = 28283,
+  [SMALL_STATE(870)] = 28342,
+  [SMALL_STATE(871)] = 28379,
+  [SMALL_STATE(872)] = 28416,
+  [SMALL_STATE(873)] = 28473,
+  [SMALL_STATE(874)] = 28510,
+  [SMALL_STATE(875)] = 28569,
+  [SMALL_STATE(876)] = 28606,
+  [SMALL_STATE(877)] = 28636,
+  [SMALL_STATE(878)] = 28672,
+  [SMALL_STATE(879)] = 28702,
+  [SMALL_STATE(880)] = 28732,
+  [SMALL_STATE(881)] = 28762,
+  [SMALL_STATE(882)] = 28792,
+  [SMALL_STATE(883)] = 28822,
+  [SMALL_STATE(884)] = 28852,
+  [SMALL_STATE(885)] = 28888,
+  [SMALL_STATE(886)] = 28918,
+  [SMALL_STATE(887)] = 28948,
+  [SMALL_STATE(888)] = 28978,
+  [SMALL_STATE(889)] = 29008,
+  [SMALL_STATE(890)] = 29038,
+  [SMALL_STATE(891)] = 29068,
+  [SMALL_STATE(892)] = 29098,
+  [SMALL_STATE(893)] = 29128,
+  [SMALL_STATE(894)] = 29158,
+  [SMALL_STATE(895)] = 29188,
+  [SMALL_STATE(896)] = 29218,
+  [SMALL_STATE(897)] = 29248,
+  [SMALL_STATE(898)] = 29278,
+  [SMALL_STATE(899)] = 29308,
+  [SMALL_STATE(900)] = 29338,
+  [SMALL_STATE(901)] = 29368,
+  [SMALL_STATE(902)] = 29398,
+  [SMALL_STATE(903)] = 29428,
+  [SMALL_STATE(904)] = 29458,
+  [SMALL_STATE(905)] = 29488,
+  [SMALL_STATE(906)] = 29518,
+  [SMALL_STATE(907)] = 29548,
+  [SMALL_STATE(908)] = 29578,
+  [SMALL_STATE(909)] = 29608,
+  [SMALL_STATE(910)] = 29638,
+  [SMALL_STATE(911)] = 29668,
+  [SMALL_STATE(912)] = 29698,
+  [SMALL_STATE(913)] = 29728,
+  [SMALL_STATE(914)] = 29758,
+  [SMALL_STATE(915)] = 29790,
+  [SMALL_STATE(916)] = 29826,
+  [SMALL_STATE(917)] = 29856,
+  [SMALL_STATE(918)] = 29886,
+  [SMALL_STATE(919)] = 29916,
+  [SMALL_STATE(920)] = 29946,
+  [SMALL_STATE(921)] = 29976,
+  [SMALL_STATE(922)] = 30006,
+  [SMALL_STATE(923)] = 30036,
+  [SMALL_STATE(924)] = 30066,
+  [SMALL_STATE(925)] = 30096,
+  [SMALL_STATE(926)] = 30126,
+  [SMALL_STATE(927)] = 30156,
+  [SMALL_STATE(928)] = 30186,
+  [SMALL_STATE(929)] = 30216,
+  [SMALL_STATE(930)] = 30250,
+  [SMALL_STATE(931)] = 30280,
+  [SMALL_STATE(932)] = 30316,
+  [SMALL_STATE(933)] = 30372,
+  [SMALL_STATE(934)] = 30428,
+  [SMALL_STATE(935)] = 30484,
+  [SMALL_STATE(936)] = 30514,
+  [SMALL_STATE(937)] = 30570,
+  [SMALL_STATE(938)] = 30626,
+  [SMALL_STATE(939)] = 30656,
+  [SMALL_STATE(940)] = 30686,
+  [SMALL_STATE(941)] = 30718,
+  [SMALL_STATE(942)] = 30748,
+  [SMALL_STATE(943)] = 30778,
+  [SMALL_STATE(944)] = 30808,
+  [SMALL_STATE(945)] = 30864,
+  [SMALL_STATE(946)] = 30894,
+  [SMALL_STATE(947)] = 30924,
+  [SMALL_STATE(948)] = 30954,
+  [SMALL_STATE(949)] = 30984,
+  [SMALL_STATE(950)] = 31014,
+  [SMALL_STATE(951)] = 31050,
+  [SMALL_STATE(952)] = 31080,
+  [SMALL_STATE(953)] = 31110,
+  [SMALL_STATE(954)] = 31166,
+  [SMALL_STATE(955)] = 31198,
+  [SMALL_STATE(956)] = 31254,
+  [SMALL_STATE(957)] = 31284,
+  [SMALL_STATE(958)] = 31340,
+  [SMALL_STATE(959)] = 31370,
+  [SMALL_STATE(960)] = 31400,
+  [SMALL_STATE(961)] = 31430,
+  [SMALL_STATE(962)] = 31466,
+  [SMALL_STATE(963)] = 31496,
+  [SMALL_STATE(964)] = 31526,
+  [SMALL_STATE(965)] = 31556,
+  [SMALL_STATE(966)] = 31588,
+  [SMALL_STATE(967)] = 31618,
+  [SMALL_STATE(968)] = 31648,
+  [SMALL_STATE(969)] = 31678,
+  [SMALL_STATE(970)] = 31708,
+  [SMALL_STATE(971)] = 31738,
+  [SMALL_STATE(972)] = 31768,
+  [SMALL_STATE(973)] = 31824,
+  [SMALL_STATE(974)] = 31860,
+  [SMALL_STATE(975)] = 31890,
+  [SMALL_STATE(976)] = 31920,
+  [SMALL_STATE(977)] = 31956,
+  [SMALL_STATE(978)] = 32012,
+  [SMALL_STATE(979)] = 32048,
+  [SMALL_STATE(980)] = 32082,
+  [SMALL_STATE(981)] = 32138,
+  [SMALL_STATE(982)] = 32194,
+  [SMALL_STATE(983)] = 32230,
+  [SMALL_STATE(984)] = 32286,
+  [SMALL_STATE(985)] = 32342,
+  [SMALL_STATE(986)] = 32372,
+  [SMALL_STATE(987)] = 32428,
+  [SMALL_STATE(988)] = 32482,
+  [SMALL_STATE(989)] = 32518,
+  [SMALL_STATE(990)] = 32554,
+  [SMALL_STATE(991)] = 32610,
+  [SMALL_STATE(992)] = 32646,
+  [SMALL_STATE(993)] = 32702,
+  [SMALL_STATE(994)] = 32758,
+  [SMALL_STATE(995)] = 32812,
+  [SMALL_STATE(996)] = 32868,
+  [SMALL_STATE(997)] = 32924,
+  [SMALL_STATE(998)] = 32980,
+  [SMALL_STATE(999)] = 33012,
+  [SMALL_STATE(1000)] = 33048,
+  [SMALL_STATE(1001)] = 33084,
+  [SMALL_STATE(1002)] = 33120,
+  [SMALL_STATE(1003)] = 33176,
+  [SMALL_STATE(1004)] = 33232,
+  [SMALL_STATE(1005)] = 33288,
+  [SMALL_STATE(1006)] = 33344,
+  [SMALL_STATE(1007)] = 33400,
+  [SMALL_STATE(1008)] = 33456,
+  [SMALL_STATE(1009)] = 33512,
+  [SMALL_STATE(1010)] = 33548,
+  [SMALL_STATE(1011)] = 33584,
+  [SMALL_STATE(1012)] = 33640,
+  [SMALL_STATE(1013)] = 33676,
+  [SMALL_STATE(1014)] = 33732,
+  [SMALL_STATE(1015)] = 33768,
+  [SMALL_STATE(1016)] = 33824,
+  [SMALL_STATE(1017)] = 33860,
+  [SMALL_STATE(1018)] = 33916,
+  [SMALL_STATE(1019)] = 33946,
+  [SMALL_STATE(1020)] = 33982,
+  [SMALL_STATE(1021)] = 34018,
+  [SMALL_STATE(1022)] = 34074,
+  [SMALL_STATE(1023)] = 34130,
+  [SMALL_STATE(1024)] = 34186,
+  [SMALL_STATE(1025)] = 34242,
+  [SMALL_STATE(1026)] = 34298,
+  [SMALL_STATE(1027)] = 34354,
+  [SMALL_STATE(1028)] = 34390,
+  [SMALL_STATE(1029)] = 34426,
+  [SMALL_STATE(1030)] = 34462,
+  [SMALL_STATE(1031)] = 34498,
+  [SMALL_STATE(1032)] = 34530,
+  [SMALL_STATE(1033)] = 34586,
+  [SMALL_STATE(1034)] = 34622,
+  [SMALL_STATE(1035)] = 34658,
+  [SMALL_STATE(1036)] = 34694,
+  [SMALL_STATE(1037)] = 34750,
+  [SMALL_STATE(1038)] = 34806,
+  [SMALL_STATE(1039)] = 34862,
+  [SMALL_STATE(1040)] = 34918,
+  [SMALL_STATE(1041)] = 34974,
+  [SMALL_STATE(1042)] = 35027,
+  [SMALL_STATE(1043)] = 35080,
+  [SMALL_STATE(1044)] = 35133,
+  [SMALL_STATE(1045)] = 35186,
+  [SMALL_STATE(1046)] = 35239,
+  [SMALL_STATE(1047)] = 35292,
+  [SMALL_STATE(1048)] = 35345,
+  [SMALL_STATE(1049)] = 35398,
+  [SMALL_STATE(1050)] = 35433,
+  [SMALL_STATE(1051)] = 35464,
+  [SMALL_STATE(1052)] = 35517,
+  [SMALL_STATE(1053)] = 35570,
+  [SMALL_STATE(1054)] = 35623,
+  [SMALL_STATE(1055)] = 35654,
+  [SMALL_STATE(1056)] = 35683,
+  [SMALL_STATE(1057)] = 35712,
+  [SMALL_STATE(1058)] = 35765,
+  [SMALL_STATE(1059)] = 35818,
+  [SMALL_STATE(1060)] = 35871,
+  [SMALL_STATE(1061)] = 35924,
+  [SMALL_STATE(1062)] = 35977,
+  [SMALL_STATE(1063)] = 36008,
+  [SMALL_STATE(1064)] = 36061,
+  [SMALL_STATE(1065)] = 36114,
+  [SMALL_STATE(1066)] = 36145,
+  [SMALL_STATE(1067)] = 36174,
+  [SMALL_STATE(1068)] = 36227,
+  [SMALL_STATE(1069)] = 36280,
+  [SMALL_STATE(1070)] = 36337,
+  [SMALL_STATE(1071)] = 36372,
+  [SMALL_STATE(1072)] = 36425,
+  [SMALL_STATE(1073)] = 36478,
+  [SMALL_STATE(1074)] = 36531,
+  [SMALL_STATE(1075)] = 36562,
+  [SMALL_STATE(1076)] = 36597,
+  [SMALL_STATE(1077)] = 36626,
+  [SMALL_STATE(1078)] = 36679,
+  [SMALL_STATE(1079)] = 36732,
+  [SMALL_STATE(1080)] = 36767,
+  [SMALL_STATE(1081)] = 36820,
+  [SMALL_STATE(1082)] = 36873,
+  [SMALL_STATE(1083)] = 36908,
+  [SMALL_STATE(1084)] = 36961,
+  [SMALL_STATE(1085)] = 37014,
+  [SMALL_STATE(1086)] = 37067,
+  [SMALL_STATE(1087)] = 37120,
+  [SMALL_STATE(1088)] = 37173,
+  [SMALL_STATE(1089)] = 37204,
+  [SMALL_STATE(1090)] = 37233,
+  [SMALL_STATE(1091)] = 37262,
+  [SMALL_STATE(1092)] = 37291,
+  [SMALL_STATE(1093)] = 37344,
+  [SMALL_STATE(1094)] = 37379,
+  [SMALL_STATE(1095)] = 37414,
+  [SMALL_STATE(1096)] = 37471,
+  [SMALL_STATE(1097)] = 37506,
+  [SMALL_STATE(1098)] = 37559,
+  [SMALL_STATE(1099)] = 37588,
+  [SMALL_STATE(1100)] = 37641,
+  [SMALL_STATE(1101)] = 37694,
+  [SMALL_STATE(1102)] = 37747,
+  [SMALL_STATE(1103)] = 37782,
+  [SMALL_STATE(1104)] = 37835,
+  [SMALL_STATE(1105)] = 37864,
+  [SMALL_STATE(1106)] = 37917,
+  [SMALL_STATE(1107)] = 37946,
+  [SMALL_STATE(1108)] = 37999,
+  [SMALL_STATE(1109)] = 38052,
+  [SMALL_STATE(1110)] = 38105,
+  [SMALL_STATE(1111)] = 38158,
+  [SMALL_STATE(1112)] = 38193,
+  [SMALL_STATE(1113)] = 38246,
+  [SMALL_STATE(1114)] = 38275,
+  [SMALL_STATE(1115)] = 38310,
+  [SMALL_STATE(1116)] = 38339,
+  [SMALL_STATE(1117)] = 38392,
+  [SMALL_STATE(1118)] = 38445,
+  [SMALL_STATE(1119)] = 38498,
+  [SMALL_STATE(1120)] = 38551,
+  [SMALL_STATE(1121)] = 38580,
+  [SMALL_STATE(1122)] = 38615,
+  [SMALL_STATE(1123)] = 38668,
+  [SMALL_STATE(1124)] = 38721,
+  [SMALL_STATE(1125)] = 38756,
+  [SMALL_STATE(1126)] = 38791,
+  [SMALL_STATE(1127)] = 38826,
+  [SMALL_STATE(1128)] = 38879,
+  [SMALL_STATE(1129)] = 38908,
+  [SMALL_STATE(1130)] = 38943,
+  [SMALL_STATE(1131)] = 38996,
+  [SMALL_STATE(1132)] = 39025,
+  [SMALL_STATE(1133)] = 39054,
+  [SMALL_STATE(1134)] = 39089,
+  [SMALL_STATE(1135)] = 39124,
+  [SMALL_STATE(1136)] = 39153,
+  [SMALL_STATE(1137)] = 39206,
+  [SMALL_STATE(1138)] = 39235,
+  [SMALL_STATE(1139)] = 39288,
+  [SMALL_STATE(1140)] = 39341,
+  [SMALL_STATE(1141)] = 39394,
+  [SMALL_STATE(1142)] = 39423,
+  [SMALL_STATE(1143)] = 39476,
+  [SMALL_STATE(1144)] = 39511,
+  [SMALL_STATE(1145)] = 39568,
+  [SMALL_STATE(1146)] = 39597,
+  [SMALL_STATE(1147)] = 39650,
+  [SMALL_STATE(1148)] = 39681,
+  [SMALL_STATE(1149)] = 39734,
+  [SMALL_STATE(1150)] = 39769,
+  [SMALL_STATE(1151)] = 39822,
+  [SMALL_STATE(1152)] = 39857,
+  [SMALL_STATE(1153)] = 39886,
+  [SMALL_STATE(1154)] = 39915,
+  [SMALL_STATE(1155)] = 39944,
+  [SMALL_STATE(1156)] = 39979,
+  [SMALL_STATE(1157)] = 40008,
+  [SMALL_STATE(1158)] = 40043,
+  [SMALL_STATE(1159)] = 40096,
+  [SMALL_STATE(1160)] = 40125,
+  [SMALL_STATE(1161)] = 40154,
+  [SMALL_STATE(1162)] = 40207,
+  [SMALL_STATE(1163)] = 40260,
+  [SMALL_STATE(1164)] = 40289,
+  [SMALL_STATE(1165)] = 40342,
+  [SMALL_STATE(1166)] = 40395,
+  [SMALL_STATE(1167)] = 40448,
+  [SMALL_STATE(1168)] = 40483,
+  [SMALL_STATE(1169)] = 40536,
+  [SMALL_STATE(1170)] = 40589,
+  [SMALL_STATE(1171)] = 40618,
+  [SMALL_STATE(1172)] = 40647,
+  [SMALL_STATE(1173)] = 40676,
+  [SMALL_STATE(1174)] = 40705,
+  [SMALL_STATE(1175)] = 40758,
+  [SMALL_STATE(1176)] = 40811,
+  [SMALL_STATE(1177)] = 40864,
+  [SMALL_STATE(1178)] = 40917,
+  [SMALL_STATE(1179)] = 40948,
+  [SMALL_STATE(1180)] = 41001,
+  [SMALL_STATE(1181)] = 41054,
+  [SMALL_STATE(1182)] = 41107,
+  [SMALL_STATE(1183)] = 41160,
+  [SMALL_STATE(1184)] = 41189,
+  [SMALL_STATE(1185)] = 41219,
+  [SMALL_STATE(1186)] = 41249,
+  [SMALL_STATE(1187)] = 41279,
+  [SMALL_STATE(1188)] = 41309,
+  [SMALL_STATE(1189)] = 41339,
+  [SMALL_STATE(1190)] = 41369,
+  [SMALL_STATE(1191)] = 41399,
+  [SMALL_STATE(1192)] = 41429,
+  [SMALL_STATE(1193)] = 41459,
+  [SMALL_STATE(1194)] = 41513,
+  [SMALL_STATE(1195)] = 41543,
+  [SMALL_STATE(1196)] = 41573,
+  [SMALL_STATE(1197)] = 41603,
+  [SMALL_STATE(1198)] = 41633,
+  [SMALL_STATE(1199)] = 41687,
+  [SMALL_STATE(1200)] = 41721,
+  [SMALL_STATE(1201)] = 41751,
+  [SMALL_STATE(1202)] = 41781,
+  [SMALL_STATE(1203)] = 41811,
+  [SMALL_STATE(1204)] = 41841,
+  [SMALL_STATE(1205)] = 41895,
+  [SMALL_STATE(1206)] = 41927,
+  [SMALL_STATE(1207)] = 41957,
+  [SMALL_STATE(1208)] = 41989,
+  [SMALL_STATE(1209)] = 42019,
+  [SMALL_STATE(1210)] = 42049,
+  [SMALL_STATE(1211)] = 42103,
+  [SMALL_STATE(1212)] = 42157,
+  [SMALL_STATE(1213)] = 42187,
+  [SMALL_STATE(1214)] = 42217,
+  [SMALL_STATE(1215)] = 42247,
+  [SMALL_STATE(1216)] = 42301,
+  [SMALL_STATE(1217)] = 42355,
+  [SMALL_STATE(1218)] = 42409,
+  [SMALL_STATE(1219)] = 42439,
+  [SMALL_STATE(1220)] = 42469,
+  [SMALL_STATE(1221)] = 42499,
+  [SMALL_STATE(1222)] = 42529,
+  [SMALL_STATE(1223)] = 42559,
+  [SMALL_STATE(1224)] = 42589,
+  [SMALL_STATE(1225)] = 42643,
+  [SMALL_STATE(1226)] = 42672,
+  [SMALL_STATE(1227)] = 42701,
+  [SMALL_STATE(1228)] = 42730,
+  [SMALL_STATE(1229)] = 42759,
+  [SMALL_STATE(1230)] = 42810,
+  [SMALL_STATE(1231)] = 42839,
+  [SMALL_STATE(1232)] = 42868,
+  [SMALL_STATE(1233)] = 42897,
+  [SMALL_STATE(1234)] = 42926,
+  [SMALL_STATE(1235)] = 42955,
+  [SMALL_STATE(1236)] = 42984,
+  [SMALL_STATE(1237)] = 43013,
+  [SMALL_STATE(1238)] = 43042,
+  [SMALL_STATE(1239)] = 43071,
+  [SMALL_STATE(1240)] = 43100,
+  [SMALL_STATE(1241)] = 43129,
+  [SMALL_STATE(1242)] = 43158,
+  [SMALL_STATE(1243)] = 43187,
+  [SMALL_STATE(1244)] = 43216,
+  [SMALL_STATE(1245)] = 43245,
+  [SMALL_STATE(1246)] = 43274,
+  [SMALL_STATE(1247)] = 43303,
+  [SMALL_STATE(1248)] = 43332,
+  [SMALL_STATE(1249)] = 43361,
+  [SMALL_STATE(1250)] = 43390,
+  [SMALL_STATE(1251)] = 43419,
+  [SMALL_STATE(1252)] = 43448,
+  [SMALL_STATE(1253)] = 43477,
+  [SMALL_STATE(1254)] = 43506,
+  [SMALL_STATE(1255)] = 43535,
+  [SMALL_STATE(1256)] = 43564,
+  [SMALL_STATE(1257)] = 43593,
+  [SMALL_STATE(1258)] = 43622,
+  [SMALL_STATE(1259)] = 43651,
+  [SMALL_STATE(1260)] = 43680,
+  [SMALL_STATE(1261)] = 43709,
+  [SMALL_STATE(1262)] = 43738,
+  [SMALL_STATE(1263)] = 43767,
+  [SMALL_STATE(1264)] = 43796,
+  [SMALL_STATE(1265)] = 43825,
+  [SMALL_STATE(1266)] = 43854,
+  [SMALL_STATE(1267)] = 43883,
+  [SMALL_STATE(1268)] = 43912,
+  [SMALL_STATE(1269)] = 43941,
+  [SMALL_STATE(1270)] = 43970,
+  [SMALL_STATE(1271)] = 43999,
+  [SMALL_STATE(1272)] = 44028,
+  [SMALL_STATE(1273)] = 44057,
+  [SMALL_STATE(1274)] = 44086,
+  [SMALL_STATE(1275)] = 44115,
+  [SMALL_STATE(1276)] = 44144,
+  [SMALL_STATE(1277)] = 44173,
+  [SMALL_STATE(1278)] = 44202,
+  [SMALL_STATE(1279)] = 44231,
+  [SMALL_STATE(1280)] = 44260,
+  [SMALL_STATE(1281)] = 44289,
+  [SMALL_STATE(1282)] = 44318,
+  [SMALL_STATE(1283)] = 44347,
+  [SMALL_STATE(1284)] = 44376,
+  [SMALL_STATE(1285)] = 44405,
+  [SMALL_STATE(1286)] = 44434,
+  [SMALL_STATE(1287)] = 44463,
+  [SMALL_STATE(1288)] = 44492,
+  [SMALL_STATE(1289)] = 44521,
+  [SMALL_STATE(1290)] = 44550,
+  [SMALL_STATE(1291)] = 44579,
+  [SMALL_STATE(1292)] = 44608,
+  [SMALL_STATE(1293)] = 44637,
+  [SMALL_STATE(1294)] = 44666,
+  [SMALL_STATE(1295)] = 44695,
+  [SMALL_STATE(1296)] = 44724,
+  [SMALL_STATE(1297)] = 44753,
+  [SMALL_STATE(1298)] = 44782,
+  [SMALL_STATE(1299)] = 44811,
+  [SMALL_STATE(1300)] = 44840,
+  [SMALL_STATE(1301)] = 44869,
+  [SMALL_STATE(1302)] = 44898,
+  [SMALL_STATE(1303)] = 44927,
+  [SMALL_STATE(1304)] = 44956,
+  [SMALL_STATE(1305)] = 44985,
+  [SMALL_STATE(1306)] = 45014,
+  [SMALL_STATE(1307)] = 45043,
+  [SMALL_STATE(1308)] = 45072,
+  [SMALL_STATE(1309)] = 45101,
+  [SMALL_STATE(1310)] = 45130,
+  [SMALL_STATE(1311)] = 45159,
+  [SMALL_STATE(1312)] = 45188,
+  [SMALL_STATE(1313)] = 45217,
+  [SMALL_STATE(1314)] = 45246,
+  [SMALL_STATE(1315)] = 45275,
+  [SMALL_STATE(1316)] = 45304,
+  [SMALL_STATE(1317)] = 45333,
+  [SMALL_STATE(1318)] = 45362,
+  [SMALL_STATE(1319)] = 45391,
+  [SMALL_STATE(1320)] = 45420,
+  [SMALL_STATE(1321)] = 45449,
+  [SMALL_STATE(1322)] = 45478,
+  [SMALL_STATE(1323)] = 45507,
+  [SMALL_STATE(1324)] = 45536,
+  [SMALL_STATE(1325)] = 45565,
+  [SMALL_STATE(1326)] = 45594,
+  [SMALL_STATE(1327)] = 45623,
+  [SMALL_STATE(1328)] = 45652,
+  [SMALL_STATE(1329)] = 45681,
+  [SMALL_STATE(1330)] = 45710,
+  [SMALL_STATE(1331)] = 45739,
+  [SMALL_STATE(1332)] = 45768,
+  [SMALL_STATE(1333)] = 45797,
+  [SMALL_STATE(1334)] = 45826,
+  [SMALL_STATE(1335)] = 45855,
+  [SMALL_STATE(1336)] = 45884,
+  [SMALL_STATE(1337)] = 45913,
+  [SMALL_STATE(1338)] = 45942,
+  [SMALL_STATE(1339)] = 45971,
+  [SMALL_STATE(1340)] = 46000,
+  [SMALL_STATE(1341)] = 46029,
+  [SMALL_STATE(1342)] = 46058,
+  [SMALL_STATE(1343)] = 46087,
+  [SMALL_STATE(1344)] = 46116,
+  [SMALL_STATE(1345)] = 46145,
+  [SMALL_STATE(1346)] = 46174,
+  [SMALL_STATE(1347)] = 46203,
+  [SMALL_STATE(1348)] = 46232,
+  [SMALL_STATE(1349)] = 46261,
+  [SMALL_STATE(1350)] = 46290,
+  [SMALL_STATE(1351)] = 46319,
+  [SMALL_STATE(1352)] = 46348,
+  [SMALL_STATE(1353)] = 46377,
+  [SMALL_STATE(1354)] = 46406,
+  [SMALL_STATE(1355)] = 46435,
+  [SMALL_STATE(1356)] = 46464,
+  [SMALL_STATE(1357)] = 46493,
+  [SMALL_STATE(1358)] = 46522,
+  [SMALL_STATE(1359)] = 46551,
+  [SMALL_STATE(1360)] = 46580,
+  [SMALL_STATE(1361)] = 46609,
+  [SMALL_STATE(1362)] = 46638,
+  [SMALL_STATE(1363)] = 46667,
+  [SMALL_STATE(1364)] = 46696,
+  [SMALL_STATE(1365)] = 46747,
+  [SMALL_STATE(1366)] = 46774,
+  [SMALL_STATE(1367)] = 46803,
+  [SMALL_STATE(1368)] = 46832,
+  [SMALL_STATE(1369)] = 46861,
+  [SMALL_STATE(1370)] = 46890,
+  [SMALL_STATE(1371)] = 46919,
+  [SMALL_STATE(1372)] = 46948,
+  [SMALL_STATE(1373)] = 46977,
+  [SMALL_STATE(1374)] = 47006,
+  [SMALL_STATE(1375)] = 47035,
+  [SMALL_STATE(1376)] = 47064,
+  [SMALL_STATE(1377)] = 47093,
+  [SMALL_STATE(1378)] = 47122,
+  [SMALL_STATE(1379)] = 47151,
+  [SMALL_STATE(1380)] = 47180,
+  [SMALL_STATE(1381)] = 47209,
+  [SMALL_STATE(1382)] = 47238,
+  [SMALL_STATE(1383)] = 47267,
+  [SMALL_STATE(1384)] = 47296,
+  [SMALL_STATE(1385)] = 47325,
+  [SMALL_STATE(1386)] = 47354,
+  [SMALL_STATE(1387)] = 47383,
+  [SMALL_STATE(1388)] = 47412,
+  [SMALL_STATE(1389)] = 47441,
+  [SMALL_STATE(1390)] = 47470,
+  [SMALL_STATE(1391)] = 47518,
+  [SMALL_STATE(1392)] = 47566,
+  [SMALL_STATE(1393)] = 47614,
+  [SMALL_STATE(1394)] = 47662,
+  [SMALL_STATE(1395)] = 47710,
+  [SMALL_STATE(1396)] = 47758,
+  [SMALL_STATE(1397)] = 47806,
+  [SMALL_STATE(1398)] = 47854,
+  [SMALL_STATE(1399)] = 47902,
+  [SMALL_STATE(1400)] = 47930,
+  [SMALL_STATE(1401)] = 47955,
+  [SMALL_STATE(1402)] = 48000,
+  [SMALL_STATE(1403)] = 48025,
+  [SMALL_STATE(1404)] = 48070,
+  [SMALL_STATE(1405)] = 48115,
+  [SMALL_STATE(1406)] = 48157,
+  [SMALL_STATE(1407)] = 48199,
+  [SMALL_STATE(1408)] = 48241,
+  [SMALL_STATE(1409)] = 48283,
+  [SMALL_STATE(1410)] = 48325,
+  [SMALL_STATE(1411)] = 48367,
+  [SMALL_STATE(1412)] = 48409,
+  [SMALL_STATE(1413)] = 48451,
+  [SMALL_STATE(1414)] = 48493,
+  [SMALL_STATE(1415)] = 48535,
+  [SMALL_STATE(1416)] = 48577,
+  [SMALL_STATE(1417)] = 48619,
+  [SMALL_STATE(1418)] = 48661,
+  [SMALL_STATE(1419)] = 48703,
+  [SMALL_STATE(1420)] = 48745,
+  [SMALL_STATE(1421)] = 48787,
+  [SMALL_STATE(1422)] = 48829,
+  [SMALL_STATE(1423)] = 48871,
+  [SMALL_STATE(1424)] = 48913,
+  [SMALL_STATE(1425)] = 48955,
+  [SMALL_STATE(1426)] = 48997,
+  [SMALL_STATE(1427)] = 49039,
+  [SMALL_STATE(1428)] = 49081,
+  [SMALL_STATE(1429)] = 49123,
+  [SMALL_STATE(1430)] = 49165,
+  [SMALL_STATE(1431)] = 49207,
+  [SMALL_STATE(1432)] = 49234,
+  [SMALL_STATE(1433)] = 49255,
+  [SMALL_STATE(1434)] = 49275,
+  [SMALL_STATE(1435)] = 49297,
+  [SMALL_STATE(1436)] = 49317,
+  [SMALL_STATE(1437)] = 49339,
+  [SMALL_STATE(1438)] = 49361,
+  [SMALL_STATE(1439)] = 49383,
+  [SMALL_STATE(1440)] = 49405,
+  [SMALL_STATE(1441)] = 49427,
+  [SMALL_STATE(1442)] = 49449,
+  [SMALL_STATE(1443)] = 49469,
+  [SMALL_STATE(1444)] = 49489,
+  [SMALL_STATE(1445)] = 49511,
+  [SMALL_STATE(1446)] = 49544,
+  [SMALL_STATE(1447)] = 49577,
+  [SMALL_STATE(1448)] = 49607,
+  [SMALL_STATE(1449)] = 49637,
+  [SMALL_STATE(1450)] = 49667,
+  [SMALL_STATE(1451)] = 49682,
+  [SMALL_STATE(1452)] = 49713,
+  [SMALL_STATE(1453)] = 49744,
+  [SMALL_STATE(1454)] = 49772,
+  [SMALL_STATE(1455)] = 49792,
+  [SMALL_STATE(1456)] = 49818,
+  [SMALL_STATE(1457)] = 49838,
+  [SMALL_STATE(1458)] = 49858,
+  [SMALL_STATE(1459)] = 49878,
+  [SMALL_STATE(1460)] = 49898,
+  [SMALL_STATE(1461)] = 49918,
+  [SMALL_STATE(1462)] = 49938,
+  [SMALL_STATE(1463)] = 49958,
+  [SMALL_STATE(1464)] = 49982,
+  [SMALL_STATE(1465)] = 50002,
+  [SMALL_STATE(1466)] = 50030,
+  [SMALL_STATE(1467)] = 50050,
+  [SMALL_STATE(1468)] = 50070,
+  [SMALL_STATE(1469)] = 50090,
+  [SMALL_STATE(1470)] = 50110,
+  [SMALL_STATE(1471)] = 50130,
+  [SMALL_STATE(1472)] = 50154,
+  [SMALL_STATE(1473)] = 50174,
+  [SMALL_STATE(1474)] = 50188,
+  [SMALL_STATE(1475)] = 50208,
+  [SMALL_STATE(1476)] = 50225,
+  [SMALL_STATE(1477)] = 50248,
+  [SMALL_STATE(1478)] = 50265,
+  [SMALL_STATE(1479)] = 50286,
+  [SMALL_STATE(1480)] = 50307,
+  [SMALL_STATE(1481)] = 50328,
+  [SMALL_STATE(1482)] = 50351,
+  [SMALL_STATE(1483)] = 50374,
+  [SMALL_STATE(1484)] = 50387,
+  [SMALL_STATE(1485)] = 50400,
+  [SMALL_STATE(1486)] = 50423,
+  [SMALL_STATE(1487)] = 50436,
+  [SMALL_STATE(1488)] = 50459,
+  [SMALL_STATE(1489)] = 50480,
+  [SMALL_STATE(1490)] = 50503,
+  [SMALL_STATE(1491)] = 50516,
+  [SMALL_STATE(1492)] = 50539,
+  [SMALL_STATE(1493)] = 50562,
+  [SMALL_STATE(1494)] = 50583,
+  [SMALL_STATE(1495)] = 50603,
+  [SMALL_STATE(1496)] = 50623,
+  [SMALL_STATE(1497)] = 50643,
+  [SMALL_STATE(1498)] = 50663,
+  [SMALL_STATE(1499)] = 50675,
+  [SMALL_STATE(1500)] = 50695,
+  [SMALL_STATE(1501)] = 50713,
+  [SMALL_STATE(1502)] = 50733,
+  [SMALL_STATE(1503)] = 50751,
+  [SMALL_STATE(1504)] = 50771,
+  [SMALL_STATE(1505)] = 50789,
+  [SMALL_STATE(1506)] = 50809,
+  [SMALL_STATE(1507)] = 50829,
+  [SMALL_STATE(1508)] = 50849,
+  [SMALL_STATE(1509)] = 50869,
+  [SMALL_STATE(1510)] = 50889,
+  [SMALL_STATE(1511)] = 50909,
+  [SMALL_STATE(1512)] = 50929,
+  [SMALL_STATE(1513)] = 50949,
+  [SMALL_STATE(1514)] = 50967,
+  [SMALL_STATE(1515)] = 50985,
+  [SMALL_STATE(1516)] = 51001,
+  [SMALL_STATE(1517)] = 51021,
+  [SMALL_STATE(1518)] = 51041,
+  [SMALL_STATE(1519)] = 51061,
+  [SMALL_STATE(1520)] = 51081,
+  [SMALL_STATE(1521)] = 51101,
+  [SMALL_STATE(1522)] = 51121,
+  [SMALL_STATE(1523)] = 51138,
+  [SMALL_STATE(1524)] = 51151,
+  [SMALL_STATE(1525)] = 51168,
+  [SMALL_STATE(1526)] = 51185,
+  [SMALL_STATE(1527)] = 51200,
+  [SMALL_STATE(1528)] = 51215,
+  [SMALL_STATE(1529)] = 51228,
+  [SMALL_STATE(1530)] = 51245,
+  [SMALL_STATE(1531)] = 51262,
+  [SMALL_STATE(1532)] = 51279,
+  [SMALL_STATE(1533)] = 51296,
+  [SMALL_STATE(1534)] = 51313,
+  [SMALL_STATE(1535)] = 51330,
+  [SMALL_STATE(1536)] = 51345,
+  [SMALL_STATE(1537)] = 51360,
+  [SMALL_STATE(1538)] = 51375,
+  [SMALL_STATE(1539)] = 51390,
+  [SMALL_STATE(1540)] = 51407,
+  [SMALL_STATE(1541)] = 51424,
+  [SMALL_STATE(1542)] = 51441,
+  [SMALL_STATE(1543)] = 51458,
+  [SMALL_STATE(1544)] = 51471,
+  [SMALL_STATE(1545)] = 51488,
+  [SMALL_STATE(1546)] = 51503,
+  [SMALL_STATE(1547)] = 51520,
+  [SMALL_STATE(1548)] = 51537,
+  [SMALL_STATE(1549)] = 51554,
+  [SMALL_STATE(1550)] = 51569,
+  [SMALL_STATE(1551)] = 51586,
+  [SMALL_STATE(1552)] = 51603,
+  [SMALL_STATE(1553)] = 51620,
+  [SMALL_STATE(1554)] = 51637,
+  [SMALL_STATE(1555)] = 51652,
+  [SMALL_STATE(1556)] = 51669,
+  [SMALL_STATE(1557)] = 51684,
+  [SMALL_STATE(1558)] = 51701,
+  [SMALL_STATE(1559)] = 51714,
+  [SMALL_STATE(1560)] = 51725,
+  [SMALL_STATE(1561)] = 51738,
+  [SMALL_STATE(1562)] = 51755,
+  [SMALL_STATE(1563)] = 51772,
+  [SMALL_STATE(1564)] = 51789,
+  [SMALL_STATE(1565)] = 51806,
+  [SMALL_STATE(1566)] = 51821,
+  [SMALL_STATE(1567)] = 51838,
+  [SMALL_STATE(1568)] = 51851,
+  [SMALL_STATE(1569)] = 51866,
+  [SMALL_STATE(1570)] = 51883,
+  [SMALL_STATE(1571)] = 51900,
+  [SMALL_STATE(1572)] = 51915,
+  [SMALL_STATE(1573)] = 51932,
+  [SMALL_STATE(1574)] = 51945,
+  [SMALL_STATE(1575)] = 51962,
+  [SMALL_STATE(1576)] = 51975,
+  [SMALL_STATE(1577)] = 51992,
+  [SMALL_STATE(1578)] = 52009,
+  [SMALL_STATE(1579)] = 52026,
+  [SMALL_STATE(1580)] = 52043,
+  [SMALL_STATE(1581)] = 52058,
+  [SMALL_STATE(1582)] = 52075,
+  [SMALL_STATE(1583)] = 52086,
+  [SMALL_STATE(1584)] = 52103,
+  [SMALL_STATE(1585)] = 52118,
+  [SMALL_STATE(1586)] = 52135,
+  [SMALL_STATE(1587)] = 52146,
+  [SMALL_STATE(1588)] = 52163,
+  [SMALL_STATE(1589)] = 52180,
+  [SMALL_STATE(1590)] = 52195,
+  [SMALL_STATE(1591)] = 52212,
+  [SMALL_STATE(1592)] = 52225,
+  [SMALL_STATE(1593)] = 52240,
+  [SMALL_STATE(1594)] = 52257,
+  [SMALL_STATE(1595)] = 52272,
+  [SMALL_STATE(1596)] = 52287,
+  [SMALL_STATE(1597)] = 52301,
+  [SMALL_STATE(1598)] = 52315,
+  [SMALL_STATE(1599)] = 52327,
+  [SMALL_STATE(1600)] = 52341,
+  [SMALL_STATE(1601)] = 52355,
+  [SMALL_STATE(1602)] = 52369,
+  [SMALL_STATE(1603)] = 52381,
+  [SMALL_STATE(1604)] = 52395,
+  [SMALL_STATE(1605)] = 52409,
+  [SMALL_STATE(1606)] = 52423,
+  [SMALL_STATE(1607)] = 52437,
+  [SMALL_STATE(1608)] = 52451,
+  [SMALL_STATE(1609)] = 52463,
+  [SMALL_STATE(1610)] = 52477,
+  [SMALL_STATE(1611)] = 52491,
+  [SMALL_STATE(1612)] = 52505,
+  [SMALL_STATE(1613)] = 52519,
+  [SMALL_STATE(1614)] = 52533,
+  [SMALL_STATE(1615)] = 52547,
+  [SMALL_STATE(1616)] = 52561,
+  [SMALL_STATE(1617)] = 52575,
+  [SMALL_STATE(1618)] = 52589,
+  [SMALL_STATE(1619)] = 52603,
+  [SMALL_STATE(1620)] = 52617,
+  [SMALL_STATE(1621)] = 52631,
+  [SMALL_STATE(1622)] = 52645,
+  [SMALL_STATE(1623)] = 52659,
+  [SMALL_STATE(1624)] = 52673,
+  [SMALL_STATE(1625)] = 52687,
+  [SMALL_STATE(1626)] = 52701,
+  [SMALL_STATE(1627)] = 52715,
+  [SMALL_STATE(1628)] = 52729,
+  [SMALL_STATE(1629)] = 52743,
+  [SMALL_STATE(1630)] = 52757,
+  [SMALL_STATE(1631)] = 52771,
+  [SMALL_STATE(1632)] = 52785,
+  [SMALL_STATE(1633)] = 52799,
+  [SMALL_STATE(1634)] = 52813,
+  [SMALL_STATE(1635)] = 52827,
+  [SMALL_STATE(1636)] = 52841,
+  [SMALL_STATE(1637)] = 52851,
+  [SMALL_STATE(1638)] = 52865,
+  [SMALL_STATE(1639)] = 52879,
+  [SMALL_STATE(1640)] = 52893,
+  [SMALL_STATE(1641)] = 52907,
+  [SMALL_STATE(1642)] = 52921,
+  [SMALL_STATE(1643)] = 52935,
+  [SMALL_STATE(1644)] = 52949,
+  [SMALL_STATE(1645)] = 52963,
+  [SMALL_STATE(1646)] = 52977,
+  [SMALL_STATE(1647)] = 52991,
+  [SMALL_STATE(1648)] = 53005,
+  [SMALL_STATE(1649)] = 53019,
+  [SMALL_STATE(1650)] = 53033,
+  [SMALL_STATE(1651)] = 53047,
+  [SMALL_STATE(1652)] = 53061,
+  [SMALL_STATE(1653)] = 53075,
+  [SMALL_STATE(1654)] = 53087,
+  [SMALL_STATE(1655)] = 53101,
+  [SMALL_STATE(1656)] = 53115,
+  [SMALL_STATE(1657)] = 53129,
+  [SMALL_STATE(1658)] = 53143,
+  [SMALL_STATE(1659)] = 53157,
+  [SMALL_STATE(1660)] = 53171,
+  [SMALL_STATE(1661)] = 53185,
+  [SMALL_STATE(1662)] = 53199,
+  [SMALL_STATE(1663)] = 53213,
+  [SMALL_STATE(1664)] = 53227,
+  [SMALL_STATE(1665)] = 53241,
+  [SMALL_STATE(1666)] = 53255,
+  [SMALL_STATE(1667)] = 53269,
+  [SMALL_STATE(1668)] = 53283,
+  [SMALL_STATE(1669)] = 53295,
+  [SMALL_STATE(1670)] = 53309,
+  [SMALL_STATE(1671)] = 53323,
+  [SMALL_STATE(1672)] = 53337,
+  [SMALL_STATE(1673)] = 53351,
+  [SMALL_STATE(1674)] = 53365,
+  [SMALL_STATE(1675)] = 53379,
+  [SMALL_STATE(1676)] = 53393,
+  [SMALL_STATE(1677)] = 53407,
+  [SMALL_STATE(1678)] = 53421,
+  [SMALL_STATE(1679)] = 53435,
+  [SMALL_STATE(1680)] = 53447,
+  [SMALL_STATE(1681)] = 53461,
+  [SMALL_STATE(1682)] = 53471,
+  [SMALL_STATE(1683)] = 53481,
+  [SMALL_STATE(1684)] = 53495,
+  [SMALL_STATE(1685)] = 53509,
+  [SMALL_STATE(1686)] = 53523,
+  [SMALL_STATE(1687)] = 53537,
+  [SMALL_STATE(1688)] = 53551,
+  [SMALL_STATE(1689)] = 53565,
+  [SMALL_STATE(1690)] = 53579,
+  [SMALL_STATE(1691)] = 53593,
+  [SMALL_STATE(1692)] = 53607,
+  [SMALL_STATE(1693)] = 53621,
+  [SMALL_STATE(1694)] = 53635,
+  [SMALL_STATE(1695)] = 53649,
+  [SMALL_STATE(1696)] = 53663,
+  [SMALL_STATE(1697)] = 53677,
+  [SMALL_STATE(1698)] = 53691,
+  [SMALL_STATE(1699)] = 53705,
+  [SMALL_STATE(1700)] = 53719,
+  [SMALL_STATE(1701)] = 53733,
+  [SMALL_STATE(1702)] = 53747,
+  [SMALL_STATE(1703)] = 53761,
+  [SMALL_STATE(1704)] = 53775,
+  [SMALL_STATE(1705)] = 53789,
+  [SMALL_STATE(1706)] = 53803,
+  [SMALL_STATE(1707)] = 53817,
+  [SMALL_STATE(1708)] = 53831,
+  [SMALL_STATE(1709)] = 53843,
+  [SMALL_STATE(1710)] = 53857,
+  [SMALL_STATE(1711)] = 53871,
+  [SMALL_STATE(1712)] = 53885,
+  [SMALL_STATE(1713)] = 53899,
+  [SMALL_STATE(1714)] = 53913,
+  [SMALL_STATE(1715)] = 53927,
+  [SMALL_STATE(1716)] = 53941,
+  [SMALL_STATE(1717)] = 53955,
+  [SMALL_STATE(1718)] = 53969,
+  [SMALL_STATE(1719)] = 53983,
+  [SMALL_STATE(1720)] = 53997,
+  [SMALL_STATE(1721)] = 54011,
+  [SMALL_STATE(1722)] = 54025,
+  [SMALL_STATE(1723)] = 54039,
+  [SMALL_STATE(1724)] = 54053,
+  [SMALL_STATE(1725)] = 54067,
+  [SMALL_STATE(1726)] = 54079,
+  [SMALL_STATE(1727)] = 54093,
+  [SMALL_STATE(1728)] = 54107,
+  [SMALL_STATE(1729)] = 54121,
+  [SMALL_STATE(1730)] = 54135,
+  [SMALL_STATE(1731)] = 54149,
+  [SMALL_STATE(1732)] = 54163,
+  [SMALL_STATE(1733)] = 54177,
+  [SMALL_STATE(1734)] = 54191,
+  [SMALL_STATE(1735)] = 54205,
+  [SMALL_STATE(1736)] = 54219,
+  [SMALL_STATE(1737)] = 54231,
+  [SMALL_STATE(1738)] = 54245,
+  [SMALL_STATE(1739)] = 54259,
+  [SMALL_STATE(1740)] = 54273,
+  [SMALL_STATE(1741)] = 54287,
+  [SMALL_STATE(1742)] = 54301,
+  [SMALL_STATE(1743)] = 54315,
+  [SMALL_STATE(1744)] = 54329,
+  [SMALL_STATE(1745)] = 54343,
+  [SMALL_STATE(1746)] = 54355,
+  [SMALL_STATE(1747)] = 54369,
+  [SMALL_STATE(1748)] = 54378,
+  [SMALL_STATE(1749)] = 54387,
+  [SMALL_STATE(1750)] = 54396,
+  [SMALL_STATE(1751)] = 54407,
+  [SMALL_STATE(1752)] = 54418,
+  [SMALL_STATE(1753)] = 54427,
+  [SMALL_STATE(1754)] = 54438,
+  [SMALL_STATE(1755)] = 54449,
+  [SMALL_STATE(1756)] = 54458,
+  [SMALL_STATE(1757)] = 54469,
+  [SMALL_STATE(1758)] = 54478,
+  [SMALL_STATE(1759)] = 54489,
+  [SMALL_STATE(1760)] = 54500,
+  [SMALL_STATE(1761)] = 54509,
+  [SMALL_STATE(1762)] = 54520,
+  [SMALL_STATE(1763)] = 54531,
+  [SMALL_STATE(1764)] = 54542,
+  [SMALL_STATE(1765)] = 54553,
+  [SMALL_STATE(1766)] = 54564,
+  [SMALL_STATE(1767)] = 54575,
+  [SMALL_STATE(1768)] = 54586,
+  [SMALL_STATE(1769)] = 54595,
+  [SMALL_STATE(1770)] = 54606,
+  [SMALL_STATE(1771)] = 54617,
+  [SMALL_STATE(1772)] = 54628,
+  [SMALL_STATE(1773)] = 54637,
+  [SMALL_STATE(1774)] = 54648,
+  [SMALL_STATE(1775)] = 54659,
+  [SMALL_STATE(1776)] = 54668,
+  [SMALL_STATE(1777)] = 54677,
+  [SMALL_STATE(1778)] = 54686,
+  [SMALL_STATE(1779)] = 54695,
+  [SMALL_STATE(1780)] = 54706,
+  [SMALL_STATE(1781)] = 54717,
+  [SMALL_STATE(1782)] = 54728,
+  [SMALL_STATE(1783)] = 54739,
+  [SMALL_STATE(1784)] = 54748,
+  [SMALL_STATE(1785)] = 54757,
+  [SMALL_STATE(1786)] = 54768,
+  [SMALL_STATE(1787)] = 54779,
+  [SMALL_STATE(1788)] = 54790,
+  [SMALL_STATE(1789)] = 54801,
+  [SMALL_STATE(1790)] = 54812,
+  [SMALL_STATE(1791)] = 54821,
+  [SMALL_STATE(1792)] = 54832,
+  [SMALL_STATE(1793)] = 54843,
+  [SMALL_STATE(1794)] = 54854,
+  [SMALL_STATE(1795)] = 54865,
+  [SMALL_STATE(1796)] = 54876,
+  [SMALL_STATE(1797)] = 54887,
+  [SMALL_STATE(1798)] = 54898,
+  [SMALL_STATE(1799)] = 54909,
+  [SMALL_STATE(1800)] = 54920,
+  [SMALL_STATE(1801)] = 54931,
+  [SMALL_STATE(1802)] = 54939,
+  [SMALL_STATE(1803)] = 54947,
+  [SMALL_STATE(1804)] = 54955,
+  [SMALL_STATE(1805)] = 54963,
+  [SMALL_STATE(1806)] = 54971,
+  [SMALL_STATE(1807)] = 54979,
+  [SMALL_STATE(1808)] = 54987,
+  [SMALL_STATE(1809)] = 54995,
+  [SMALL_STATE(1810)] = 55003,
+  [SMALL_STATE(1811)] = 55011,
+  [SMALL_STATE(1812)] = 55019,
+  [SMALL_STATE(1813)] = 55027,
+  [SMALL_STATE(1814)] = 55035,
+  [SMALL_STATE(1815)] = 55043,
+  [SMALL_STATE(1816)] = 55051,
+  [SMALL_STATE(1817)] = 55059,
+  [SMALL_STATE(1818)] = 55067,
+  [SMALL_STATE(1819)] = 55075,
+  [SMALL_STATE(1820)] = 55083,
+  [SMALL_STATE(1821)] = 55091,
+  [SMALL_STATE(1822)] = 55099,
+  [SMALL_STATE(1823)] = 55107,
+  [SMALL_STATE(1824)] = 55115,
+  [SMALL_STATE(1825)] = 55123,
+  [SMALL_STATE(1826)] = 55131,
+  [SMALL_STATE(1827)] = 55139,
+  [SMALL_STATE(1828)] = 55147,
+  [SMALL_STATE(1829)] = 55155,
+  [SMALL_STATE(1830)] = 55163,
+  [SMALL_STATE(1831)] = 55171,
+  [SMALL_STATE(1832)] = 55179,
+  [SMALL_STATE(1833)] = 55187,
+  [SMALL_STATE(1834)] = 55195,
+  [SMALL_STATE(1835)] = 55203,
+  [SMALL_STATE(1836)] = 55211,
+  [SMALL_STATE(1837)] = 55219,
+  [SMALL_STATE(1838)] = 55227,
+  [SMALL_STATE(1839)] = 55235,
+  [SMALL_STATE(1840)] = 55243,
+  [SMALL_STATE(1841)] = 55251,
+  [SMALL_STATE(1842)] = 55259,
+  [SMALL_STATE(1843)] = 55267,
+  [SMALL_STATE(1844)] = 55275,
+  [SMALL_STATE(1845)] = 55283,
+  [SMALL_STATE(1846)] = 55291,
+  [SMALL_STATE(1847)] = 55299,
+  [SMALL_STATE(1848)] = 55307,
+  [SMALL_STATE(1849)] = 55315,
+  [SMALL_STATE(1850)] = 55323,
+  [SMALL_STATE(1851)] = 55331,
+  [SMALL_STATE(1852)] = 55339,
+  [SMALL_STATE(1853)] = 55347,
+  [SMALL_STATE(1854)] = 55355,
+  [SMALL_STATE(1855)] = 55363,
+  [SMALL_STATE(1856)] = 55371,
+  [SMALL_STATE(1857)] = 55379,
+  [SMALL_STATE(1858)] = 55387,
+  [SMALL_STATE(1859)] = 55395,
+  [SMALL_STATE(1860)] = 55403,
+  [SMALL_STATE(1861)] = 55411,
+  [SMALL_STATE(1862)] = 55419,
+  [SMALL_STATE(1863)] = 55427,
+  [SMALL_STATE(1864)] = 55435,
+  [SMALL_STATE(1865)] = 55443,
+  [SMALL_STATE(1866)] = 55451,
+  [SMALL_STATE(1867)] = 55459,
+  [SMALL_STATE(1868)] = 55467,
+  [SMALL_STATE(1869)] = 55475,
+  [SMALL_STATE(1870)] = 55483,
+  [SMALL_STATE(1871)] = 55491,
+  [SMALL_STATE(1872)] = 55499,
+  [SMALL_STATE(1873)] = 55507,
+  [SMALL_STATE(1874)] = 55515,
+  [SMALL_STATE(1875)] = 55523,
+  [SMALL_STATE(1876)] = 55531,
+  [SMALL_STATE(1877)] = 55539,
+  [SMALL_STATE(1878)] = 55547,
+  [SMALL_STATE(1879)] = 55555,
+  [SMALL_STATE(1880)] = 55563,
+  [SMALL_STATE(1881)] = 55571,
+  [SMALL_STATE(1882)] = 55579,
+  [SMALL_STATE(1883)] = 55587,
+  [SMALL_STATE(1884)] = 55595,
+  [SMALL_STATE(1885)] = 55603,
+  [SMALL_STATE(1886)] = 55611,
+  [SMALL_STATE(1887)] = 55619,
+  [SMALL_STATE(1888)] = 55627,
+  [SMALL_STATE(1889)] = 55635,
+  [SMALL_STATE(1890)] = 55643,
+  [SMALL_STATE(1891)] = 55651,
+  [SMALL_STATE(1892)] = 55659,
+  [SMALL_STATE(1893)] = 55667,
+  [SMALL_STATE(1894)] = 55675,
+  [SMALL_STATE(1895)] = 55683,
+  [SMALL_STATE(1896)] = 55691,
+  [SMALL_STATE(1897)] = 55699,
+  [SMALL_STATE(1898)] = 55707,
+  [SMALL_STATE(1899)] = 55715,
+  [SMALL_STATE(1900)] = 55723,
+  [SMALL_STATE(1901)] = 55731,
+  [SMALL_STATE(1902)] = 55739,
+  [SMALL_STATE(1903)] = 55747,
+  [SMALL_STATE(1904)] = 55755,
+  [SMALL_STATE(1905)] = 55763,
+  [SMALL_STATE(1906)] = 55771,
+  [SMALL_STATE(1907)] = 55779,
+  [SMALL_STATE(1908)] = 55787,
+  [SMALL_STATE(1909)] = 55795,
+  [SMALL_STATE(1910)] = 55803,
+  [SMALL_STATE(1911)] = 55811,
+  [SMALL_STATE(1912)] = 55819,
+  [SMALL_STATE(1913)] = 55827,
+  [SMALL_STATE(1914)] = 55835,
+  [SMALL_STATE(1915)] = 55843,
+  [SMALL_STATE(1916)] = 55851,
+  [SMALL_STATE(1917)] = 55859,
+  [SMALL_STATE(1918)] = 55867,
+  [SMALL_STATE(1919)] = 55875,
+  [SMALL_STATE(1920)] = 55883,
+  [SMALL_STATE(1921)] = 55891,
+  [SMALL_STATE(1922)] = 55899,
+  [SMALL_STATE(1923)] = 55907,
+  [SMALL_STATE(1924)] = 55915,
+  [SMALL_STATE(1925)] = 55923,
+  [SMALL_STATE(1926)] = 55931,
+  [SMALL_STATE(1927)] = 55939,
+  [SMALL_STATE(1928)] = 55947,
+  [SMALL_STATE(1929)] = 55955,
+  [SMALL_STATE(1930)] = 55963,
+  [SMALL_STATE(1931)] = 55971,
+  [SMALL_STATE(1932)] = 55979,
+  [SMALL_STATE(1933)] = 55987,
+  [SMALL_STATE(1934)] = 55995,
+  [SMALL_STATE(1935)] = 56003,
+  [SMALL_STATE(1936)] = 56011,
+  [SMALL_STATE(1937)] = 56019,
+  [SMALL_STATE(1938)] = 56027,
+  [SMALL_STATE(1939)] = 56035,
+  [SMALL_STATE(1940)] = 56043,
+  [SMALL_STATE(1941)] = 56051,
+  [SMALL_STATE(1942)] = 56059,
+  [SMALL_STATE(1943)] = 56067,
+  [SMALL_STATE(1944)] = 56075,
+  [SMALL_STATE(1945)] = 56083,
+  [SMALL_STATE(1946)] = 56091,
+  [SMALL_STATE(1947)] = 56099,
+  [SMALL_STATE(1948)] = 56107,
+  [SMALL_STATE(1949)] = 56115,
+  [SMALL_STATE(1950)] = 56123,
+  [SMALL_STATE(1951)] = 56131,
+  [SMALL_STATE(1952)] = 56139,
+  [SMALL_STATE(1953)] = 56147,
+  [SMALL_STATE(1954)] = 56155,
+  [SMALL_STATE(1955)] = 56163,
+  [SMALL_STATE(1956)] = 56171,
+  [SMALL_STATE(1957)] = 56179,
+  [SMALL_STATE(1958)] = 56187,
+  [SMALL_STATE(1959)] = 56195,
+  [SMALL_STATE(1960)] = 56203,
+  [SMALL_STATE(1961)] = 56211,
+  [SMALL_STATE(1962)] = 56219,
+  [SMALL_STATE(1963)] = 56227,
+  [SMALL_STATE(1964)] = 56235,
+  [SMALL_STATE(1965)] = 56243,
+  [SMALL_STATE(1966)] = 56251,
+  [SMALL_STATE(1967)] = 56259,
+  [SMALL_STATE(1968)] = 56267,
+  [SMALL_STATE(1969)] = 56275,
+  [SMALL_STATE(1970)] = 56283,
+  [SMALL_STATE(1971)] = 56291,
+  [SMALL_STATE(1972)] = 56299,
+  [SMALL_STATE(1973)] = 56307,
+  [SMALL_STATE(1974)] = 56315,
+  [SMALL_STATE(1975)] = 56323,
+  [SMALL_STATE(1976)] = 56331,
+  [SMALL_STATE(1977)] = 56339,
+  [SMALL_STATE(1978)] = 56347,
+  [SMALL_STATE(1979)] = 56355,
+  [SMALL_STATE(1980)] = 56363,
+  [SMALL_STATE(1981)] = 56371,
+  [SMALL_STATE(1982)] = 56379,
+  [SMALL_STATE(1983)] = 56387,
+  [SMALL_STATE(1984)] = 56395,
+  [SMALL_STATE(1985)] = 56403,
+  [SMALL_STATE(1986)] = 56411,
+  [SMALL_STATE(1987)] = 56419,
+  [SMALL_STATE(1988)] = 56427,
+  [SMALL_STATE(1989)] = 56435,
+  [SMALL_STATE(1990)] = 56443,
+  [SMALL_STATE(1991)] = 56451,
+  [SMALL_STATE(1992)] = 56459,
+  [SMALL_STATE(1993)] = 56467,
+  [SMALL_STATE(1994)] = 56475,
+  [SMALL_STATE(1995)] = 56483,
+  [SMALL_STATE(1996)] = 56491,
+  [SMALL_STATE(1997)] = 56499,
+  [SMALL_STATE(1998)] = 56507,
+  [SMALL_STATE(1999)] = 56515,
+  [SMALL_STATE(2000)] = 56523,
+  [SMALL_STATE(2001)] = 56531,
+  [SMALL_STATE(2002)] = 56539,
+  [SMALL_STATE(2003)] = 56547,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -81477,1669 +82295,1666 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(),
   [5] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
   [7] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ql, 0),
-  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1237),
-  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1563),
-  [13] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1493),
-  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1754),
-  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1389),
-  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(196),
+  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1186),
+  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1556),
+  [13] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1500),
+  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1792),
+  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1229),
+  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(264),
   [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(92),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1755),
-  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1220),
-  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1444),
-  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1443),
-  [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1440),
-  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1756),
-  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(816),
-  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
-  [39] = {.entry = {.count = 1, .reusable = true}}, SHIFT(471),
-  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(342),
-  [43] = {.entry = {.count = 1, .reusable = false}}, SHIFT(316),
-  [45] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
-  [47] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1812),
-  [49] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1966),
-  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
-  [55] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1760),
+  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1791),
+  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1230),
+  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1435),
+  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1442),
+  [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1444),
+  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1788),
+  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(817),
+  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
+  [39] = {.entry = {.count = 1, .reusable = true}}, SHIFT(921),
+  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(213),
+  [43] = {.entry = {.count = 1, .reusable = false}}, SHIFT(296),
+  [45] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
+  [47] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1825),
+  [49] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1916),
+  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(440),
+  [55] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1768),
   [57] = {.entry = {.count = 1, .reusable = true}}, SHIFT(813),
-  [59] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1022),
-  [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1022),
-  [63] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1024),
-  [65] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1031),
-  [67] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1039),
-  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(744),
-  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(912),
-  [73] = {.entry = {.count = 1, .reusable = true}}, SHIFT(957),
-  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(902),
-  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(971),
-  [79] = {.entry = {.count = 1, .reusable = true}}, SHIFT(493),
-  [81] = {.entry = {.count = 1, .reusable = true}}, SHIFT(444),
-  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(732),
-  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(954),
-  [87] = {.entry = {.count = 1, .reusable = true}}, SHIFT(548),
-  [89] = {.entry = {.count = 1, .reusable = true}}, SHIFT(450),
-  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(567),
-  [93] = {.entry = {.count = 1, .reusable = true}}, SHIFT(591),
-  [95] = {.entry = {.count = 1, .reusable = true}}, SHIFT(520),
-  [97] = {.entry = {.count = 1, .reusable = true}}, SHIFT(883),
-  [99] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
-  [101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(523),
-  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
-  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(550),
-  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(735),
+  [59] = {.entry = {.count = 1, .reusable = false}}, SHIFT(969),
+  [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(969),
+  [63] = {.entry = {.count = 1, .reusable = false}}, SHIFT(968),
+  [65] = {.entry = {.count = 1, .reusable = false}}, SHIFT(967),
+  [67] = {.entry = {.count = 1, .reusable = false}}, SHIFT(966),
+  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(524),
+  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(876),
+  [73] = {.entry = {.count = 1, .reusable = true}}, SHIFT(567),
+  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(487),
+  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(941),
+  [79] = {.entry = {.count = 1, .reusable = true}}, SHIFT(761),
+  [81] = {.entry = {.count = 1, .reusable = true}}, SHIFT(911),
+  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(596),
+  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(453),
+  [87] = {.entry = {.count = 1, .reusable = true}}, SHIFT(963),
+  [89] = {.entry = {.count = 1, .reusable = true}}, SHIFT(431),
+  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(733),
+  [93] = {.entry = {.count = 1, .reusable = true}}, SHIFT(756),
+  [95] = {.entry = {.count = 1, .reusable = true}}, SHIFT(486),
+  [97] = {.entry = {.count = 1, .reusable = true}}, SHIFT(527),
+  [99] = {.entry = {.count = 1, .reusable = true}}, SHIFT(442),
+  [101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(494),
+  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(559),
+  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(566),
+  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(881),
   [109] = {.entry = {.count = 1, .reusable = false}}, SHIFT(704),
-  [111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
-  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(551),
-  [115] = {.entry = {.count = 1, .reusable = false}}, SHIFT(249),
-  [117] = {.entry = {.count = 1, .reusable = false}}, SHIFT(337),
-  [119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
-  [121] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1969),
-  [123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1695),
-  [125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
+  [111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
+  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
+  [115] = {.entry = {.count = 1, .reusable = false}}, SHIFT(231),
+  [117] = {.entry = {.count = 1, .reusable = false}}, SHIFT(326),
+  [119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
+  [121] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1918),
+  [123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1609),
+  [125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
   [127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(814),
-  [129] = {.entry = {.count = 1, .reusable = false}}, SHIFT(715),
-  [131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(715),
-  [133] = {.entry = {.count = 1, .reusable = false}}, SHIFT(716),
-  [135] = {.entry = {.count = 1, .reusable = false}}, SHIFT(720),
-  [137] = {.entry = {.count = 1, .reusable = false}}, SHIFT(721),
-  [139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(535),
-  [141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
-  [143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1696),
-  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(964),
-  [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
-  [149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1628),
-  [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(498),
-  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
-  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1685),
-  [157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(888),
-  [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1638),
-  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446),
-  [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1636),
-  [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(737),
-  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1669),
-  [175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(577),
-  [177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1709),
-  [179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1242),
-  [181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1652),
-  [183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(451),
-  [185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1705),
-  [187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(760),
-  [189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
-  [191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1295),
-  [193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1605),
-  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(532),
-  [197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1735),
-  [199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1238),
-  [201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1649),
-  [203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(943),
-  [205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1660),
-  [207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(427),
-  [209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1603),
-  [211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1105),
-  [213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
-  [215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(890),
-  [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1632),
-  [219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(582),
-  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1718),
-  [223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(619),
-  [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
-  [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(929),
-  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1651),
-  [231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1283),
-  [233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1601),
-  [235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(629),
-  [237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
-  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(876),
-  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1641),
-  [243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(726),
-  [245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1742),
-  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(662),
-  [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
-  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(527),
-  [253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1741),
-  [255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
-  [257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1686),
-  [259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1135),
-  [261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
-  [263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(712),
-  [265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1728),
-  [267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(657),
-  [269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(336),
-  [271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1307),
-  [273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1611),
-  [275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1291),
-  [277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1658),
-  [279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432),
-  [281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1599),
-  [283] = {.entry = {.count = 1, .reusable = false}}, SHIFT(367),
-  [285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(187),
-  [287] = {.entry = {.count = 1, .reusable = false}}, SHIFT(178),
-  [289] = {.entry = {.count = 1, .reusable = false}}, SHIFT(344),
-  [291] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1995),
-  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(374),
-  [297] = {.entry = {.count = 1, .reusable = false}}, SHIFT(596),
-  [299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(596),
-  [301] = {.entry = {.count = 1, .reusable = false}}, SHIFT(597),
-  [303] = {.entry = {.count = 1, .reusable = false}}, SHIFT(598),
-  [305] = {.entry = {.count = 1, .reusable = false}}, SHIFT(510),
-  [307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1927),
-  [309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(346),
-  [311] = {.entry = {.count = 1, .reusable = false}}, SHIFT(351),
-  [313] = {.entry = {.count = 1, .reusable = false}}, SHIFT(354),
-  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(741),
-  [317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(714),
-  [319] = {.entry = {.count = 1, .reusable = false}}, SHIFT(369),
-  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(225),
-  [323] = {.entry = {.count = 1, .reusable = false}}, SHIFT(238),
-  [325] = {.entry = {.count = 1, .reusable = false}}, SHIFT(250),
-  [327] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1835),
-  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(389),
-  [333] = {.entry = {.count = 1, .reusable = false}}, SHIFT(590),
-  [335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(590),
-  [337] = {.entry = {.count = 1, .reusable = false}}, SHIFT(589),
-  [339] = {.entry = {.count = 1, .reusable = false}}, SHIFT(587),
-  [341] = {.entry = {.count = 1, .reusable = false}}, SHIFT(586),
-  [343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1945),
-  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(927),
-  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1036),
-  [349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(569),
-  [353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
-  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(901),
-  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
-  [359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1931),
-  [361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(556),
-  [363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1860),
-  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(580),
-  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(429),
-  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
-  [371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1845),
-  [373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(491),
-  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(544),
-  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(466),
-  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(440),
-  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(563),
-  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
-  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(950),
-  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
-  [395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(893),
-  [397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(529),
-  [401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
-  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
-  [405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 2),
-  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(939),
-  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
-  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(731),
-  [417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(706),
-  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1772),
-  [425] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 3),
-  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(524),
-  [431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
-  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(724),
-  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
-  [437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(879),
-  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1946),
-  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(940),
-  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1884),
-  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(478),
-  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
-  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
-  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(581),
-  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
-  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(588),
-  [459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [461] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 1),
-  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(946),
-  [467] = {.entry = {.count = 1, .reusable = false}}, SHIFT(372),
-  [469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
-  [471] = {.entry = {.count = 1, .reusable = false}}, SHIFT(184),
-  [473] = {.entry = {.count = 1, .reusable = false}}, SHIFT(211),
-  [475] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1855),
-  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
-  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(373),
-  [481] = {.entry = {.count = 1, .reusable = false}}, SHIFT(488),
-  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(488),
-  [485] = {.entry = {.count = 1, .reusable = false}}, SHIFT(486),
-  [487] = {.entry = {.count = 1, .reusable = false}}, SHIFT(485),
-  [489] = {.entry = {.count = 1, .reusable = false}}, SHIFT(484),
-  [491] = {.entry = {.count = 1, .reusable = false}}, SHIFT(815),
-  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(228),
-  [495] = {.entry = {.count = 1, .reusable = false}}, SHIFT(331),
-  [497] = {.entry = {.count = 1, .reusable = false}}, SHIFT(195),
-  [499] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1878),
-  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
-  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(834),
-  [505] = {.entry = {.count = 1, .reusable = false}}, SHIFT(936),
-  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(936),
-  [509] = {.entry = {.count = 1, .reusable = false}}, SHIFT(935),
-  [511] = {.entry = {.count = 1, .reusable = false}}, SHIFT(934),
-  [513] = {.entry = {.count = 1, .reusable = false}}, SHIFT(933),
-  [515] = {.entry = {.count = 1, .reusable = false}}, SHIFT(371),
-  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
-  [519] = {.entry = {.count = 1, .reusable = false}}, SHIFT(210),
-  [521] = {.entry = {.count = 1, .reusable = false}}, SHIFT(300),
-  [523] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1905),
-  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(407),
-  [529] = {.entry = {.count = 1, .reusable = false}}, SHIFT(481),
-  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(481),
-  [533] = {.entry = {.count = 1, .reusable = false}}, SHIFT(482),
-  [535] = {.entry = {.count = 1, .reusable = false}}, SHIFT(487),
-  [537] = {.entry = {.count = 1, .reusable = false}}, SHIFT(489),
-  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(886),
-  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
-  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(922),
-  [545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(717),
-  [547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465),
-  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(573),
-  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(538),
-  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(436),
-  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(547),
-  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(725),
-  [559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(555),
-  [561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(454),
-  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(878),
-  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
-  [567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(349),
-  [569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(356),
-  [571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
-  [573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
-  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324),
-  [577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(296),
-  [579] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_simpleId, 1),
-  [581] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_simpleId, 1),
+  [129] = {.entry = {.count = 1, .reusable = false}}, SHIFT(732),
+  [131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(732),
+  [133] = {.entry = {.count = 1, .reusable = false}}, SHIFT(734),
+  [135] = {.entry = {.count = 1, .reusable = false}}, SHIFT(735),
+  [137] = {.entry = {.count = 1, .reusable = false}}, SHIFT(751),
+  [139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(879),
+  [141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1715),
+  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(897),
+  [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1639),
+  [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(499),
+  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1684),
+  [157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448),
+  [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
+  [161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1667),
+  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(749),
+  [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1648),
+  [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(522),
+  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
+  [173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1697),
+  [175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1240),
+  [177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1698),
+  [179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(659),
+  [181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
+  [183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1128),
+  [185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
+  [187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(480),
+  [189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1644),
+  [191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(475),
+  [193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1651),
+  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(623),
+  [197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
+  [199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(730),
+  [201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1621),
+  [203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(629),
+  [205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
+  [207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1267),
+  [209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1740),
+  [211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(626),
+  [213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
+  [215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1246),
+  [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1694),
+  [219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(811),
+  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
+  [223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(907),
+  [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1597),
+  [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(544),
+  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1710),
+  [231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1271),
+  [233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1734),
+  [235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(899),
+  [237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1705),
+  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(585),
+  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1601),
+  [243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1252),
+  [245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1743),
+  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(720),
+  [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1640),
+  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1256),
+  [253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1728),
+  [255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(505),
+  [257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1666),
+  [259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(913),
+  [261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1661),
+  [263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1141),
+  [265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
+  [267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(985),
+  [269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1652),
+  [271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(571),
+  [273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1628),
+  [275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(583),
+  [277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1604),
+  [279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(553),
+  [281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1719),
+  [283] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1978),
+  [285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
+  [287] = {.entry = {.count = 1, .reusable = false}}, SHIFT(269),
+  [289] = {.entry = {.count = 1, .reusable = false}}, SHIFT(261),
+  [291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(943),
+  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(731),
+  [295] = {.entry = {.count = 1, .reusable = false}}, SHIFT(367),
+  [297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
+  [299] = {.entry = {.count = 1, .reusable = false}}, SHIFT(195),
+  [301] = {.entry = {.count = 1, .reusable = false}}, SHIFT(289),
+  [303] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1838),
+  [305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
+  [307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(414),
+  [309] = {.entry = {.count = 1, .reusable = false}}, SHIFT(427),
+  [311] = {.entry = {.count = 1, .reusable = true}}, SHIFT(427),
+  [313] = {.entry = {.count = 1, .reusable = false}}, SHIFT(426),
+  [315] = {.entry = {.count = 1, .reusable = false}}, SHIFT(425),
+  [317] = {.entry = {.count = 1, .reusable = false}}, SHIFT(536),
+  [319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
+  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
+  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(519),
+  [325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
+  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(568),
+  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(892),
+  [333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1869),
+  [337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(958),
+  [339] = {.entry = {.count = 1, .reusable = false}}, SHIFT(370),
+  [341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
+  [343] = {.entry = {.count = 1, .reusable = false}}, SHIFT(257),
+  [345] = {.entry = {.count = 1, .reusable = false}}, SHIFT(329),
+  [347] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1859),
+  [349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
+  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(410),
+  [353] = {.entry = {.count = 1, .reusable = false}}, SHIFT(575),
+  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(575),
+  [357] = {.entry = {.count = 1, .reusable = false}}, SHIFT(574),
+  [359] = {.entry = {.count = 1, .reusable = false}}, SHIFT(572),
+  [361] = {.entry = {.count = 1, .reusable = false}}, SHIFT(562),
+  [363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(888),
+  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(912),
+  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
+  [371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(902),
+  [373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(910),
+  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
+  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(939),
+  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
+  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1837),
+  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(779),
+  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1928),
+  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(429),
+  [391] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 3),
+  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1850),
+  [397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(548),
+  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1924),
+  [401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(479),
+  [403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 1),
+  [405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
+  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(478),
+  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(742),
+  [417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
+  [419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(485),
+  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
+  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1775),
+  [425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(729),
+  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
+  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(721),
+  [431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
+  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1976),
+  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(542),
+  [437] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 2),
+  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(430),
+  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(576),
+  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
+  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(529),
+  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
+  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(598),
+  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(558),
+  [459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(551),
+  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
+  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(895),
+  [467] = {.entry = {.count = 1, .reusable = false}}, SHIFT(369),
+  [469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(241),
+  [471] = {.entry = {.count = 1, .reusable = false}}, SHIFT(178),
+  [473] = {.entry = {.count = 1, .reusable = false}}, SHIFT(265),
+  [475] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1852),
+  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
+  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
+  [481] = {.entry = {.count = 1, .reusable = false}}, SHIFT(517),
+  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(517),
+  [485] = {.entry = {.count = 1, .reusable = false}}, SHIFT(520),
+  [487] = {.entry = {.count = 1, .reusable = false}}, SHIFT(535),
+  [489] = {.entry = {.count = 1, .reusable = false}}, SHIFT(537),
+  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(573),
+  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(528),
+  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(774),
+  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(470),
+  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(454),
+  [501] = {.entry = {.count = 1, .reusable = false}}, SHIFT(372),
+  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(355),
+  [505] = {.entry = {.count = 1, .reusable = false}}, SHIFT(184),
+  [507] = {.entry = {.count = 1, .reusable = false}}, SHIFT(343),
+  [509] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1906),
+  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
+  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
+  [515] = {.entry = {.count = 1, .reusable = false}}, SHIFT(466),
+  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(466),
+  [519] = {.entry = {.count = 1, .reusable = false}}, SHIFT(467),
+  [521] = {.entry = {.count = 1, .reusable = false}}, SHIFT(471),
+  [523] = {.entry = {.count = 1, .reusable = false}}, SHIFT(472),
+  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
+  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(580),
+  [529] = {.entry = {.count = 1, .reusable = false}}, SHIFT(815),
+  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
+  [533] = {.entry = {.count = 1, .reusable = false}}, SHIFT(182),
+  [535] = {.entry = {.count = 1, .reusable = false}}, SHIFT(242),
+  [537] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1879),
+  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(843),
+  [543] = {.entry = {.count = 1, .reusable = false}}, SHIFT(962),
+  [545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(962),
+  [547] = {.entry = {.count = 1, .reusable = false}}, SHIFT(960),
+  [549] = {.entry = {.count = 1, .reusable = false}}, SHIFT(959),
+  [551] = {.entry = {.count = 1, .reusable = false}}, SHIFT(956),
+  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(885),
+  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(883),
+  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(541),
+  [559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(893),
+  [561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(564),
+  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(739),
+  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
+  [567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
+  [569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
+  [571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
+  [573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
+  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
+  [577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
+  [579] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_simpleId, 1),
+  [581] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_simpleId, 1),
   [583] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_literalId, 1),
   [585] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotName, 1),
   [587] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_literalId, 1), REDUCE(sym_simpleId, 1),
-  [590] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBy, 1),
-  [592] = {.entry = {.count = 1, .reusable = false}}, SHIFT(545),
-  [594] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBy, 1),
-  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(545),
-  [598] = {.entry = {.count = 1, .reusable = false}}, SHIFT(212),
-  [600] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1424),
-  [602] = {.entry = {.count = 1, .reusable = false}}, SHIFT(360),
-  [604] = {.entry = {.count = 1, .reusable = false}}, SHIFT(173),
-  [606] = {.entry = {.count = 1, .reusable = false}}, SHIFT(208),
-  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(546),
-  [610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(554),
-  [612] = {.entry = {.count = 1, .reusable = false}}, SHIFT(554),
-  [614] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1207),
-  [616] = {.entry = {.count = 1, .reusable = false}}, SHIFT(323),
-  [618] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1417),
-  [620] = {.entry = {.count = 1, .reusable = false}}, SHIFT(359),
-  [622] = {.entry = {.count = 1, .reusable = false}}, SHIFT(329),
-  [624] = {.entry = {.count = 1, .reusable = false}}, SHIFT(332),
-  [626] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1200),
-  [628] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_simpleId, 1), SHIFT(1383),
-  [631] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_simpleId, 1), REDUCE(sym_className, 1),
-  [634] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExpr, 1),
-  [636] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExpr, 1),
-  [638] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1566),
-  [640] = {.entry = {.count = 1, .reusable = false}}, SHIFT(209),
-  [642] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1405),
-  [644] = {.entry = {.count = 1, .reusable = false}}, SHIFT(363),
-  [646] = {.entry = {.count = 1, .reusable = false}}, SHIFT(277),
-  [648] = {.entry = {.count = 1, .reusable = false}}, SHIFT(278),
-  [650] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conjunction, 3, .production_id = 11),
-  [652] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conjunction, 3, .production_id = 11),
-  [654] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_disjunction, 3, .production_id = 11),
-  [656] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_disjunction, 3, .production_id = 11),
-  [658] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_prefix_cast, 4, .dynamic_precedence = 10),
-  [660] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prefix_cast, 4, .dynamic_precedence = 10),
+  [590] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBy, 1),
+  [592] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBy, 1),
+  [594] = {.entry = {.count = 1, .reusable = false}}, SHIFT(457),
+  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(457),
+  [598] = {.entry = {.count = 1, .reusable = false}}, SHIFT(315),
+  [600] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1417),
+  [602] = {.entry = {.count = 1, .reusable = false}}, SHIFT(364),
+  [604] = {.entry = {.count = 1, .reusable = false}}, SHIFT(313),
+  [606] = {.entry = {.count = 1, .reusable = false}}, SHIFT(312),
+  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(459),
+  [610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460),
+  [612] = {.entry = {.count = 1, .reusable = false}}, SHIFT(460),
+  [614] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1194),
+  [616] = {.entry = {.count = 1, .reusable = false}}, SHIFT(281),
+  [618] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1410),
+  [620] = {.entry = {.count = 1, .reusable = false}}, SHIFT(360),
+  [622] = {.entry = {.count = 1, .reusable = false}}, SHIFT(277),
+  [624] = {.entry = {.count = 1, .reusable = false}}, SHIFT(276),
+  [626] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1197),
+  [628] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_mul_expr, 3, .production_id = 11),
+  [630] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_mul_expr, 3, .production_id = 11),
+  [632] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_expr, 2),
+  [634] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_expr, 2),
+  [636] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_disjunction, 3, .production_id = 11),
+  [638] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_disjunction, 3, .production_id = 11),
+  [640] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1408),
+  [642] = {.entry = {.count = 1, .reusable = false}}, SHIFT(365),
+  [644] = {.entry = {.count = 1, .reusable = false}}, SHIFT(336),
+  [646] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conjunction, 3, .production_id = 11),
+  [648] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conjunction, 3, .production_id = 11),
+  [650] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_implication, 3, .production_id = 11),
+  [652] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_implication, 3, .production_id = 11),
+  [654] = {.entry = {.count = 1, .reusable = false}}, SHIFT(338),
+  [656] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comp_term, 3, .production_id = 11),
+  [658] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comp_term, 3, .production_id = 11),
+  [660] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_add_expr, 3, .production_id = 11),
   [662] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_add_expr, 3, .production_id = 11),
-  [664] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_add_expr, 3, .production_id = 11),
-  [666] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_mul_expr, 3, .production_id = 11),
-  [668] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_mul_expr, 3, .production_id = 11),
-  [670] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_expr, 2),
-  [672] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_expr, 2),
-  [674] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_negation, 2),
-  [676] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_negation, 2),
-  [678] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1574),
-  [680] = {.entry = {.count = 1, .reusable = false}}, SHIFT(288),
-  [682] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1420),
-  [684] = {.entry = {.count = 1, .reusable = false}}, SHIFT(365),
-  [686] = {.entry = {.count = 1, .reusable = false}}, SHIFT(281),
-  [688] = {.entry = {.count = 1, .reusable = false}}, SHIFT(275),
-  [690] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_term, 6, .production_id = 35),
-  [692] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_term, 6, .production_id = 35),
-  [694] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comp_term, 3, .production_id = 11),
-  [696] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comp_term, 3, .production_id = 11),
-  [698] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_implication, 3, .production_id = 11),
-  [700] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_implication, 3, .production_id = 11),
-  [702] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_varName, 1),
-  [704] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_varName, 1),
+  [664] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prefix_cast, 4, .dynamic_precedence = 10),
+  [666] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_prefix_cast, 4, .dynamic_precedence = 10),
+  [668] = {.entry = {.count = 1, .reusable = false}}, SHIFT(335),
+  [670] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_term, 6, .production_id = 35),
+  [672] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_term, 6, .production_id = 35),
+  [674] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_simpleId, 1), REDUCE(sym_className, 1),
+  [677] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExpr, 1),
+  [679] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExpr, 1),
+  [681] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1527),
+  [683] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_negation, 2),
+  [685] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_negation, 2),
+  [687] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1422),
+  [689] = {.entry = {.count = 1, .reusable = false}}, SHIFT(363),
+  [691] = {.entry = {.count = 1, .reusable = false}}, SHIFT(299),
+  [693] = {.entry = {.count = 1, .reusable = false}}, SHIFT(300),
+  [695] = {.entry = {.count = 1, .reusable = false}}, SHIFT(301),
+  [697] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1589),
+  [699] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_varName, 1),
+  [701] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_varName, 1),
+  [703] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_moduleName, 1), REDUCE(sym_varName, 1),
   [706] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleExpr, 1),
-  [708] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 3),
-  [710] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 3),
-  [712] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 7),
-  [714] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 7),
-  [716] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 38),
-  [718] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 38),
-  [720] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 37),
-  [722] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 37),
-  [724] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 4, .production_id = 1),
-  [726] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 4, .production_id = 1),
-  [728] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 4),
-  [730] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 4),
-  [732] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_body, 4),
-  [734] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_body, 4),
-  [736] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 4, .production_id = 30),
-  [738] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 4, .production_id = 30),
-  [740] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 3, .production_id = 1),
-  [742] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 3, .production_id = 1),
-  [744] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 3),
-  [746] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 3),
-  [748] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 5),
-  [750] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 5),
-  [752] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_range, 5, .production_id = 28),
-  [754] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_range, 5, .production_id = 28),
-  [756] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 4),
-  [758] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 4),
-  [760] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_body, 3),
-  [762] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_body, 3),
-  [764] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 3),
-  [766] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 3),
-  [768] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 4),
-  [770] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 4),
-  [772] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 3),
-  [774] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 3),
-  [776] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_or_unqual_agg_expr, 3, .dynamic_precedence = 10),
-  [778] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_or_unqual_agg_expr, 3, .dynamic_precedence = 10),
-  [780] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_body, 2),
-  [782] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_body, 2),
-  [784] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_super_ref, 3),
-  [786] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_super_ref, 3),
-  [788] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualified_expr, 3),
-  [790] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualified_expr, 3),
-  [792] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 47),
-  [794] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 47),
-  [796] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 6),
-  [798] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 6),
-  [800] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 5, .production_id = 1),
-  [802] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 5, .production_id = 1),
-  [804] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr_annotation, 7, .production_id = 46),
-  [806] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr_annotation, 7, .production_id = 46),
-  [808] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_in_expr, 3, .production_id = 11),
-  [810] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_in_expr, 3, .production_id = 11),
-  [812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1569),
-  [814] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unop, 1),
-  [816] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unop, 1),
-  [818] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 48),
-  [820] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 48),
-  [822] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_par_expr, 3),
-  [824] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_par_expr, 3),
-  [826] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 5),
-  [828] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 5),
-  [830] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_or_unqual_agg_expr, 2, .dynamic_precedence = 10),
-  [832] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_or_unqual_agg_expr, 2, .dynamic_precedence = 10),
-  [834] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 49),
-  [836] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 49),
-  [838] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 6, .production_id = 1),
-  [840] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 6, .production_id = 1),
-  [842] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 59),
-  [844] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 59),
-  [846] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 60),
-  [848] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 60),
-  [850] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 8),
-  [852] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 8),
-  [854] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 2),
-  [856] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 2),
-  [858] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 8, .production_id = 68),
-  [860] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 8, .production_id = 68),
-  [862] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_className, 1),
-  [864] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_className, 1),
-  [866] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_className, 1), SHIFT(1383),
-  [869] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_literal, 1),
-  [871] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_literal, 1),
-  [873] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_bool, 1),
-  [875] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_bool, 1),
-  [877] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__exprOrTerm, 1),
-  [879] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__exprOrTerm, 1),
-  [881] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_super_ref, 1),
-  [883] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_super_ref, 1),
-  [885] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variable, 1),
-  [887] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variable, 1),
-  [889] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1560),
-  [891] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1579),
-  [893] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_compop, 1),
-  [895] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_compop, 1),
-  [897] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_addop, 1),
-  [899] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_addop, 1),
-  [901] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_mulop, 1),
-  [903] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_mulop, 1),
-  [905] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1540),
-  [907] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_special_call, 3),
-  [909] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_special_call, 3),
-  [911] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 6, .production_id = 36),
-  [913] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 6, .production_id = 36),
-  [915] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 7, .production_id = 45),
-  [917] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 7, .production_id = 45),
-  [919] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeExpr, 3, .production_id = 9),
-  [921] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeExpr, 3, .production_id = 9),
-  [923] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeExpr, 1, .production_id = 1),
-  [925] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeExpr, 1, .production_id = 1),
-  [927] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primitiveType, 1),
-  [929] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primitiveType, 1),
-  [931] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeExpr, 1),
-  [933] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeExpr, 1),
-  [935] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 7, .production_id = 44),
-  [937] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 7, .production_id = 44),
-  [939] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 5, .production_id = 29),
-  [941] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 5, .production_id = 29),
-  [943] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 5),
-  [945] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 5),
-  [947] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 8, .production_id = 58),
-  [949] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 8, .production_id = 58),
-  [951] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 4),
-  [953] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 4),
-  [955] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 4, .production_id = 16),
-  [957] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 4, .production_id = 16),
-  [959] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 3),
-  [961] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 3),
-  [963] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 9, .production_id = 67),
-  [965] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 9, .production_id = 67),
-  [967] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_instance_of, 3),
-  [969] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_instance_of, 3),
-  [971] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1546),
-  [973] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1337),
-  [975] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1503),
-  [977] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1771),
-  [979] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1390),
-  [981] = {.entry = {.count = 1, .reusable = false}}, SHIFT(317),
-  [983] = {.entry = {.count = 1, .reusable = false}}, SHIFT(61),
-  [985] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1758),
-  [987] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1230),
-  [989] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1757),
-  [991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1331),
-  [993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1256),
-  [995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1306),
-  [997] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1302),
-  [999] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2),
-  [1001] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1237),
-  [1004] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1563),
-  [1007] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1493),
-  [1010] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1754),
-  [1013] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1389),
-  [1016] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(196),
-  [1019] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(92),
-  [1022] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1755),
-  [1025] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1220),
-  [1028] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1444),
-  [1031] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1443),
-  [1034] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1440),
-  [1037] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1756),
-  [1040] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1264),
-  [1042] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1239),
-  [1044] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1215),
-  [1046] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1234),
-  [1048] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1309),
-  [1050] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1341),
-  [1052] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1334),
-  [1054] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1340),
-  [1056] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1339),
-  [1058] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1235),
-  [1060] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1375),
-  [1062] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1356),
-  [1064] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1224),
-  [1066] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1376),
-  [1068] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1313),
-  [1070] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1259),
-  [1072] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1325),
-  [1074] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1360),
-  [1076] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1323),
-  [1078] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1284),
-  [1080] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1286),
-  [1082] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1332),
-  [1084] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1287),
-  [1086] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1280),
-  [1088] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ql, 1),
+  [708] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 8, .production_id = 68),
+  [710] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 8, .production_id = 68),
+  [712] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_body, 2),
+  [714] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_body, 2),
+  [716] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variable, 1),
+  [718] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variable, 1),
+  [720] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_bool, 1),
+  [722] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_bool, 1),
+  [724] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_literal, 1),
+  [726] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_literal, 1),
+  [728] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_range, 5, .production_id = 28),
+  [730] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_range, 5, .production_id = 28),
+  [732] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 2),
+  [734] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 2),
+  [736] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 5),
+  [738] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 5),
+  [740] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 6),
+  [742] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 6),
+  [744] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__exprOrTerm, 1),
+  [746] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__exprOrTerm, 1),
+  [748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1525),
+  [750] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_or_unqual_agg_expr, 2, .dynamic_precedence = 10),
+  [752] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_or_unqual_agg_expr, 2, .dynamic_precedence = 10),
+  [754] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 5, .production_id = 1),
+  [756] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 5, .production_id = 1),
+  [758] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr_annotation, 7, .production_id = 46),
+  [760] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr_annotation, 7, .production_id = 46),
+  [762] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 47),
+  [764] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 47),
+  [766] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_par_expr, 3),
+  [768] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_par_expr, 3),
+  [770] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 48),
+  [772] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 48),
+  [774] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 49),
+  [776] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 6, .production_id = 49),
+  [778] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unop, 1),
+  [780] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unop, 1),
+  [782] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 3),
+  [784] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 3),
+  [786] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 7),
+  [788] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 7),
+  [790] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 6, .production_id = 1),
+  [792] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 6, .production_id = 1),
+  [794] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 59),
+  [796] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 59),
+  [798] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_in_expr, 3, .production_id = 11),
+  [800] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_in_expr, 3, .production_id = 11),
+  [802] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualified_expr, 3),
+  [804] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualified_expr, 3),
+  [806] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_super_ref, 3),
+  [808] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_super_ref, 3),
+  [810] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 60),
+  [812] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 7, .production_id = 60),
+  [814] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 8),
+  [816] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 8),
+  [818] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_or_unqual_agg_expr, 3, .dynamic_precedence = 10),
+  [820] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_or_unqual_agg_expr, 3, .dynamic_precedence = 10),
+  [822] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 3),
+  [824] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 3),
+  [826] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 4),
+  [828] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 4),
+  [830] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 4),
+  [832] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 4),
+  [834] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_body, 3),
+  [836] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_body, 3),
+  [838] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_compop, 1),
+  [840] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_compop, 1),
+  [842] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 3),
+  [844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 3),
+  [846] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_addop, 1),
+  [848] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_addop, 1),
+  [850] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_mulop, 1),
+  [852] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_mulop, 1),
+  [854] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_className, 1),
+  [856] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_className, 1),
+  [858] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_simpleId, 1), REDUCE(sym_className, 1),
+  [861] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_literal, 5),
+  [863] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_literal, 5),
+  [865] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_super_ref, 1),
+  [867] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_super_ref, 1),
+  [869] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1542),
+  [871] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 3),
+  [873] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 3),
+  [875] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 3, .production_id = 1),
+  [877] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 3, .production_id = 1),
+  [879] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 4, .production_id = 30),
+  [881] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 4, .production_id = 30),
+  [883] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_body, 4),
+  [885] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_body, 4),
+  [887] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 4),
+  [889] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 4),
+  [891] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualifiedRhs, 4, .production_id = 1),
+  [893] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualifiedRhs, 4, .production_id = 1),
+  [895] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 37),
+  [897] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 37),
+  [899] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 38),
+  [901] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqual_agg_body, 5, .production_id = 38),
+  [903] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1531),
+  [905] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1570),
+  [907] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 4),
+  [909] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 4),
+  [911] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_special_call, 3),
+  [913] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_special_call, 3),
+  [915] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 6, .production_id = 36),
+  [917] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 6, .production_id = 36),
+  [919] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primitiveType, 1),
+  [921] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primitiveType, 1),
+  [923] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 8, .production_id = 58),
+  [925] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 8, .production_id = 58),
+  [927] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 9, .production_id = 67),
+  [929] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 9, .production_id = 67),
+  [931] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeExpr, 1, .production_id = 1),
+  [933] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeExpr, 1, .production_id = 1),
+  [935] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 5, .production_id = 29),
+  [937] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 5, .production_id = 29),
+  [939] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 4, .production_id = 16),
+  [941] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 4, .production_id = 16),
+  [943] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeExpr, 1),
+  [945] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeExpr, 1),
+  [947] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 7, .production_id = 45),
+  [949] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 7, .production_id = 45),
+  [951] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 7, .production_id = 44),
+  [953] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 7, .production_id = 44),
+  [955] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeExpr, 3, .production_id = 9),
+  [957] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeExpr, 3, .production_id = 9),
+  [959] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_instance_of, 3),
+  [961] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_instance_of, 3),
+  [963] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 3),
+  [965] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 3),
+  [967] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantified, 5),
+  [969] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quantified, 5),
+  [971] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1571),
+  [973] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1350),
+  [975] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1504),
+  [977] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1785),
+  [979] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1364),
+  [981] = {.entry = {.count = 1, .reusable = false}}, SHIFT(342),
+  [983] = {.entry = {.count = 1, .reusable = false}}, SHIFT(111),
+  [985] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1751),
+  [987] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1250),
+  [989] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1750),
+  [991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1225),
+  [993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1235),
+  [995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1269),
+  [997] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1255),
+  [999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1245),
+  [1001] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1279),
+  [1003] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1284),
+  [1005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1285),
+  [1007] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1299),
+  [1009] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1296),
+  [1011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1293),
+  [1013] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1295),
+  [1015] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1283),
+  [1017] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1302),
+  [1019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1323),
+  [1021] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1368),
+  [1023] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1324),
+  [1025] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1342),
+  [1027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1329),
+  [1029] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1356),
+  [1031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1270),
+  [1033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1358),
+  [1035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1320),
+  [1037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1257),
+  [1039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1353),
+  [1041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1265),
+  [1043] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2),
+  [1045] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1186),
+  [1048] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1556),
+  [1051] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1500),
+  [1054] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1792),
+  [1057] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1229),
+  [1060] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(264),
+  [1063] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(92),
+  [1066] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1791),
+  [1069] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1230),
+  [1072] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1435),
+  [1075] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1442),
+  [1078] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1444),
+  [1081] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1788),
+  [1084] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1334),
+  [1086] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1381),
+  [1088] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1266),
   [1090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1253),
-  [1092] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1327),
-  [1094] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1244),
-  [1096] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1546),
-  [1099] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1503),
-  [1102] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1771),
-  [1105] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1390),
-  [1108] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(317),
-  [1111] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(61),
-  [1114] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1758),
-  [1117] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1230),
-  [1120] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1757),
-  [1123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1262),
-  [1125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1248),
-  [1127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1288),
+  [1092] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1233),
+  [1094] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1274),
+  [1096] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1571),
+  [1099] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1504),
+  [1102] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1785),
+  [1105] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1364),
+  [1108] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(342),
+  [1111] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(111),
+  [1114] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1751),
+  [1117] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1250),
+  [1120] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_ql_repeat1, 2), SHIFT_REPEAT(1750),
+  [1123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1232),
+  [1125] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ql, 1),
+  [1127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1231),
   [1129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1297),
-  [1131] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_simpleId, 1), REDUCE(sym_className, 1),
-  [1134] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1581),
-  [1136] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1407),
-  [1138] = {.entry = {.count = 1, .reusable = false}}, SHIFT(364),
-  [1140] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
-  [1142] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1271),
-  [1144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1433),
-  [1146] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1797),
-  [1148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1260),
-  [1150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1371),
-  [1152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1349),
-  [1154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1355),
-  [1156] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1277),
-  [1158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1246),
-  [1160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1348),
-  [1162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
-  [1164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1303),
-  [1166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1350),
-  [1168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1344),
-  [1170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1216),
-  [1172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1240),
-  [1174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1366),
-  [1176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1367),
-  [1178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1381),
-  [1180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1385),
-  [1182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1326),
-  [1184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1296),
-  [1186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1269),
-  [1188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1265),
-  [1190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1227),
-  [1192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1365),
-  [1194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
-  [1196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1228),
-  [1198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1312),
-  [1200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1229),
-  [1202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1304),
-  [1204] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1237),
-  [1207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2),
-  [1209] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1433),
-  [1212] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1444),
-  [1215] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1443),
-  [1218] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1440),
-  [1221] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1797),
-  [1224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1294),
-  [1226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1346),
-  [1228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1276),
-  [1230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1278),
-  [1232] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1282),
-  [1234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1318),
-  [1236] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1289),
-  [1238] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1362),
-  [1240] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1364),
-  [1242] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
-  [1244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1425),
-  [1246] = {.entry = {.count = 1, .reusable = false}}, SHIFT(361),
-  [1248] = {.entry = {.count = 1, .reusable = true}}, SHIFT(241),
-  [1250] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
-  [1252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1773),
-  [1254] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
-  [1256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(977),
-  [1258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
-  [1260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1571),
-  [1262] = {.entry = {.count = 1, .reusable = false}}, SHIFT(297),
-  [1264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1408),
-  [1266] = {.entry = {.count = 1, .reusable = false}}, SHIFT(366),
-  [1268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [1270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
-  [1272] = {.entry = {.count = 1, .reusable = false}}, SHIFT(362),
-  [1274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
-  [1276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
-  [1278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
-  [1280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
-  [1282] = {.entry = {.count = 1, .reusable = true}}, SHIFT(503),
-  [1284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(321),
-  [1286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
-  [1288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(743),
-  [1290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
-  [1292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
-  [1294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460),
-  [1296] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
-  [1298] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
-  [1300] = {.entry = {.count = 1, .reusable = true}}, SHIFT(423),
-  [1302] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
-  [1304] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [1306] = {.entry = {.count = 1, .reusable = true}}, SHIFT(562),
-  [1308] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
-  [1310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
-  [1312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(904),
-  [1314] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
-  [1316] = {.entry = {.count = 1, .reusable = true}}, SHIFT(285),
-  [1318] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1844),
-  [1320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1801),
-  [1322] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1932),
-  [1324] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1866),
-  [1326] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualModuleExpr, 1, .production_id = 1),
-  [1328] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualModuleExpr, 1, .production_id = 1),
-  [1330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1625),
-  [1332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualModuleExpr, 2, .production_id = 4),
-  [1334] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualModuleExpr, 2, .production_id = 4),
-  [1336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1630),
-  [1338] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10),
-  [1340] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10),
-  [1342] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1630),
-  [1345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1825),
-  [1347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1892),
-  [1349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1919),
-  [1351] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1625),
-  [1354] = {.entry = {.count = 1, .reusable = true}}, SHIFT(601),
-  [1356] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
-  [1358] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 6, .production_id = 8),
-  [1360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339),
-  [1362] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 6, .production_id = 8),
-  [1364] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importModuleExpr, 1),
-  [1366] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importModuleExpr, 1),
-  [1368] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1617),
-  [1370] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 6, .production_id = 2),
-  [1372] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 6, .production_id = 2),
-  [1374] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1583),
-  [1376] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1057),
-  [1378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
-  [1380] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 2),
-  [1382] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 2),
-  [1384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(891),
-  [1386] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [1388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(930),
-  [1390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
-  [1392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1629),
-  [1394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1166),
-  [1396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
-  [1398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1089),
-  [1400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
-  [1402] = {.entry = {.count = 1, .reusable = true}}, SHIFT(948),
-  [1404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
-  [1406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(900),
-  [1408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
-  [1410] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2),
-  [1412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1150),
-  [1414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
-  [1416] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_asExprs_repeat1, 2),
-  [1418] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(171),
-  [1421] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2),
-  [1423] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 7, .production_id = 8),
-  [1425] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 7, .production_id = 8),
-  [1427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
-  [1429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(711),
-  [1431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [1433] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 2, .production_id = 17),
-  [1435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
-  [1437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1123),
-  [1439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
-  [1441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(970),
-  [1443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
-  [1445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(911),
-  [1447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
-  [1449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469),
-  [1451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [1453] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 4, .production_id = 2),
-  [1455] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 4, .production_id = 2),
-  [1457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1591),
-  [1459] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(156),
-  [1462] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExprs, 2),
-  [1464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [1466] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExprs, 2),
-  [1468] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 3, .production_id = 1),
-  [1470] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 3, .production_id = 1),
-  [1472] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__call_arg, 1),
-  [1474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(425),
-  [1476] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
-  [1478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(787),
-  [1480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
-  [1482] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 4, .production_id = 1),
-  [1484] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 4, .production_id = 1),
-  [1486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(600),
-  [1488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
-  [1490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(431),
-  [1492] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
-  [1494] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExprs, 1),
-  [1496] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExprs, 1),
-  [1498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
-  [1500] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 5, .production_id = 1),
-  [1502] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 5, .production_id = 1),
-  [1504] = {.entry = {.count = 1, .reusable = true}}, SHIFT(518),
-  [1506] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [1508] = {.entry = {.count = 1, .reusable = true}}, SHIFT(730),
-  [1510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
-  [1512] = {.entry = {.count = 1, .reusable = true}}, SHIFT(616),
-  [1514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
-  [1516] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 3, .production_id = 30),
-  [1518] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
-  [1520] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 5, .production_id = 2),
-  [1522] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 5, .production_id = 2),
-  [1524] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1156),
-  [1526] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
-  [1528] = {.entry = {.count = 1, .reusable = true}}, SHIFT(639),
-  [1530] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
-  [1532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(624),
-  [1534] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
-  [1536] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 5, .production_id = 8),
-  [1538] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 5, .production_id = 8),
-  [1540] = {.entry = {.count = 1, .reusable = true}}, SHIFT(804),
-  [1542] = {.entry = {.count = 1, .reusable = true}}, SHIFT(347),
-  [1544] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10),
-  [1546] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10),
-  [1548] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1629),
-  [1551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(511),
-  [1553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
-  [1555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(650),
-  [1557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
-  [1559] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importModuleExpr, 2, .production_id = 3),
-  [1561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importModuleExpr, 2, .production_id = 3),
-  [1563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(610),
-  [1565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
-  [1567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(626),
-  [1569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(333),
-  [1571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(578),
-  [1573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
-  [1575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(525),
-  [1577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
-  [1579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(442),
-  [1581] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
-  [1583] = {.entry = {.count = 1, .reusable = true}}, SHIFT(647),
-  [1585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
-  [1587] = {.entry = {.count = 1, .reusable = true}}, SHIFT(775),
-  [1589] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
-  [1591] = {.entry = {.count = 1, .reusable = true}}, SHIFT(531),
-  [1593] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
-  [1595] = {.entry = {.count = 1, .reusable = true}}, SHIFT(602),
-  [1597] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
-  [1599] = {.entry = {.count = 1, .reusable = true}}, SHIFT(747),
-  [1601] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
-  [1603] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 38),
-  [1605] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
-  [1607] = {.entry = {.count = 1, .reusable = true}}, SHIFT(585),
-  [1609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [1611] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1617),
-  [1614] = {.entry = {.count = 1, .reusable = true}}, SHIFT(574),
-  [1616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [1618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497),
-  [1620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [1622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(645),
-  [1624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
-  [1626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(617),
-  [1628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(318),
-  [1630] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExpr, 3),
-  [1632] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExpr, 3),
-  [1634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(776),
-  [1636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(609),
-  [1638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(745),
-  [1640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
-  [1642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330),
-  [1644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(593),
-  [1646] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2),
-  [1648] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_orderBys_repeat1, 2),
-  [1650] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2), SHIFT_REPEAT(150),
-  [1653] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 6),
-  [1655] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 6),
-  [1657] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1815),
-  [1659] = {.entry = {.count = 1, .reusable = true}}, SHIFT(612),
-  [1661] = {.entry = {.count = 1, .reusable = true}}, SHIFT(620),
-  [1663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1202),
-  [1665] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBys, 3),
-  [1667] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
-  [1669] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBys, 3),
-  [1671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
-  [1673] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
-  [1675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(707),
-  [1677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(905),
-  [1679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(632),
-  [1681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(920),
-  [1683] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 5),
-  [1685] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 5),
-  [1687] = {.entry = {.count = 1, .reusable = true}}, SHIFT(539),
-  [1689] = {.entry = {.count = 1, .reusable = true}}, SHIFT(771),
-  [1691] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 7),
-  [1693] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 7),
-  [1695] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1915),
-  [1697] = {.entry = {.count = 1, .reusable = true}}, SHIFT(455),
-  [1699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
-  [1701] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 3),
-  [1703] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 3),
-  [1705] = {.entry = {.count = 1, .reusable = true}}, SHIFT(457),
-  [1707] = {.entry = {.count = 1, .reusable = true}}, SHIFT(357),
-  [1709] = {.entry = {.count = 1, .reusable = true}}, SHIFT(572),
-  [1711] = {.entry = {.count = 1, .reusable = true}}, SHIFT(648),
-  [1713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
-  [1715] = {.entry = {.count = 1, .reusable = true}}, SHIFT(516),
-  [1717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
-  [1719] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBys, 4),
-  [1721] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBys, 4),
-  [1723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(656),
-  [1725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(659),
-  [1727] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranches, 1),
-  [1729] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranches, 1),
-  [1731] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1458),
-  [1733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1213),
-  [1735] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
-  [1737] = {.entry = {.count = 1, .reusable = true}}, SHIFT(636),
-  [1739] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 2),
-  [1741] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 2),
-  [1743] = {.entry = {.count = 1, .reusable = true}}, SHIFT(615),
-  [1745] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1455),
-  [1747] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1434),
-  [1749] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
-  [1751] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
-  [1753] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
-  [1755] = {.entry = {.count = 1, .reusable = true}}, SHIFT(437),
-  [1757] = {.entry = {.count = 1, .reusable = true}}, SHIFT(638),
-  [1759] = {.entry = {.count = 1, .reusable = true}}, SHIFT(509),
-  [1761] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
-  [1763] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 4),
-  [1765] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 4),
-  [1767] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2),
-  [1769] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2),
-  [1771] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2), SHIFT_REPEAT(1458),
-  [1774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
-  [1776] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2), SHIFT_REPEAT(159),
-  [1779] = {.entry = {.count = 1, .reusable = true}}, SHIFT(472),
-  [1781] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 2),
-  [1783] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 2),
-  [1785] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
-  [1787] = {.entry = {.count = 1, .reusable = true}}, SHIFT(565),
-  [1789] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [1791] = {.entry = {.count = 1, .reusable = true}}, SHIFT(794),
-  [1793] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranches, 2),
-  [1795] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranches, 2),
-  [1797] = {.entry = {.count = 1, .reusable = true}}, SHIFT(494),
-  [1799] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1050),
-  [1801] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2), SHIFT_REPEAT(1455),
-  [1804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(622),
-  [1806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(644),
-  [1808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(808),
-  [1810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1136),
-  [1812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1142),
-  [1814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1126),
-  [1816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(885),
-  [1818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(307),
-  [1820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1124),
-  [1822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
-  [1824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(959),
-  [1826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
-  [1828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(908),
-  [1830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(649),
-  [1832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1112),
-  [1834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(980),
-  [1836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
-  [1838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [1840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(718),
-  [1842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
-  [1844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(343),
-  [1846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [1848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1164),
-  [1850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1151),
-  [1852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(623),
-  [1854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
-  [1856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
-  [1858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(651),
-  [1860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(643),
-  [1862] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importDirective, 2),
-  [1864] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importDirective, 2),
-  [1866] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1587),
-  [1868] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 7, .production_id = 2),
-  [1870] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 7, .production_id = 2),
-  [1872] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 8, .production_id = 8),
-  [1874] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 8, .production_id = 8),
-  [1876] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1504),
-  [1878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1429),
-  [1880] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 6, .production_id = 1),
-  [1882] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 6, .production_id = 1),
-  [1884] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_direction, 1),
-  [1886] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_direction, 1),
-  [1888] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_moduleMember_repeat1, 2), SHIFT_REPEAT(1314),
-  [1891] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_moduleMember_repeat1, 2),
-  [1893] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_moduleMember_repeat1, 2),
-  [1895] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_body, 3),
-  [1897] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_body, 3),
-  [1899] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBy, 2),
-  [1901] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBy, 2),
-  [1903] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1588),
-  [1905] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 43),
-  [1907] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 43),
-  [1909] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 20),
-  [1911] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 20),
-  [1913] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatype, 4, .production_id = 2),
-  [1915] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatype, 4, .production_id = 2),
-  [1917] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 66),
-  [1919] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 66),
-  [1921] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 7, .production_id = 7),
-  [1923] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 7, .production_id = 7),
-  [1925] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleMember, 1),
-  [1927] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleMember, 1),
-  [1929] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleName, 1),
-  [1931] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleName, 1),
-  [1933] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 5, .production_id = 15),
-  [1935] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 5, .production_id = 15),
-  [1937] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 5, .production_id = 2),
-  [1939] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 5, .production_id = 2),
-  [1941] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleAliasBody, 3),
-  [1943] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleAliasBody, 3),
-  [1945] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 5, .production_id = 20),
-  [1947] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 5, .production_id = 20),
-  [1949] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 42),
-  [1951] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 42),
-  [1953] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 54),
-  [1955] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 54),
-  [1957] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 55),
-  [1959] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 55),
-  [1961] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 65),
-  [1963] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 65),
-  [1965] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 10, .production_id = 2),
-  [1967] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 10, .production_id = 2),
-  [1969] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 56),
-  [1971] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 56),
-  [1973] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 57),
-  [1975] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 57),
-  [1977] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 9, .production_id = 2),
-  [1979] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 9, .production_id = 2),
-  [1981] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotName, 1),
-  [1983] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 8, .production_id = 2),
-  [1985] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 8, .production_id = 2),
-  [1987] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 12, .production_id = 66),
-  [1989] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 12, .production_id = 66),
-  [1991] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 5, .production_id = 2),
-  [1993] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 5, .production_id = 2),
-  [1995] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeAliasBody, 3),
-  [1997] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeAliasBody, 3),
-  [1999] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 7, .production_id = 2),
-  [2001] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 7, .production_id = 2),
-  [2003] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_predicateAliasBody, 3),
-  [2005] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_predicateAliasBody, 3),
-  [2007] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 4, .production_id = 2),
-  [2009] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 4, .production_id = 2),
-  [2011] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 5, .production_id = 19),
-  [2013] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 5, .production_id = 19),
-  [2015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 11, .production_id = 65),
-  [2017] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 11, .production_id = 65),
-  [2019] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 11, .production_id = 66),
-  [2021] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 11, .production_id = 66),
-  [2023] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_empty, 1),
-  [2025] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_empty, 1),
-  [2027] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 5, .production_id = 7),
-  [2029] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 5, .production_id = 7),
-  [2031] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 11, .production_id = 57),
-  [2033] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 11, .production_id = 57),
-  [2035] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 34),
-  [2037] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 34),
-  [2039] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 57),
-  [2041] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 57),
-  [2043] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 56),
-  [2045] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 56),
-  [2047] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 11, .production_id = 56),
-  [2049] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 11, .production_id = 56),
-  [2051] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 4, .production_id = 2),
-  [2053] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 4, .production_id = 2),
-  [2055] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 6, .production_id = 23),
-  [2057] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 6, .production_id = 23),
-  [2059] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 6, .production_id = 15),
-  [2061] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 6, .production_id = 15),
-  [2063] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 6, .production_id = 26),
-  [2065] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 6, .production_id = 26),
-  [2067] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 43),
-  [2069] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 43),
-  [2071] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 33),
-  [2073] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 33),
-  [2075] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 55),
-  [2077] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 55),
-  [2079] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 32),
-  [2081] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 32),
-  [2083] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 54),
-  [2085] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 54),
-  [2087] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 42),
-  [2089] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 42),
-  [2091] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeUnionBody, 6),
-  [2093] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeUnionBody, 6),
-  [2095] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 10, .production_id = 54),
-  [2097] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 10, .production_id = 54),
-  [2099] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 10, .production_id = 55),
-  [2101] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 10, .production_id = 55),
-  [2103] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 10, .production_id = 65),
-  [2105] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 10, .production_id = 65),
-  [2107] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 6, .production_id = 2),
-  [2109] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 6, .production_id = 2),
-  [2111] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 8),
-  [2113] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 8),
-  [2115] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeUnionBody, 4),
-  [2117] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeUnionBody, 4),
-  [2119] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 19),
-  [2121] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 19),
-  [2123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 32),
-  [2125] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 32),
-  [2127] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 26),
-  [2129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 26),
-  [2131] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 20),
-  [2133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 20),
-  [2135] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 34),
-  [2137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 34),
-  [2139] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importDirective, 4),
-  [2141] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importDirective, 4),
-  [2143] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 23),
-  [2145] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 23),
-  [2147] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 33),
-  [2149] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 33),
-  [2151] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 43),
-  [2153] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 43),
-  [2155] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 3, .production_id = 7),
-  [2157] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 3, .production_id = 7),
-  [2159] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 6, .production_id = 7),
-  [2161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 6, .production_id = 7),
-  [2163] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 23),
-  [2165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 23),
-  [2167] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 34),
-  [2169] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 34),
-  [2171] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 15),
-  [2173] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 15),
-  [2175] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 33),
-  [2177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 33),
-  [2179] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 3, .production_id = 2),
-  [2181] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 3, .production_id = 2),
-  [2183] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 26),
-  [2185] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 26),
-  [2187] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 32),
-  [2189] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 32),
-  [2191] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 42),
-  [2193] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 42),
-  [2195] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 19),
-  [2197] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 19),
-  [2199] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeUnionBody, 5),
-  [2201] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeUnionBody, 5),
-  [2203] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 3, .production_id = 2),
-  [2205] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 3, .production_id = 2),
-  [2207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleMember, 2),
-  [2209] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleMember, 2),
-  [2211] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotation, 1, .production_id = 1),
-  [2213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1478),
-  [2215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 1, .production_id = 1),
-  [2217] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1423),
-  [2219] = {.entry = {.count = 1, .reusable = false}}, SHIFT(341),
-  [2221] = {.entry = {.count = 1, .reusable = false}}, SHIFT(102),
-  [2223] = {.entry = {.count = 1, .reusable = false}}, SHIFT(319),
-  [2225] = {.entry = {.count = 1, .reusable = false}}, SHIFT(69),
-  [2227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1459),
-  [2229] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotation, 4, .production_id = 13),
-  [2231] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 4, .production_id = 13),
-  [2233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1002),
-  [2235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(982),
-  [2237] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotation, 5, .production_id = 21),
-  [2239] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 5, .production_id = 21),
-  [2241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1011),
-  [2243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(967),
-  [2245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1466),
-  [2247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1465),
-  [2249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1028),
-  [2251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1026),
-  [2253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1293),
-  [2255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1292),
-  [2257] = {.entry = {.count = 1, .reusable = false}}, SHIFT(605),
-  [2259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(606),
-  [2261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(540),
-  [2263] = {.entry = {.count = 1, .reusable = false}}, SHIFT(789),
-  [2265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(790),
-  [2267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(708),
-  [2269] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1169),
-  [2271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1170),
-  [2273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(921),
-  [2275] = {.entry = {.count = 1, .reusable = false}}, SHIFT(652),
-  [2277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(607),
-  [2279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(480),
-  [2281] = {.entry = {.count = 1, .reusable = false}}, SHIFT(641),
-  [2283] = {.entry = {.count = 1, .reusable = true}}, SHIFT(640),
-  [2285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(496),
-  [2287] = {.entry = {.count = 1, .reusable = false}}, SHIFT(661),
-  [2289] = {.entry = {.count = 1, .reusable = true}}, SHIFT(630),
-  [2291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(558),
-  [2293] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1134),
-  [2295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1133),
-  [2297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(978),
-  [2299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1383),
-  [2301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_literalId, 1),
-  [2303] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classMember, 1),
-  [2305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classMember, 1),
-  [2307] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_charpred, 6, .production_id = 64),
-  [2309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_charpred, 6, .production_id = 64),
-  [2311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classMember, 2),
-  [2313] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classMember, 2),
-  [2315] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_memberPredicate, 6, .production_id = 7),
-  [2317] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_memberPredicate, 6, .production_id = 7),
-  [2319] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_memberPredicate, 5, .production_id = 7),
-  [2321] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_memberPredicate, 5, .production_id = 7),
-  [2323] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_field, 2),
-  [2325] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_field, 2),
-  [2327] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_memberPredicate, 7, .production_id = 7),
-  [2329] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_memberPredicate, 7, .production_id = 7),
-  [2331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1504),
-  [2333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1808),
-  [2335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1678),
-  [2337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1914),
-  [2339] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_predicateExpr, 3),
-  [2341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1314),
-  [2343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1497),
-  [2345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1476),
-  [2347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1491),
-  [2349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1600),
-  [2351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1254),
-  [2353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1713),
-  [2355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1250),
-  [2357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
-  [2359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1921),
-  [2361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(757),
-  [2363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1411),
-  [2365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1352),
-  [2367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1412),
-  [2369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1418),
-  [2371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [2373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [2375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(753),
-  [2377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1410),
-  [2379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1329),
-  [2381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1414),
-  [2383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1413),
-  [2385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [2387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [2389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [2391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [2393] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_signatureExpr, 1, .production_id = 5),
-  [2395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1423),
-  [2397] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1778),
-  [2399] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_classlessPredicate_repeat1, 2), SHIFT_REPEAT(1403),
-  [2402] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_classlessPredicate_repeat1, 2),
-  [2404] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_varDecl, 2),
-  [2406] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_signatureExpr, 1, .production_id = 6),
-  [2408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1222),
-  [2410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(675),
-  [2412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1501),
-  [2414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(691),
-  [2416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1505),
-  [2418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(700),
-  [2420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1941),
-  [2422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(699),
-  [2424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1212),
-  [2426] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1343),
-  [2428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(696),
-  [2430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(698),
-  [2432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(821),
-  [2434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(678),
-  [2436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1428),
-  [2438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(783),
-  [2440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1320),
-  [2442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1427),
-  [2444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1922),
-  [2446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(672),
-  [2448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(663),
-  [2450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1661),
-  [2452] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat1, 2), SHIFT_REPEAT(1428),
-  [2455] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat1, 2),
-  [2457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(846),
-  [2459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(800),
-  [2461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1245),
-  [2463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1430),
-  [2465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(664),
-  [2467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(686),
-  [2469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(676),
-  [2471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(773),
-  [2473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1299),
-  [2475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1431),
-  [2477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1204),
-  [2479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1378),
-  [2481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(683),
-  [2483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1791),
-  [2485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(812),
-  [2487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1298),
-  [2489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1419),
-  [2491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(669),
-  [2493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [2495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(807),
-  [2497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1342),
-  [2499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(751),
-  [2501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1345),
-  [2503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1403),
-  [2505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
-  [2507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(778),
-  [2509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1316),
-  [2511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(805),
-  [2513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(350),
-  [2515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(646),
-  [2517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
-  [2519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1333),
-  [2521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(682),
-  [2523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1252),
-  [2525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(666),
-  [2527] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat2, 2, .production_id = 27), SHIFT_REPEAT(1222),
-  [2530] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat2, 2, .production_id = 27),
-  [2532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [2534] = {.entry = {.count = 1, .reusable = true}}, SHIFT(782),
-  [2536] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1315),
-  [2538] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [2540] = {.entry = {.count = 1, .reusable = true}}, SHIFT(781),
-  [2542] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1363),
-  [2544] = {.entry = {.count = 1, .reusable = true}}, SHIFT(625),
-  [2546] = {.entry = {.count = 1, .reusable = true}}, SHIFT(328),
-  [2548] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1592),
-  [2550] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1415),
-  [2552] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1255),
-  [2554] = {.entry = {.count = 1, .reusable = true}}, SHIFT(690),
-  [2556] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1266),
-  [2558] = {.entry = {.count = 1, .reusable = true}}, SHIFT(687),
-  [2560] = {.entry = {.count = 1, .reusable = true}}, SHIFT(335),
-  [2562] = {.entry = {.count = 1, .reusable = true}}, SHIFT(801),
-  [2564] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1247),
-  [2566] = {.entry = {.count = 1, .reusable = true}}, SHIFT(334),
-  [2568] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [2570] = {.entry = {.count = 1, .reusable = true}}, SHIFT(793),
-  [2572] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1270),
-  [2574] = {.entry = {.count = 1, .reusable = true}}, SHIFT(797),
-  [2576] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1267),
-  [2578] = {.entry = {.count = 1, .reusable = true}}, SHIFT(755),
-  [2580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1387),
-  [2582] = {.entry = {.count = 1, .reusable = true}}, SHIFT(767),
-  [2584] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1226),
-  [2586] = {.entry = {.count = 1, .reusable = true}}, SHIFT(763),
-  [2588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1369),
-  [2590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
-  [2592] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aritylessPredicateExpr, 3, .production_id = 9),
-  [2594] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aritylessPredicateExpr, 3, .production_id = 9),
-  [2596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(628),
-  [2598] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
-  [2600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [2602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(613),
-  [2604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
-  [2606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(635),
-  [2608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
-  [2610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1409),
-  [2612] = {.entry = {.count = 1, .reusable = true}}, SHIFT(795),
-  [2614] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
-  [2616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [2618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [2620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
-  [2622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(634),
-  [2624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(358),
-  [2626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1157),
-  [2628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
-  [2630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1416),
-  [2632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(806),
-  [2634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1232),
-  [2636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(618),
-  [2638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
-  [2640] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(152),
-  [2643] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1426),
-  [2645] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1049),
-  [2647] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
-  [2649] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1406),
-  [2651] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1421),
-  [2653] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
-  [2655] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1071),
-  [2657] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
-  [2659] = {.entry = {.count = 1, .reusable = true}}, SHIFT(611),
-  [2661] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
-  [2663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1051),
-  [2665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
-  [2667] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1422),
-  [2669] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_predicateName, 1),
-  [2671] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aritylessPredicateExpr, 1, .production_id = 1),
-  [2673] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aritylessPredicateExpr, 1, .production_id = 1),
-  [2675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
-  [2677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1821),
-  [2679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1190),
-  [2681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1541),
-  [2683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1449),
-  [2685] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1399),
-  [2687] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [2689] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1986),
-  [2691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(453),
-  [2693] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
-  [2695] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1310),
-  [2697] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(161),
-  [2700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(473),
-  [2702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1311),
-  [2704] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1925),
-  [2706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1898),
-  [2708] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1871),
-  [2710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1849),
-  [2712] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1828),
-  [2714] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2), SHIFT_REPEAT(164),
-  [2717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1451),
-  [2719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1810),
-  [2721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1809),
-  [2723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1902),
-  [2725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1452),
-  [2727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1391),
-  [2729] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
-  [2731] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
-  [2733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(880),
-  [2735] = {.entry = {.count = 1, .reusable = true}}, SHIFT(892),
-  [2737] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
-  [2739] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
-  [2741] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
-  [2743] = {.entry = {.count = 1, .reusable = true}}, SHIFT(913),
-  [2745] = {.entry = {.count = 1, .reusable = true}}, SHIFT(907),
-  [2747] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
-  [2749] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [2751] = {.entry = {.count = 1, .reusable = true}}, SHIFT(521),
-  [2753] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1335),
-  [2755] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1798),
-  [2757] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1477),
-  [2759] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1392),
-  [2761] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
-  [2763] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1233),
-  [2765] = {.entry = {.count = 1, .reusable = true}}, SHIFT(938),
-  [2767] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1236),
-  [2769] = {.entry = {.count = 1, .reusable = true}}, SHIFT(430),
-  [2771] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat1, 2), SHIFT_REPEAT(1451),
-  [2774] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat1, 2),
-  [2776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(896),
-  [2778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(958),
-  [2780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [2782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(882),
-  [2784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1899),
-  [2786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
-  [2788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(914),
-  [2790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
-  [2792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(972),
-  [2794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(723),
-  [2796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
-  [2798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1273),
-  [2800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1432),
-  [2802] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 6, .production_id = 63),
-  [2804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1993),
-  [2806] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr_aggregate_body, 1, .production_id = 12),
-  [2808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(953),
-  [2810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [2812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [2814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1747),
-  [2816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1456),
-  [2818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1395),
-  [2820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1529),
-  [2822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(949),
-  [2824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
-  [2826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1886),
-  [2828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(461),
-  [2830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(470),
-  [2832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [2834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(993),
-  [2836] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_typeUnionBody_repeat1, 2),
-  [2838] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_typeUnionBody_repeat1, 2), SHIFT_REPEAT(1432),
-  [2841] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [2843] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
-  [2845] = {.entry = {.count = 1, .reusable = true}}, SHIFT(998),
-  [2847] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1471),
-  [2849] = {.entry = {.count = 1, .reusable = true}}, SHIFT(543),
-  [2851] = {.entry = {.count = 1, .reusable = true}}, SHIFT(570),
-  [2853] = {.entry = {.count = 1, .reusable = true}}, SHIFT(709),
-  [2855] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 53),
-  [2857] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 52),
-  [2859] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [2861] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1948),
-  [2863] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
-  [2865] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [2867] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1351),
-  [2869] = {.entry = {.count = 1, .reusable = true}}, SHIFT(579),
-  [2871] = {.entry = {.count = 1, .reusable = true}}, SHIFT(734),
-  [2873] = {.entry = {.count = 1, .reusable = true}}, SHIFT(983),
-  [2875] = {.entry = {.count = 1, .reusable = true}}, SHIFT(986),
-  [2877] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_moduleInstantiation_repeat1, 2), SHIFT_REPEAT(1335),
-  [2880] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_moduleInstantiation_repeat1, 2),
-  [2882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(988),
-  [2884] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1457),
-  [2886] = {.entry = {.count = 1, .reusable = true}}, SHIFT(508),
-  [2888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1384),
-  [2890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(592),
-  [2892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1453),
-  [2894] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_annotation_repeat1, 2), SHIFT_REPEAT(1477),
-  [2897] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_annotation_repeat1, 2),
-  [2899] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1454),
-  [2901] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, .production_id = 24), SHIFT_REPEAT(1190),
-  [2904] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, .production_id = 24),
-  [2906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat2, 2, .production_id = 25),
-  [2908] = {.entry = {.count = 1, .reusable = true}}, SHIFT(530),
-  [2910] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 41),
-  [2912] = {.entry = {.count = 1, .reusable = true}}, SHIFT(566),
-  [2914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1013),
-  [2916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [2918] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 40),
-  [2920] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat2, 2), SHIFT_REPEAT(106),
-  [2923] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat2, 2),
-  [2925] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 3, .production_id = 31),
-  [2927] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1530),
-  [2929] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [2931] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1358),
-  [2933] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
-  [2935] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1542),
-  [2937] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2), SHIFT_REPEAT(285),
-  [2940] = {.entry = {.count = 1, .reusable = true}}, SHIFT(519),
-  [2942] = {.entry = {.count = 1, .reusable = true}}, SHIFT(740),
-  [2944] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1023),
-  [2946] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1468),
-  [2948] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1021),
-  [2950] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleInstantiation, 5),
-  [2952] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggId, 1),
-  [2954] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
-  [2956] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [2958] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
-  [2960] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
-  [2962] = {.entry = {.count = 1, .reusable = true}}, SHIFT(320),
-  [2964] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
-  [2966] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
-  [2968] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
-  [2970] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1281),
-  [2972] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1538),
-  [2974] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
-  [2976] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
-  [2978] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotArg, 1),
-  [2980] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleExpr, 3, .production_id = 8),
-  [2982] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1225),
-  [2984] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [2986] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
-  [2988] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, .production_id = 22),
-  [2990] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [2992] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
-  [2994] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1241),
-  [2996] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1402),
-  [2998] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleParam, 2, .production_id = 14),
-  [3000] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1377),
-  [3002] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1404),
-  [3004] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
-  [3006] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [3008] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338),
-  [3010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [3012] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
-  [3014] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleInstantiation, 4),
-  [3016] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [3018] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
-  [3020] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
-  [3022] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [3024] = {.entry = {.count = 1, .reusable = true}}, SHIFT(923),
-  [3026] = {.entry = {.count = 1, .reusable = true}}, SHIFT(594),
-  [3028] = {.entry = {.count = 1, .reusable = true}}, SHIFT(507),
-  [3030] = {.entry = {.count = 1, .reusable = true}}, SHIFT(533),
-  [3032] = {.entry = {.count = 1, .reusable = true}}, SHIFT(506),
-  [3034] = {.entry = {.count = 1, .reusable = true}}, SHIFT(505),
-  [3036] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [3038] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [3040] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [3042] = {.entry = {.count = 1, .reusable = true}}, SHIFT(583),
-  [3044] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1949),
-  [3046] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [3048] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1846),
-  [3050] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
-  [3052] = {.entry = {.count = 1, .reusable = true}}, SHIFT(733),
-  [3054] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
-  [3056] = {.entry = {.count = 1, .reusable = true}}, SHIFT(729),
-  [3058] = {.entry = {.count = 1, .reusable = true}}, SHIFT(576),
-  [3060] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [3062] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1950),
-  [3064] = {.entry = {.count = 1, .reusable = true}}, SHIFT(501),
-  [3066] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1398),
-  [3068] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 50),
-  [3070] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [3072] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr_aggregate_body, 2, .production_id = 18),
-  [3074] = {.entry = {.count = 1, .reusable = true}}, SHIFT(542),
-  [3076] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [3078] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 51),
-  [3080] = {.entry = {.count = 1, .reusable = true}}, SHIFT(571),
-  [3082] = {.entry = {.count = 1, .reusable = true}}, SHIFT(355),
-  [3084] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [3086] = {.entry = {.count = 1, .reusable = true}}, SHIFT(713),
-  [3088] = {.entry = {.count = 1, .reusable = true}}, SHIFT(728),
-  [3090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1861),
-  [3092] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [3094] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1500),
-  [3096] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1396),
-  [3098] = {.entry = {.count = 1, .reusable = true}}, SHIFT(459),
-  [3100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(748),
-  [3102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [3104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(515),
-  [3106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [3108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(552),
-  [3110] = {.entry = {.count = 1, .reusable = true}}, SHIFT(654),
-  [3112] = {.entry = {.count = 1, .reusable = true}}, SHIFT(477),
-  [3114] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [3116] = {.entry = {.count = 1, .reusable = true}}, SHIFT(517),
-  [3118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1249),
-  [3120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1518),
-  [3122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(710),
-  [3124] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1447),
-  [3126] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1858),
-  [3128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
-  [3130] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1910),
-  [3132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(631),
-  [3134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(599),
-  [3136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 6, .production_id = 61),
-  [3138] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
-  [3140] = {.entry = {.count = 1, .reusable = true}}, SHIFT(537),
-  [3142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 6, .production_id = 62),
-  [3144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
-  [3146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1510),
-  [3148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1439),
-  [3150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(976),
-  [3152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(975),
-  [3154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
-  [3156] = {.entry = {.count = 1, .reusable = true}}, SHIFT(719),
-  [3158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(974),
-  [3160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(973),
-  [3162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1483),
-  [3164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1831),
-  [3166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(919),
-  [3168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1947),
-  [3170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [3172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1938),
-  [3174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1913),
-  [3176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(917),
-  [3178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(916),
-  [3180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(915),
-  [3182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [3184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(969),
-  [3186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [3188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1394),
-  [3190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(962),
-  [3192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [3194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(595),
-  [3196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1243),
-  [3198] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 7, .production_id = 69),
-  [3200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [3202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [3204] = {.entry = {.count = 1, .reusable = true}}, SHIFT(944),
-  [3206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
-  [3208] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1401),
-  [3210] = {.entry = {.count = 1, .reusable = true}}, SHIFT(910),
-  [3212] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1847),
-  [3214] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [3216] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1843),
-  [3218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1393),
-  [3220] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1854),
-  [3222] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447),
-  [3224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(909),
-  [3226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(564),
-  [3228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(499),
-  [3230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [3232] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
-  [3234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [3236] = {.entry = {.count = 1, .reusable = true}}, SHIFT(918),
-  [3238] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438),
-  [3240] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [3242] = {.entry = {.count = 1, .reusable = true}}, SHIFT(522),
-  [3244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_closure, 1),
-  [3246] = {.entry = {.count = 1, .reusable = true}}, SHIFT(738),
-  [3248] = {.entry = {.count = 1, .reusable = true}}, SHIFT(528),
-  [3250] = {.entry = {.count = 1, .reusable = true}}, SHIFT(561),
-  [3252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [3254] = {.entry = {.count = 1, .reusable = true}}, SHIFT(534),
-  [3256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(758),
-  [3258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(727),
-  [3260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(899),
-  [3262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
-  [3264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(560),
-  [3266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(889),
-  [3268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [3270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(881),
-  [3272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(894),
-  [3274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(559),
-  [3276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1508),
-  [3278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(965),
-  [3280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1397),
-  [3282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 39),
-  [3284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327),
-  [3286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1111),
-  [3288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [3290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1132),
-  [3292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
-  [3294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
-  [3296] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
-  [3298] = {.entry = {.count = 1, .reusable = true}}, SHIFT(513),
-  [3300] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
-  [3302] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1515),
-  [3304] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1475),
-  [3306] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1775),
-  [3308] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
-  [3310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(479),
-  [3312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1509),
-  [3314] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [3316] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
-  [3318] = {.entry = {.count = 1, .reusable = true}}, SHIFT(655),
-  [3320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(749),
-  [3322] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantifier, 1),
-  [3324] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
-  [3326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(476),
-  [3328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1928),
-  [3330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(475),
-  [3332] = {.entry = {.count = 1, .reusable = true}}, SHIFT(474),
-  [3334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1944),
-  [3336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1445),
-  [3338] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1450),
-  [3340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1951),
-  [3342] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
-  [3344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(449),
-  [3346] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1955),
-  [3348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(526),
-  [3350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1513),
-  [3352] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1959),
-  [3354] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [3356] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1400),
-  [3358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1963),
-  [3360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1446),
-  [3362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1967),
-  [3364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1486),
-  [3366] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
-  [3368] = {.entry = {.count = 1, .reusable = true}}, SHIFT(426),
-  [3370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1448),
-  [3372] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
-  [3374] = {.entry = {.count = 1, .reusable = true}}, SHIFT(514),
-  [3376] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1964),
-  [3378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [3380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1753),
-  [3382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1752),
-  [3384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1751),
-  [3386] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1750),
-  [3388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1749),
-  [3390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1748),
+  [1131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1344),
+  [1133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1438),
+  [1135] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1763),
+  [1137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1373),
+  [1139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1326),
+  [1141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1348),
+  [1143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1355),
+  [1145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1361),
+  [1147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1238),
+  [1149] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1572),
+  [1151] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1186),
+  [1154] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2),
+  [1156] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1438),
+  [1159] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1435),
+  [1162] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1442),
+  [1165] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1444),
+  [1168] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_dataclass_repeat2, 2), SHIFT_REPEAT(1763),
+  [1171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1333),
+  [1173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1234),
+  [1175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1375),
+  [1177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1384),
+  [1179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1258),
+  [1181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1262),
+  [1183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1264),
+  [1185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1363),
+  [1187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1359),
+  [1189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1309),
+  [1191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1346),
+  [1193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1337),
+  [1195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1387),
+  [1197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1335),
+  [1199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1312),
+  [1201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1308),
+  [1203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1304),
+  [1205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1292),
+  [1207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1290),
+  [1209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1287),
+  [1211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1276),
+  [1213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1327),
+  [1215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1275),
+  [1217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1273),
+  [1219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1310),
+  [1221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1351),
+  [1223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1268),
+  [1225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1385),
+  [1227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1243),
+  [1229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1413),
+  [1231] = {.entry = {.count = 1, .reusable = false}}, SHIFT(359),
+  [1233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
+  [1235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
+  [1237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
+  [1239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [1241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1415),
+  [1243] = {.entry = {.count = 1, .reusable = false}}, SHIFT(362),
+  [1245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
+  [1247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
+  [1249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1790),
+  [1251] = {.entry = {.count = 1, .reusable = false}}, SHIFT(366),
+  [1253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
+  [1255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(550),
+  [1257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
+  [1259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1416),
+  [1261] = {.entry = {.count = 1, .reusable = false}}, SHIFT(361),
+  [1263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
+  [1265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(922),
+  [1267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
+  [1269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1545),
+  [1271] = {.entry = {.count = 1, .reusable = false}}, SHIFT(345),
+  [1273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(349),
+  [1275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
+  [1277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
+  [1279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(319),
+  [1281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(320),
+  [1283] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
+  [1285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(712),
+  [1287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
+  [1289] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
+  [1291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
+  [1293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
+  [1295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
+  [1297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(946),
+  [1299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
+  [1301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
+  [1303] = {.entry = {.count = 1, .reusable = true}}, SHIFT(509),
+  [1305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
+  [1307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [1309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(511),
+  [1311] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
+  [1313] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualModuleExpr, 1, .production_id = 1),
+  [1315] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualModuleExpr, 1, .production_id = 1),
+  [1317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1602),
+  [1319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
+  [1321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1920),
+  [1323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_qualModuleExpr, 2, .production_id = 4),
+  [1325] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_qualModuleExpr, 2, .production_id = 4),
+  [1327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1813),
+  [1329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1834),
+  [1331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1845),
+  [1333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1885),
+  [1335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1866),
+  [1337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1598),
+  [1339] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10),
+  [1341] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10),
+  [1343] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1598),
+  [1346] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1602),
+  [1349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1893),
+  [1351] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 7, .production_id = 8),
+  [1353] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 7, .production_id = 8),
+  [1355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
+  [1357] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_asExprs_repeat1, 2),
+  [1359] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(164),
+  [1362] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2),
+  [1364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1561),
+  [1366] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExprs, 1),
+  [1368] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExprs, 1),
+  [1370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
+  [1372] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 5, .production_id = 2),
+  [1374] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 5, .production_id = 2),
+  [1376] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 3, .production_id = 30),
+  [1378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
+  [1380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(616),
+  [1382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
+  [1384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(601),
+  [1386] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
+  [1388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(728),
+  [1390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [1392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(586),
+  [1394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [1396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1569),
+  [1398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(607),
+  [1400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
+  [1402] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExprs, 2),
+  [1404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [1406] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExprs, 2),
+  [1408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(552),
+  [1410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
+  [1412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
+  [1414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
+  [1416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(803),
+  [1418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
+  [1420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(787),
+  [1422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
+  [1424] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 5, .production_id = 8),
+  [1426] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 5, .production_id = 8),
+  [1428] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importModuleExpr, 1),
+  [1430] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importModuleExpr, 1),
+  [1432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1736),
+  [1434] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 38),
+  [1436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [1438] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 4, .production_id = 2),
+  [1440] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 4, .production_id = 2),
+  [1442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(493),
+  [1444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
+  [1446] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 2, .production_id = 17),
+  [1448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
+  [1450] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importModuleExpr, 2, .production_id = 3),
+  [1452] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importModuleExpr, 2, .production_id = 3),
+  [1454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(726),
+  [1456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
+  [1458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(790),
+  [1460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(348),
+  [1462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1056),
+  [1464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
+  [1466] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2),
+  [1468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
+  [1470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1745),
+  [1472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(652),
+  [1474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
+  [1476] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10),
+  [1478] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10),
+  [1480] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1736),
+  [1483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(484),
+  [1485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [1487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(905),
+  [1489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
+  [1491] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__call_arg, 1),
+  [1493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(647),
+  [1495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(228),
+  [1497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1106),
+  [1499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
+  [1501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(938),
+  [1503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
+  [1505] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 2),
+  [1507] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_qualModuleExpr_repeat1, 2, .production_id = 2),
+  [1509] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 6, .production_id = 2),
+  [1511] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 6, .production_id = 2),
+  [1513] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 4, .production_id = 1),
+  [1515] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 4, .production_id = 1),
+  [1517] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 6, .production_id = 8),
+  [1519] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 6, .production_id = 8),
+  [1521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(640),
+  [1523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
+  [1525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(476),
+  [1527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
+  [1529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(515),
+  [1531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
+  [1533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(610),
+  [1535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
+  [1537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(645),
+  [1539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
+  [1541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1159),
+  [1543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [1545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(569),
+  [1547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
+  [1549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(952),
+  [1551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
+  [1553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(639),
+  [1555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
+  [1557] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 5, .production_id = 1),
+  [1559] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 5, .production_id = 1),
+  [1561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(525),
+  [1563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [1565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(746),
+  [1567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [1569] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 3, .production_id = 1),
+  [1571] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 3, .production_id = 1),
+  [1573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(597),
+  [1575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
+  [1577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(613),
+  [1579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(346),
+  [1581] = {.entry = {.count = 1, .reusable = true}}, SHIFT(557),
+  [1583] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
+  [1585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(622),
+  [1587] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
+  [1589] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1091),
+  [1591] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
+  [1593] = {.entry = {.count = 1, .reusable = true}}, SHIFT(546),
+  [1595] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
+  [1597] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(153),
+  [1600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(900),
+  [1602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [1604] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 10), SHIFT_REPEAT(1745),
+  [1607] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1104),
+  [1609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
+  [1611] = {.entry = {.count = 1, .reusable = true}}, SHIFT(920),
+  [1613] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [1615] = {.entry = {.count = 1, .reusable = true}}, SHIFT(634),
+  [1617] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
+  [1619] = {.entry = {.count = 1, .reusable = true}}, SHIFT(909),
+  [1621] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [1623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1120),
+  [1625] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
+  [1627] = {.entry = {.count = 1, .reusable = true}}, SHIFT(513),
+  [1629] = {.entry = {.count = 1, .reusable = true}}, SHIFT(609),
+  [1631] = {.entry = {.count = 1, .reusable = true}}, SHIFT(642),
+  [1633] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1113),
+  [1635] = {.entry = {.count = 1, .reusable = true}}, SHIFT(538),
+  [1637] = {.entry = {.count = 1, .reusable = true}}, SHIFT(724),
+  [1639] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
+  [1641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
+  [1643] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 7),
+  [1645] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 7),
+  [1647] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1828),
+  [1649] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 2),
+  [1651] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_importModuleExpr_repeat1, 2, .production_id = 2),
+  [1653] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1131),
+  [1655] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1135),
+  [1657] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
+  [1659] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_asExpr, 3),
+  [1661] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_asExpr, 3),
+  [1663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(437),
+  [1665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(506),
+  [1667] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
+  [1669] = {.entry = {.count = 1, .reusable = true}}, SHIFT(894),
+  [1671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327),
+  [1673] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1066),
+  [1675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(614),
+  [1677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(582),
+  [1679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(187),
+  [1681] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1477),
+  [1683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1431),
+  [1685] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2),
+  [1687] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2),
+  [1689] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2), SHIFT_REPEAT(1465),
+  [1692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1439),
+  [1694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(603),
+  [1696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(604),
+  [1698] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_datatypeBranches_repeat1, 2), SHIFT_REPEAT(1453),
+  [1701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [1703] = {.entry = {.count = 1, .reusable = true}}, SHIFT(949),
+  [1705] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBys, 4),
+  [1707] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBys, 4),
+  [1709] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
+  [1711] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
+  [1713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [1715] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBys, 3),
+  [1717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
+  [1719] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBys, 3),
+  [1721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
+  [1723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(648),
+  [1725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [1727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [1729] = {.entry = {.count = 1, .reusable = true}}, SHIFT(653),
+  [1731] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1163),
+  [1733] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 5),
+  [1735] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 5),
+  [1737] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranches, 2),
+  [1739] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranches, 2),
+  [1741] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1453),
+  [1743] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 6),
+  [1745] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 6),
+  [1747] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1824),
+  [1749] = {.entry = {.count = 1, .reusable = true}}, SHIFT(531),
+  [1751] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1172),
+  [1753] = {.entry = {.count = 1, .reusable = true}}, SHIFT(638),
+  [1755] = {.entry = {.count = 1, .reusable = true}}, SHIFT(917),
+  [1757] = {.entry = {.count = 1, .reusable = true}}, SHIFT(625),
+  [1759] = {.entry = {.count = 1, .reusable = true}}, SHIFT(945),
+  [1761] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1223),
+  [1763] = {.entry = {.count = 1, .reusable = true}}, SHIFT(795),
+  [1765] = {.entry = {.count = 1, .reusable = true}}, SHIFT(347),
+  [1767] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469),
+  [1769] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_orderBys_repeat1, 2),
+  [1771] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2), SHIFT_REPEAT(158),
+  [1774] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2),
+  [1776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1153),
+  [1778] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranches, 1),
+  [1780] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranches, 1),
+  [1782] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1465),
+  [1784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1190),
+  [1786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
+  [1788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
+  [1790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
+  [1792] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 4),
+  [1794] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 4),
+  [1796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(711),
+  [1798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(636),
+  [1800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
+  [1802] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 3),
+  [1804] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 3),
+  [1806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(650),
+  [1808] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 2),
+  [1810] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 2),
+  [1812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(344),
+  [1814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(615),
+  [1816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [1818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(773),
+  [1820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(490),
+  [1822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(886),
+  [1824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [1826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
+  [1828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(654),
+  [1830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1090),
+  [1832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(662),
+  [1834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(547),
+  [1836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(579),
+  [1838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(927),
+  [1840] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2), SHIFT_REPEAT(150),
+  [1843] = {.entry = {.count = 1, .reusable = true}}, SHIFT(794),
+  [1845] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
+  [1847] = {.entry = {.count = 1, .reusable = true}}, SHIFT(658),
+  [1849] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
+  [1851] = {.entry = {.count = 1, .reusable = true}}, SHIFT(620),
+  [1853] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
+  [1855] = {.entry = {.count = 1, .reusable = true}}, SHIFT(809),
+  [1857] = {.entry = {.count = 1, .reusable = true}}, SHIFT(800),
+  [1859] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
+  [1861] = {.entry = {.count = 1, .reusable = true}}, SHIFT(322),
+  [1863] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 7, .production_id = 2),
+  [1865] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 7, .production_id = 2),
+  [1867] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotName, 1),
+  [1869] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 8, .production_id = 8),
+  [1871] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 8, .production_id = 8),
+  [1873] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatypeBranch, 6, .production_id = 1),
+  [1875] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatypeBranch, 6, .production_id = 1),
+  [1877] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_body, 3),
+  [1879] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_body, 3),
+  [1881] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_direction, 1),
+  [1883] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_direction, 1),
+  [1885] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_moduleMember_repeat1, 2), SHIFT_REPEAT(1365),
+  [1888] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_moduleMember_repeat1, 2),
+  [1890] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_moduleMember_repeat1, 2),
+  [1892] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importDirective, 2),
+  [1894] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importDirective, 2),
+  [1896] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1536),
+  [1898] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1537),
+  [1900] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_orderBy, 2),
+  [1902] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_orderBy, 2),
+  [1904] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 15),
+  [1906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 15),
+  [1908] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeUnionBody, 5),
+  [1910] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeUnionBody, 5),
+  [1912] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1432),
+  [1914] = {.entry = {.count = 1, .reusable = false}}, SHIFT(278),
+  [1916] = {.entry = {.count = 1, .reusable = false}}, SHIFT(121),
+  [1918] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleMember, 1),
+  [1920] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleMember, 1),
+  [1922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 11, .production_id = 56),
+  [1924] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 11, .production_id = 56),
+  [1926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 11, .production_id = 57),
+  [1928] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 11, .production_id = 57),
+  [1930] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 11, .production_id = 66),
+  [1932] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 11, .production_id = 66),
+  [1934] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 11, .production_id = 65),
+  [1936] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 11, .production_id = 65),
+  [1938] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 7, .production_id = 5),
+  [1940] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 7, .production_id = 5),
+  [1942] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeUnionBody, 4),
+  [1944] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeUnionBody, 4),
+  [1946] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 19),
+  [1948] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 19),
+  [1950] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select, 8),
+  [1952] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_select, 8),
+  [1954] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 7, .production_id = 2),
+  [1956] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 7, .production_id = 2),
+  [1958] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 32),
+  [1960] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 32),
+  [1962] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleName, 1),
+  [1964] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleName, 1),
+  [1966] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 5, .production_id = 2),
+  [1968] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 5, .production_id = 2),
+  [1970] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 10, .production_id = 2),
+  [1972] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 10, .production_id = 2),
+  [1974] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 12, .production_id = 66),
+  [1976] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 12, .production_id = 66),
+  [1978] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 8, .production_id = 2),
+  [1980] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 8, .production_id = 2),
+  [1982] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 9, .production_id = 2),
+  [1984] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 9, .production_id = 2),
+  [1986] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 26),
+  [1988] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 26),
+  [1990] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_empty, 1),
+  [1992] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_empty, 1),
+  [1994] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_higherOrderTerm, 6, .production_id = 2),
+  [1996] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_higherOrderTerm, 6, .production_id = 2),
+  [1998] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 34),
+  [2000] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 34),
+  [2002] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 10, .production_id = 65),
+  [2004] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 10, .production_id = 65),
+  [2006] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleMember, 2),
+  [2008] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleMember, 2),
+  [2010] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 3, .production_id = 2),
+  [2012] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 3, .production_id = 2),
+  [2014] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 10, .production_id = 55),
+  [2016] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 10, .production_id = 55),
+  [2018] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeAliasBody, 3),
+  [2020] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeAliasBody, 3),
+  [2022] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 10, .production_id = 54),
+  [2024] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 10, .production_id = 54),
+  [2026] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 26),
+  [2028] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 26),
+  [2030] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 34),
+  [2032] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 34),
+  [2034] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 7, .production_id = 23),
+  [2036] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 7, .production_id = 23),
+  [2038] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 66),
+  [2040] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 66),
+  [2042] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 57),
+  [2044] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 57),
+  [2046] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_predicateAliasBody, 3),
+  [2048] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_predicateAliasBody, 3),
+  [2050] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 34),
+  [2052] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 34),
+  [2054] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 56),
+  [2056] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 56),
+  [2058] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 10, .production_id = 43),
+  [2060] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 10, .production_id = 43),
+  [2062] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 65),
+  [2064] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 65),
+  [2066] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 55),
+  [2068] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 55),
+  [2070] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 54),
+  [2072] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 54),
+  [2074] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 3, .production_id = 2),
+  [2076] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 3, .production_id = 2),
+  [2078] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 9, .production_id = 42),
+  [2080] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 9, .production_id = 42),
+  [2082] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 3, .production_id = 5),
+  [2084] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 3, .production_id = 5),
+  [2086] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 4, .production_id = 2),
+  [2088] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 4, .production_id = 2),
+  [2090] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 57),
+  [2092] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 57),
+  [2094] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_importDirective, 4),
+  [2096] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_importDirective, 4),
+  [2098] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 56),
+  [2100] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 56),
+  [2102] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 9, .production_id = 43),
+  [2104] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 9, .production_id = 43),
+  [2106] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 5, .production_id = 20),
+  [2108] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 5, .production_id = 20),
+  [2110] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 33),
+  [2112] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 33),
+  [2114] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 55),
+  [2116] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 55),
+  [2118] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_datatype, 4, .production_id = 2),
+  [2120] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_datatype, 4, .production_id = 2),
+  [2122] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 32),
+  [2124] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 32),
+  [2126] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 20),
+  [2128] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 20),
+  [2130] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 54),
+  [2132] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 54),
+  [2134] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 8, .production_id = 42),
+  [2136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 8, .production_id = 42),
+  [2138] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typeUnionBody, 6),
+  [2140] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typeUnionBody, 6),
+  [2142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 5, .production_id = 19),
+  [2144] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 5, .production_id = 19),
+  [2146] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_moduleAliasBody, 3),
+  [2148] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleAliasBody, 3),
+  [2150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 23),
+  [2152] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 23),
+  [2154] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 6, .production_id = 26),
+  [2156] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 6, .production_id = 26),
+  [2158] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 42),
+  [2160] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 42),
+  [2162] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 4, .production_id = 2),
+  [2164] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 4, .production_id = 2),
+  [2166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 6, .production_id = 5),
+  [2168] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 6, .production_id = 5),
+  [2170] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 8, .production_id = 43),
+  [2172] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 8, .production_id = 43),
+  [2174] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 32),
+  [2176] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 32),
+  [2178] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 6, .production_id = 15),
+  [2180] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 6, .production_id = 15),
+  [2182] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 33),
+  [2184] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 33),
+  [2186] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 6, .production_id = 23),
+  [2188] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 6, .production_id = 23),
+  [2190] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 20),
+  [2192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 20),
+  [2194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 5, .production_id = 2),
+  [2196] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 5, .production_id = 2),
+  [2198] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 7, .production_id = 19),
+  [2200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 7, .production_id = 19),
+  [2202] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dataclass, 6, .production_id = 33),
+  [2204] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dataclass, 6, .production_id = 33),
+  [2206] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 5, .production_id = 15),
+  [2208] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 5, .production_id = 15),
+  [2210] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classlessPredicate, 5, .production_id = 5),
+  [2212] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classlessPredicate, 5, .production_id = 5),
+  [2214] = {.entry = {.count = 1, .reusable = false}}, SHIFT(340),
+  [2216] = {.entry = {.count = 1, .reusable = false}}, SHIFT(110),
+  [2218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1029),
+  [2220] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1466),
+  [2222] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1034),
+  [2224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1462),
+  [2226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1019),
+  [2228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(978),
+  [2230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1020),
+  [2232] = {.entry = {.count = 1, .reusable = true}}, SHIFT(973),
+  [2234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1461),
+  [2236] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotation, 1, .production_id = 1),
+  [2238] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1488),
+  [2240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 1, .production_id = 1),
+  [2242] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotation, 5, .production_id = 21),
+  [2244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 5, .production_id = 21),
+  [2246] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1282),
+  [2248] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_annotation, 4, .production_id = 13),
+  [2250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 4, .production_id = 13),
+  [2252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1237),
+  [2254] = {.entry = {.count = 1, .reusable = false}}, SHIFT(644),
+  [2256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(637),
+  [2258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(512),
+  [2260] = {.entry = {.count = 1, .reusable = false}}, SHIFT(661),
+  [2262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(657),
+  [2264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(588),
+  [2266] = {.entry = {.count = 1, .reusable = false}}, SHIFT(801),
+  [2268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(793),
+  [2270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(722),
+  [2272] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1156),
+  [2274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1154),
+  [2276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(979),
+  [2278] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1170),
+  [2280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1171),
+  [2282] = {.entry = {.count = 1, .reusable = true}}, SHIFT(929),
+  [2284] = {.entry = {.count = 1, .reusable = false}}, SHIFT(612),
+  [2286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(611),
+  [2288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465),
+  [2290] = {.entry = {.count = 1, .reusable = false}}, SHIFT(602),
+  [2292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(624),
+  [2294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
+  [2296] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_literalId, 1),
+  [2298] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_memberPredicate, 5, .production_id = 5),
+  [2300] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_memberPredicate, 5, .production_id = 5),
+  [2302] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_field, 2),
+  [2304] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_field, 2),
+  [2306] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classMember, 2),
+  [2308] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classMember, 2),
+  [2310] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_classMember, 1),
+  [2312] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_classMember, 1),
+  [2314] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_charpred, 6, .production_id = 64),
+  [2316] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_charpred, 6, .production_id = 64),
+  [2318] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_memberPredicate, 7, .production_id = 5),
+  [2320] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_memberPredicate, 7, .production_id = 5),
+  [2322] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_memberPredicate, 6, .production_id = 5),
+  [2324] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_memberPredicate, 6, .production_id = 5),
+  [2326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1477),
+  [2328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1807),
+  [2330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1821),
+  [2332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_predicateExpr, 3),
+  [2334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1365),
+  [2336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1511),
+  [2338] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1486),
+  [2340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1510),
+  [2342] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1608),
+  [2344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1254),
+  [2346] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [2348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1831),
+  [2350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [2352] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [2354] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [2356] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [2358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1679),
+  [2360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1379),
+  [2362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(752),
+  [2364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1430),
+  [2366] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1291),
+  [2368] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1425),
+  [2370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1424),
+  [2372] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [2374] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [2376] = {.entry = {.count = 1, .reusable = true}}, SHIFT(710),
+  [2378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1423),
+  [2380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1314),
+  [2382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1428),
+  [2384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1429),
+  [2386] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_classlessPredicate_repeat1, 2), SHIFT_REPEAT(1403),
+  [2389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_classlessPredicate_repeat1, 2),
+  [2391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1432),
+  [2393] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1777),
+  [2395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_signatureExpr, 1, .production_id = 7),
+  [2397] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_signatureExpr, 1, .production_id = 6),
+  [2399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_varDecl, 2),
+  [2401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1193),
+  [2403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(669),
+  [2405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1479),
+  [2407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(674),
+  [2409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1480),
+  [2411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1421),
+  [2413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(706),
+  [2415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1369),
+  [2417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1426),
+  [2419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(689),
+  [2421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1756),
+  [2423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(826),
+  [2425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(759),
+  [2427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1378),
+  [2429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1420),
+  [2431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(691),
+  [2433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(822),
+  [2435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(673),
+  [2437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(716),
+  [2439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1317),
+  [2441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1407),
+  [2443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(679),
+  [2445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(683),
+  [2447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(736),
+  [2449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1241),
+  [2451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1419),
+  [2453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1069),
+  [2455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1216),
+  [2457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(701),
+  [2459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1870),
+  [2461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1833),
+  [2463] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat1, 2), SHIFT_REPEAT(1421),
+  [2466] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dataclass_repeat1, 2),
+  [2468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(666),
+  [2470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(695),
+  [2472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(692),
+  [2474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(670),
+  [2476] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1144),
+  [2478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1210),
+  [2480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(688),
+  [2482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(677),
+  [2484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1403),
+  [2486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339),
+  [2488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(760),
+  [2490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1303),
+  [2492] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1559),
+  [2494] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1409),
+  [2496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [2498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(646),
+  [2500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(225),
+  [2502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(350),
+  [2504] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1405),
+  [2506] = {.entry = {.count = 1, .reusable = true}}, SHIFT(635),
+  [2508] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
+  [2510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(599),
+  [2512] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
+  [2514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
+  [2516] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat2, 2, .production_id = 27), SHIFT_REPEAT(1193),
+  [2519] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat2, 2, .production_id = 27),
+  [2521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
+  [2523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(714),
+  [2525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1347),
+  [2527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(782),
+  [2529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1389),
+  [2531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1055),
+  [2533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
+  [2535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1427),
+  [2537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1215),
+  [2539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(685),
+  [2541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(778),
+  [2543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1386),
+  [2545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1204),
+  [2547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(687),
+  [2549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(641),
+  [2551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
+  [2553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [2555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(649),
+  [2557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
+  [2559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(768),
+  [2561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1370),
+  [2563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(792),
+  [2565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(351),
+  [2567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1089),
+  [2569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
+  [2571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [2573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(796),
+  [2575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
+  [2577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(632),
+  [2579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
+  [2581] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_predicateName, 1),
+  [2583] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aritylessPredicateExpr, 3, .production_id = 9),
+  [2585] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aritylessPredicateExpr, 3, .production_id = 9),
+  [2587] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1418),
+  [2589] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1098),
+  [2591] = {.entry = {.count = 1, .reusable = true}}, SHIFT(207),
+  [2593] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1211),
+  [2595] = {.entry = {.count = 1, .reusable = true}}, SHIFT(680),
+  [2597] = {.entry = {.count = 1, .reusable = true}}, SHIFT(715),
+  [2599] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1341),
+  [2601] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1076),
+  [2603] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
+  [2605] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [2607] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1412),
+  [2609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1411),
+  [2611] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1406),
+  [2613] = {.entry = {.count = 1, .reusable = true}}, SHIFT(337),
+  [2615] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aritylessPredicateExpr, 1, .production_id = 1),
+  [2617] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aritylessPredicateExpr, 1, .production_id = 1),
+  [2619] = {.entry = {.count = 1, .reusable = true}}, SHIFT(754),
+  [2621] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1322),
+  [2623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(785),
+  [2625] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1325),
+  [2627] = {.entry = {.count = 1, .reusable = true}}, SHIFT(608),
+  [2629] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
+  [2631] = {.entry = {.count = 1, .reusable = true}}, SHIFT(781),
+  [2633] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1286),
+  [2635] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [2637] = {.entry = {.count = 1, .reusable = true}}, SHIFT(776),
+  [2639] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1306),
+  [2641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(775),
+  [2643] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1311),
+  [2645] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [2647] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [2649] = {.entry = {.count = 1, .reusable = true}}, SHIFT(631),
+  [2651] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
+  [2653] = {.entry = {.count = 1, .reusable = true}}, SHIFT(769),
+  [2655] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1345),
+  [2657] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1224),
+  [2659] = {.entry = {.count = 1, .reusable = true}}, SHIFT(696),
+  [2661] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(172),
+  [2664] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
+  [2666] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [2668] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
+  [2670] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1244),
+  [2672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(916),
+  [2674] = {.entry = {.count = 1, .reusable = true}}, SHIFT(587),
+  [2676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1010),
+  [2678] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
+  [2680] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [2682] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1474),
+  [2684] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1454),
+  [2686] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1921),
+  [2688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(577),
+  [2690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
+  [2692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
+  [2694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1448),
+  [2696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1877),
+  [2698] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
+  [2700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(516),
+  [2702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(765),
+  [2704] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 3, .production_id = 31),
+  [2706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1802),
+  [2708] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1468),
+  [2710] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat2, 2), SHIFT_REPEAT(125),
+  [2713] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat2, 2),
+  [2715] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1016),
+  [2717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1027),
+  [2719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1014),
+  [2721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(532),
+  [2723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1228),
+  [2725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1414),
+  [2727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
+  [2729] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1926),
+  [2731] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_asExprs_repeat1, 2), SHIFT_REPEAT(170),
+  [2734] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 6, .production_id = 63),
+  [2736] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1899),
+  [2738] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1000),
+  [2740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1872),
+  [2742] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
+  [2744] = {.entry = {.count = 1, .reusable = true}}, SHIFT(718),
+  [2746] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat2, 2, .production_id = 25),
+  [2748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(501),
+  [2750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1849),
+  [2752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(891),
+  [2754] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, .production_id = 24), SHIFT_REPEAT(1095),
+  [2757] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, .production_id = 24),
+  [2759] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1835),
+  [2761] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_orderBys_repeat1, 2), SHIFT_REPEAT(161),
+  [2764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(489),
+  [2766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1035),
+  [2768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1823),
+  [2770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(741),
+  [2772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(906),
+  [2774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1822),
+  [2776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1891),
+  [2778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1817),
+  [2780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [2782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1313),
+  [2784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(477),
+  [2786] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 52),
+  [2788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(877),
+  [2790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(942),
+  [2792] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 53),
+  [2794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1001),
+  [2796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(999),
+  [2798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(498),
+  [2800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(461),
+  [2802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(964),
+  [2804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [2806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [2808] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_moduleInstantiation_repeat1, 2), SHIFT_REPEAT(1217),
+  [2811] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_moduleInstantiation_repeat1, 2),
+  [2813] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
+  [2815] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1478),
+  [2817] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1402),
+  [2819] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_annotation_repeat1, 2), SHIFT_REPEAT(1478),
+  [2822] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_annotation_repeat1, 2),
+  [2824] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr_aggregate_body, 1, .production_id = 12),
+  [2826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
+  [2828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1470),
+  [2830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
+  [2832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
+  [2834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(456),
+  [2836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
+  [2838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(931),
+  [2840] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 40),
+  [2842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1095),
+  [2844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1563),
+  [2846] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 41),
+  [2848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
+  [2850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(923),
+  [2852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
+  [2854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1249),
+  [2856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1248),
+  [2858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1883),
+  [2860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(533),
+  [2862] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [2864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1217),
+  [2866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1749),
+  [2868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1472),
+  [2870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(901),
+  [2872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(549),
+  [2874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
+  [2876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1590),
+  [2878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
+  [2880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(988),
+  [2882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1940),
+  [2884] = {.entry = {.count = 1, .reusable = true}}, SHIFT(889),
+  [2886] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1544),
+  [2888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
+  [2890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(581),
+  [2892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1547),
+  [2894] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat1, 2), SHIFT_REPEAT(1448),
+  [2897] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_higherOrderTerm_repeat1, 2),
+  [2899] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1028),
+  [2901] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1464),
+  [2903] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1447),
+  [2905] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1393),
+  [2907] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleExpr, 3, .production_id = 8),
+  [2909] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1352),
+  [2911] = {.entry = {.count = 1, .reusable = true}}, SHIFT(594),
+  [2913] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
+  [2915] = {.entry = {.count = 1, .reusable = true}}, SHIFT(725),
+  [2917] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
+  [2919] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_typeUnionBody_repeat1, 2),
+  [2921] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_typeUnionBody_repeat1, 2), SHIFT_REPEAT(1414),
+  [2924] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1360),
+  [2926] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1747),
+  [2928] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
+  [2930] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1400),
+  [2932] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
+  [2934] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2), SHIFT_REPEAT(286),
+  [2937] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1247),
+  [2939] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1449),
+  [2941] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1391),
+  [2943] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleInstantiation, 5, .production_id = 1),
+  [2945] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleInstantiation, 4, .production_id = 1),
+  [2947] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
+  [2949] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
+  [2951] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [2953] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [2955] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [2957] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
+  [2959] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_moduleParam, 2, .production_id = 14),
+  [2961] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1263),
+  [2963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1404),
+  [2965] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1319),
+  [2967] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1502),
+  [2969] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
+  [2971] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
+  [2973] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1339),
+  [2975] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1371),
+  [2977] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1401),
+  [2979] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [2981] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
+  [2983] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggId, 1),
+  [2985] = {.entry = {.count = 1, .reusable = true}}, SHIFT(307),
+  [2987] = {.entry = {.count = 1, .reusable = true}}, SHIFT(352),
+  [2989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(285),
+  [2991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [2993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(328),
+  [2995] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotArg, 1),
+  [2997] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, .production_id = 22),
+  [2999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
+  [3001] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330),
+  [3003] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
+  [3005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
+  [3007] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
+  [3009] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [3011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
+  [3013] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [3015] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
+  [3017] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1450),
+  [3019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(482),
+  [3021] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1394),
+  [3023] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1803),
+  [3025] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [3027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(495),
+  [3029] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1392),
+  [3031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(496),
+  [3033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497),
+  [3035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [3037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [3039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1390),
+  [3041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(526),
+  [3043] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
+  [3045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(530),
+  [3047] = {.entry = {.count = 1, .reusable = true}}, SHIFT(744),
+  [3049] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 6, .production_id = 61),
+  [3051] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
+  [3053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [3055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [3057] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [3059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1984),
+  [3061] = {.entry = {.count = 1, .reusable = true}}, SHIFT(578),
+  [3063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1929),
+  [3065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
+  [3067] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 6, .production_id = 62),
+  [3069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(570),
+  [3071] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_closure, 1),
+  [3073] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [3075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(745),
+  [3077] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [3079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [3081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(504),
+  [3083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1922),
+  [3085] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [3087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(802),
+  [3089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1281),
+  [3091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(455),
+  [3093] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [3095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [3097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1395),
+  [3099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(748),
+  [3101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(500),
+  [3103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [3105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(656),
+  [3107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1970),
+  [3109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [3111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1994),
+  [3113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(591),
+  [3115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1848),
+  [3117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [3119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1485),
+  [3121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1851),
+  [3123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 7, .production_id = 69),
+  [3125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1476),
+  [3127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1452),
+  [3129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [3131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1482),
+  [3133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(589),
+  [3135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
+  [3137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [3139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(356),
+  [3141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(878),
+  [3143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(592),
+  [3145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [3147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(593),
+  [3149] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr_aggregate_body, 2, .production_id = 18),
+  [3151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(584),
+  [3153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
+  [3155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(595),
+  [3157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1979),
+  [3159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [3161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1969),
+  [3163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(590),
+  [3165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [3167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1376),
+  [3169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [3171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1493),
+  [3173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1398),
+  [3175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(890),
+  [3177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [3179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1972),
+  [3181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(555),
+  [3183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [3185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1455),
+  [3187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1779),
+  [3189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(898),
+  [3191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(543),
+  [3193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(908),
+  [3195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
+  [3197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [3199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1436),
+  [3201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(534),
+  [3203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(918),
+  [3205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(919),
+  [3207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1927),
+  [3209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [3211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1913),
+  [3213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(924),
+  [3215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(925),
+  [3217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(926),
+  [3219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(521),
+  [3221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1445),
+  [3223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(928),
+  [3225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quantifier, 1),
+  [3227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [3229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1841),
+  [3231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1492),
+  [3233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [3235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(618),
+  [3237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1451),
+  [3239] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 4, .production_id = 39),
+  [3241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [3243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(605),
+  [3245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447),
+  [3247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(707),
+  [3249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1487),
+  [3251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(975),
+  [3253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(743),
+  [3255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(974),
+  [3257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(971),
+  [3259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(970),
+  [3261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(740),
+  [3263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
+  [3265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [3267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(948),
+  [3269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1489),
+  [3271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(737),
+  [3273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(947),
+  [3275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
+  [3277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(474),
+  [3279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(935),
+  [3281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1396),
+  [3283] = {.entry = {.count = 1, .reusable = true}}, SHIFT(481),
+  [3285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 51),
+  [3287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(882),
+  [3289] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
+  [3291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(491),
+  [3293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(492),
+  [3295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
+  [3297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(887),
+  [3299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_full_aggregate_body, 5, .production_id = 50),
+  [3301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(503),
+  [3303] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
+  [3305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(507),
+  [3307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1397),
+  [3309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(508),
+  [3311] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
+  [3313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(423),
+  [3315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1481),
+  [3317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1868),
+  [3319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
+  [3321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(903),
+  [3323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(600),
+  [3325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1198),
+  [3327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
+  [3329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1945),
+  [3331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1446),
+  [3333] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [3335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1952),
+  [3337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1132),
+  [3339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1956),
+  [3341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(727),
+  [3343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(763),
+  [3345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1960),
+  [3347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1183),
+  [3349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(764),
+  [3351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1964),
+  [3353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1491),
+  [3355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(451),
+  [3357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1968),
+  [3359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(450),
+  [3361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(449),
+  [3363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(444),
+  [3365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(563),
+  [3367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438),
+  [3369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(436),
+  [3371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(560),
+  [3373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1793),
+  [3375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1794),
+  [3377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1795),
+  [3379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1797),
+  [3381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1798),
+  [3383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1799),
 };
 
 #ifdef __cplusplus
diff --git a/test/corpus/modules.txt b/test/corpus/modules.txt
index 281f916..3eb00f8 100644
--- a/test/corpus/modules.txt
+++ b/test/corpus/modules.txt
@@ -180,6 +180,8 @@ select PModule<supply6/0, supply10/0, Supply11, Supply15>::foo()
             (aritylessPredicateExpr
               (moduleExpr
                 (moduleInstantiation
+                  (moduleName
+                    (simpleId))
                   (signatureExpr
                     (predicateExpr
                       (aritylessPredicateExpr
@@ -222,6 +224,8 @@ select 1
               (moduleExpr
                 (simpleId))
               (moduleInstantiation
+                (moduleName
+                  (simpleId))
                 (signatureExpr
                   (predicateExpr
                     (aritylessPredicateExpr