@malloydata/malloy 0.0.88-dev231002231014 → 0.0.88-dev231003001139

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. package/dist/dialect/dialect_map.js +1 -0
  2. package/dist/dialect/functions/util.d.ts +1 -0
  3. package/dist/lang/ast/elements/define-query.d.ts +3 -3
  4. package/dist/lang/ast/elements/define-query.js +9 -4
  5. package/dist/lang/ast/elements/define-source.d.ts +3 -3
  6. package/dist/lang/ast/elements/define-source.js +12 -4
  7. package/dist/lang/ast/elements/pipeline-desc.d.ts +1 -0
  8. package/dist/lang/ast/elements/pipeline-desc.js +3 -0
  9. package/dist/lang/ast/elements/source-query-nodes.d.ts +72 -0
  10. package/dist/lang/ast/elements/source-query-nodes.js +368 -0
  11. package/dist/lang/ast/elements/source-query.d.ts +11 -0
  12. package/dist/lang/ast/{query-elements/run-query.js → elements/source-query.js} +32 -21
  13. package/dist/lang/ast/index.d.ts +2 -2
  14. package/dist/lang/ast/index.js +2 -2
  15. package/dist/lang/ast/query-elements/anonymous-query.d.ts +3 -3
  16. package/dist/lang/ast/query-elements/anonymous-query.js +15 -8
  17. package/dist/lang/ast/query-elements/existing-query.js +1 -1
  18. package/dist/lang/ast/query-items/field-references.d.ts +4 -0
  19. package/dist/lang/ast/query-items/field-references.js +11 -1
  20. package/dist/lang/ast/query-items/typecheck_utils.js +5 -5
  21. package/dist/lang/ast/query-properties/joins.d.ts +7 -5
  22. package/dist/lang/ast/query-properties/joins.js +22 -8
  23. package/dist/lang/ast/sources/sql-source.js +5 -0
  24. package/dist/lang/ast/sql-elements/sql-string.d.ts +2 -2
  25. package/dist/lang/ast/sql-elements/sql-string.js +19 -9
  26. package/dist/lang/ast/types/malloy-element.d.ts +3 -1
  27. package/dist/lang/ast/types/malloy-element.js +16 -5
  28. package/dist/lang/lib/Malloy/MalloyParser.d.ts +179 -184
  29. package/dist/lang/lib/Malloy/MalloyParser.js +3141 -2928
  30. package/dist/lang/lib/Malloy/MalloyParserListener.d.ts +147 -199
  31. package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts +88 -120
  32. package/dist/lang/malloy-to-ast.d.ts +16 -15
  33. package/dist/lang/malloy-to-ast.js +147 -141
  34. package/dist/lang/parse-tree-walkers/document-symbol-walker.js +1 -1
  35. package/dist/lang/parse-utils.js +2 -2
  36. package/dist/lang/test/annotation.spec.js +35 -46
  37. package/dist/lang/test/document-symbol-walker.spec.js +2 -2
  38. package/dist/lang/test/expressions.spec.js +16 -16
  39. package/dist/lang/test/imports.spec.js +10 -8
  40. package/dist/lang/test/literals.spec.js +4 -4
  41. package/dist/lang/test/locations.spec.js +82 -80
  42. package/dist/lang/test/parse-expects.js +5 -1
  43. package/dist/lang/test/parse.spec.js +173 -117
  44. package/dist/lang/test/query.spec.js +199 -203
  45. package/dist/lang/test/source.spec.js +54 -45
  46. package/dist/lang/test/sql-block.spec.js +19 -12
  47. package/dist/lang/test/test-translator.js +8 -5
  48. package/dist/malloy.js +2 -2
  49. package/dist/model/malloy_query.js +3 -0
  50. package/dist/model/malloy_types.d.ts +1 -0
  51. package/package.json +1 -2
  52. package/dist/lang/ast/query-elements/run-query.d.ts +0 -13
  53. package/dist/lang/ast/sources/named-source-or-query.d.ts +0 -10
  54. package/dist/lang/ast/sources/named-source-or-query.js +0 -71
@@ -17,8 +17,6 @@ import { ExprRegexContext } from "./MalloyParser";
17
17
  import { ExprNowContext } from "./MalloyParser";
18
18
  import { TableFunctionContext } from "./MalloyParser";
19
19
  import { TableMethodContext } from "./MalloyParser";
20
- import { BareExtendedSource_stubContext } from "./MalloyParser";
21
- import { ExtendedQueryContext } from "./MalloyParser";
22
20
  import { NestExistingContext } from "./MalloyParser";
23
21
  import { NestDefContext } from "./MalloyParser";
24
22
  import { ExprFieldPathContext } from "./MalloyParser";
@@ -49,10 +47,6 @@ import { ExprAggFuncContext } from "./MalloyParser";
49
47
  import { ExprFuncContext } from "./MalloyParser";
50
48
  import { ExprPickContext } from "./MalloyParser";
51
49
  import { ExprUngroupContext } from "./MalloyParser";
52
- import { QueryByNameContext } from "./MalloyParser";
53
- import { QueryByTurtleNameContext } from "./MalloyParser";
54
- import { NormalQueryContext } from "./MalloyParser";
55
- import { QueryFromSQLSourceContext } from "./MalloyParser";
56
50
  import { DefJoinOneContext } from "./MalloyParser";
57
51
  import { DefJoinManyContext } from "./MalloyParser";
58
52
  import { DefJoinCrossContext } from "./MalloyParser";
@@ -70,15 +64,17 @@ import { DefExploreAnnotationContext } from "./MalloyParser";
70
64
  import { DefIgnoreModel_stubContext } from "./MalloyParser";
71
65
  import { FilterByShortcutContext } from "./MalloyParser";
72
66
  import { FilterByWhereContext } from "./MalloyParser";
73
- import { QueryFromSourceContext } from "./MalloyParser";
74
- import { RefinedQueryContext } from "./MalloyParser";
75
- import { SourceFromNamedModelEntryContext } from "./MalloyParser";
76
- import { TableSourceContext } from "./MalloyParser";
77
- import { QuerySourceContext } from "./MalloyParser";
78
- import { SQLSourceNameContext } from "./MalloyParser";
79
- import { SQLSource_stubContext } from "./MalloyParser";
80
67
  import { JoinWithContext } from "./MalloyParser";
81
68
  import { JoinOnContext } from "./MalloyParser";
69
+ import { SQIDContext } from "./MalloyParser";
70
+ import { SQArrowContext } from "./MalloyParser";
71
+ import { SQAmbiguousContext } from "./MalloyParser";
72
+ import { SQExtendedSourceContext } from "./MalloyParser";
73
+ import { SQRefinedQueryContext } from "./MalloyParser";
74
+ import { SQFromContext } from "./MalloyParser";
75
+ import { SQTableContext } from "./MalloyParser";
76
+ import { SQLegacySQLBlockContext } from "./MalloyParser";
77
+ import { SQSQLContext } from "./MalloyParser";
82
78
  import { MalloyDocumentContext } from "./MalloyParser";
83
79
  import { MalloyStatementContext } from "./MalloyParser";
84
80
  import { DefineSourceStatementContext } from "./MalloyParser";
@@ -104,11 +100,6 @@ import { TopLevelQueryDefContext } from "./MalloyParser";
104
100
  import { RefineOperatorContext } from "./MalloyParser";
105
101
  import { QueryRefinementContext } from "./MalloyParser";
106
102
  import { SourceExtensionContext } from "./MalloyParser";
107
- import { QueryContext } from "./MalloyParser";
108
- import { UnrefinableQueryContext } from "./MalloyParser";
109
- import { RefinableQueryContext } from "./MalloyParser";
110
- import { UnextendableSourceContext } from "./MalloyParser";
111
- import { ExtendableSourceContext } from "./MalloyParser";
112
103
  import { SqlSourceContext } from "./MalloyParser";
113
104
  import { PipelineFromNameContext } from "./MalloyParser";
114
105
  import { FirstSegmentContext } from "./MalloyParser";
@@ -121,7 +112,7 @@ import { ExploreQueryNameContext } from "./MalloyParser";
121
112
  import { QueryNameContext } from "./MalloyParser";
122
113
  import { SourcePropertyListContext } from "./MalloyParser";
123
114
  import { SourceDefinitionContext } from "./MalloyParser";
124
- import { ExploreContext } from "./MalloyParser";
115
+ import { SqExploreContext } from "./MalloyParser";
125
116
  import { SourceNameDefContext } from "./MalloyParser";
126
117
  import { SourceIDContext } from "./MalloyParser";
127
118
  import { ExplorePropertiesContext } from "./MalloyParser";
@@ -137,6 +128,11 @@ import { JoinNameDefContext } from "./MalloyParser";
137
128
  import { DeclareStatementContext } from "./MalloyParser";
138
129
  import { JoinStatementContext } from "./MalloyParser";
139
130
  import { QueryExtendContext } from "./MalloyParser";
131
+ import { AmbiguousModificationContext } from "./MalloyParser";
132
+ import { ModEitherContext } from "./MalloyParser";
133
+ import { SqExprContext } from "./MalloyParser";
134
+ import { LeadSegContext } from "./MalloyParser";
135
+ import { QSegContext } from "./MalloyParser";
140
136
  import { QueryExtendStatementContext } from "./MalloyParser";
141
137
  import { QueryExtendStatementListContext } from "./MalloyParser";
142
138
  import { JoinListContext } from "./MalloyParser";
@@ -429,30 +425,6 @@ export interface MalloyParserListener extends ParseTreeListener {
429
425
  * @param ctx the parse tree
430
426
  */
431
427
  exitTableMethod?: (ctx: TableMethodContext) => void;
432
- /**
433
- * Enter a parse tree produced by the `BareExtendedSource_stub`
434
- * labeled alternative in `MalloyParser.explore`.
435
- * @param ctx the parse tree
436
- */
437
- enterBareExtendedSource_stub?: (ctx: BareExtendedSource_stubContext) => void;
438
- /**
439
- * Exit a parse tree produced by the `BareExtendedSource_stub`
440
- * labeled alternative in `MalloyParser.explore`.
441
- * @param ctx the parse tree
442
- */
443
- exitBareExtendedSource_stub?: (ctx: BareExtendedSource_stubContext) => void;
444
- /**
445
- * Enter a parse tree produced by the `ExtendedQuery`
446
- * labeled alternative in `MalloyParser.explore`.
447
- * @param ctx the parse tree
448
- */
449
- enterExtendedQuery?: (ctx: ExtendedQueryContext) => void;
450
- /**
451
- * Exit a parse tree produced by the `ExtendedQuery`
452
- * labeled alternative in `MalloyParser.explore`.
453
- * @param ctx the parse tree
454
- */
455
- exitExtendedQuery?: (ctx: ExtendedQueryContext) => void;
456
428
  /**
457
429
  * Enter a parse tree produced by the `nestExisting`
458
430
  * labeled alternative in `MalloyParser.nestEntry`.
@@ -813,54 +785,6 @@ export interface MalloyParserListener extends ParseTreeListener {
813
785
  * @param ctx the parse tree
814
786
  */
815
787
  exitExprUngroup?: (ctx: ExprUngroupContext) => void;
816
- /**
817
- * Enter a parse tree produced by the `QueryByName`
818
- * labeled alternative in `MalloyParser.refinableQuery`.
819
- * @param ctx the parse tree
820
- */
821
- enterQueryByName?: (ctx: QueryByNameContext) => void;
822
- /**
823
- * Exit a parse tree produced by the `QueryByName`
824
- * labeled alternative in `MalloyParser.refinableQuery`.
825
- * @param ctx the parse tree
826
- */
827
- exitQueryByName?: (ctx: QueryByNameContext) => void;
828
- /**
829
- * Enter a parse tree produced by the `QueryByTurtleName`
830
- * labeled alternative in `MalloyParser.refinableQuery`.
831
- * @param ctx the parse tree
832
- */
833
- enterQueryByTurtleName?: (ctx: QueryByTurtleNameContext) => void;
834
- /**
835
- * Exit a parse tree produced by the `QueryByTurtleName`
836
- * labeled alternative in `MalloyParser.refinableQuery`.
837
- * @param ctx the parse tree
838
- */
839
- exitQueryByTurtleName?: (ctx: QueryByTurtleNameContext) => void;
840
- /**
841
- * Enter a parse tree produced by the `NormalQuery`
842
- * labeled alternative in `MalloyParser.query`.
843
- * @param ctx the parse tree
844
- */
845
- enterNormalQuery?: (ctx: NormalQueryContext) => void;
846
- /**
847
- * Exit a parse tree produced by the `NormalQuery`
848
- * labeled alternative in `MalloyParser.query`.
849
- * @param ctx the parse tree
850
- */
851
- exitNormalQuery?: (ctx: NormalQueryContext) => void;
852
- /**
853
- * Enter a parse tree produced by the `QueryFromSQLSource`
854
- * labeled alternative in `MalloyParser.query`.
855
- * @param ctx the parse tree
856
- */
857
- enterQueryFromSQLSource?: (ctx: QueryFromSQLSourceContext) => void;
858
- /**
859
- * Exit a parse tree produced by the `QueryFromSQLSource`
860
- * labeled alternative in `MalloyParser.query`.
861
- * @param ctx the parse tree
862
- */
863
- exitQueryFromSQLSource?: (ctx: QueryFromSQLSourceContext) => void;
864
788
  /**
865
789
  * Enter a parse tree produced by the `defJoinOne`
866
790
  * labeled alternative in `MalloyParser.joinStatement`.
@@ -1066,113 +990,137 @@ export interface MalloyParserListener extends ParseTreeListener {
1066
990
  */
1067
991
  exitFilterByWhere?: (ctx: FilterByWhereContext) => void;
1068
992
  /**
1069
- * Enter a parse tree produced by the `QueryFromSource`
1070
- * labeled alternative in `MalloyParser.unrefinableQuery`.
993
+ * Enter a parse tree produced by the `joinWith`
994
+ * labeled alternative in `MalloyParser.joinDef`.
1071
995
  * @param ctx the parse tree
1072
996
  */
1073
- enterQueryFromSource?: (ctx: QueryFromSourceContext) => void;
997
+ enterJoinWith?: (ctx: JoinWithContext) => void;
1074
998
  /**
1075
- * Exit a parse tree produced by the `QueryFromSource`
1076
- * labeled alternative in `MalloyParser.unrefinableQuery`.
999
+ * Exit a parse tree produced by the `joinWith`
1000
+ * labeled alternative in `MalloyParser.joinDef`.
1077
1001
  * @param ctx the parse tree
1078
1002
  */
1079
- exitQueryFromSource?: (ctx: QueryFromSourceContext) => void;
1003
+ exitJoinWith?: (ctx: JoinWithContext) => void;
1080
1004
  /**
1081
- * Enter a parse tree produced by the `RefinedQuery`
1082
- * labeled alternative in `MalloyParser.unrefinableQuery`.
1005
+ * Enter a parse tree produced by the `joinOn`
1006
+ * labeled alternative in `MalloyParser.joinDef`.
1083
1007
  * @param ctx the parse tree
1084
1008
  */
1085
- enterRefinedQuery?: (ctx: RefinedQueryContext) => void;
1009
+ enterJoinOn?: (ctx: JoinOnContext) => void;
1086
1010
  /**
1087
- * Exit a parse tree produced by the `RefinedQuery`
1088
- * labeled alternative in `MalloyParser.unrefinableQuery`.
1011
+ * Exit a parse tree produced by the `joinOn`
1012
+ * labeled alternative in `MalloyParser.joinDef`.
1089
1013
  * @param ctx the parse tree
1090
1014
  */
1091
- exitRefinedQuery?: (ctx: RefinedQueryContext) => void;
1015
+ exitJoinOn?: (ctx: JoinOnContext) => void;
1092
1016
  /**
1093
- * Enter a parse tree produced by the `SourceFromNamedModelEntry`
1094
- * labeled alternative in `MalloyParser.extendableSource`.
1017
+ * Enter a parse tree produced by the `SQID`
1018
+ * labeled alternative in `MalloyParser.sqExpr`.
1095
1019
  * @param ctx the parse tree
1096
1020
  */
1097
- enterSourceFromNamedModelEntry?: (ctx: SourceFromNamedModelEntryContext) => void;
1021
+ enterSQID?: (ctx: SQIDContext) => void;
1098
1022
  /**
1099
- * Exit a parse tree produced by the `SourceFromNamedModelEntry`
1100
- * labeled alternative in `MalloyParser.extendableSource`.
1023
+ * Exit a parse tree produced by the `SQID`
1024
+ * labeled alternative in `MalloyParser.sqExpr`.
1101
1025
  * @param ctx the parse tree
1102
1026
  */
1103
- exitSourceFromNamedModelEntry?: (ctx: SourceFromNamedModelEntryContext) => void;
1027
+ exitSQID?: (ctx: SQIDContext) => void;
1104
1028
  /**
1105
- * Enter a parse tree produced by the `TableSource`
1106
- * labeled alternative in `MalloyParser.extendableSource`.
1029
+ * Enter a parse tree produced by the `SQArrow`
1030
+ * labeled alternative in `MalloyParser.sqExpr`.
1107
1031
  * @param ctx the parse tree
1108
1032
  */
1109
- enterTableSource?: (ctx: TableSourceContext) => void;
1033
+ enterSQArrow?: (ctx: SQArrowContext) => void;
1110
1034
  /**
1111
- * Exit a parse tree produced by the `TableSource`
1112
- * labeled alternative in `MalloyParser.extendableSource`.
1035
+ * Exit a parse tree produced by the `SQArrow`
1036
+ * labeled alternative in `MalloyParser.sqExpr`.
1113
1037
  * @param ctx the parse tree
1114
1038
  */
1115
- exitTableSource?: (ctx: TableSourceContext) => void;
1039
+ exitSQArrow?: (ctx: SQArrowContext) => void;
1116
1040
  /**
1117
- * Enter a parse tree produced by the `QuerySource`
1118
- * labeled alternative in `MalloyParser.extendableSource`.
1041
+ * Enter a parse tree produced by the `SQAmbiguous`
1042
+ * labeled alternative in `MalloyParser.sqExpr`.
1119
1043
  * @param ctx the parse tree
1120
1044
  */
1121
- enterQuerySource?: (ctx: QuerySourceContext) => void;
1045
+ enterSQAmbiguous?: (ctx: SQAmbiguousContext) => void;
1122
1046
  /**
1123
- * Exit a parse tree produced by the `QuerySource`
1124
- * labeled alternative in `MalloyParser.extendableSource`.
1047
+ * Exit a parse tree produced by the `SQAmbiguous`
1048
+ * labeled alternative in `MalloyParser.sqExpr`.
1125
1049
  * @param ctx the parse tree
1126
1050
  */
1127
- exitQuerySource?: (ctx: QuerySourceContext) => void;
1051
+ exitSQAmbiguous?: (ctx: SQAmbiguousContext) => void;
1128
1052
  /**
1129
- * Enter a parse tree produced by the `SQLSourceName`
1130
- * labeled alternative in `MalloyParser.extendableSource`.
1053
+ * Enter a parse tree produced by the `SQExtendedSource`
1054
+ * labeled alternative in `MalloyParser.sqExpr`.
1131
1055
  * @param ctx the parse tree
1132
1056
  */
1133
- enterSQLSourceName?: (ctx: SQLSourceNameContext) => void;
1057
+ enterSQExtendedSource?: (ctx: SQExtendedSourceContext) => void;
1134
1058
  /**
1135
- * Exit a parse tree produced by the `SQLSourceName`
1136
- * labeled alternative in `MalloyParser.extendableSource`.
1059
+ * Exit a parse tree produced by the `SQExtendedSource`
1060
+ * labeled alternative in `MalloyParser.sqExpr`.
1137
1061
  * @param ctx the parse tree
1138
1062
  */
1139
- exitSQLSourceName?: (ctx: SQLSourceNameContext) => void;
1063
+ exitSQExtendedSource?: (ctx: SQExtendedSourceContext) => void;
1140
1064
  /**
1141
- * Enter a parse tree produced by the `SQLSource_stub`
1142
- * labeled alternative in `MalloyParser.extendableSource`.
1065
+ * Enter a parse tree produced by the `SQRefinedQuery`
1066
+ * labeled alternative in `MalloyParser.sqExpr`.
1143
1067
  * @param ctx the parse tree
1144
1068
  */
1145
- enterSQLSource_stub?: (ctx: SQLSource_stubContext) => void;
1069
+ enterSQRefinedQuery?: (ctx: SQRefinedQueryContext) => void;
1146
1070
  /**
1147
- * Exit a parse tree produced by the `SQLSource_stub`
1148
- * labeled alternative in `MalloyParser.extendableSource`.
1071
+ * Exit a parse tree produced by the `SQRefinedQuery`
1072
+ * labeled alternative in `MalloyParser.sqExpr`.
1149
1073
  * @param ctx the parse tree
1150
1074
  */
1151
- exitSQLSource_stub?: (ctx: SQLSource_stubContext) => void;
1075
+ exitSQRefinedQuery?: (ctx: SQRefinedQueryContext) => void;
1152
1076
  /**
1153
- * Enter a parse tree produced by the `joinWith`
1154
- * labeled alternative in `MalloyParser.joinDef`.
1077
+ * Enter a parse tree produced by the `SQFrom`
1078
+ * labeled alternative in `MalloyParser.sqExpr`.
1155
1079
  * @param ctx the parse tree
1156
1080
  */
1157
- enterJoinWith?: (ctx: JoinWithContext) => void;
1081
+ enterSQFrom?: (ctx: SQFromContext) => void;
1158
1082
  /**
1159
- * Exit a parse tree produced by the `joinWith`
1160
- * labeled alternative in `MalloyParser.joinDef`.
1083
+ * Exit a parse tree produced by the `SQFrom`
1084
+ * labeled alternative in `MalloyParser.sqExpr`.
1161
1085
  * @param ctx the parse tree
1162
1086
  */
1163
- exitJoinWith?: (ctx: JoinWithContext) => void;
1087
+ exitSQFrom?: (ctx: SQFromContext) => void;
1164
1088
  /**
1165
- * Enter a parse tree produced by the `joinOn`
1166
- * labeled alternative in `MalloyParser.joinDef`.
1089
+ * Enter a parse tree produced by the `SQTable`
1090
+ * labeled alternative in `MalloyParser.sqExpr`.
1167
1091
  * @param ctx the parse tree
1168
1092
  */
1169
- enterJoinOn?: (ctx: JoinOnContext) => void;
1093
+ enterSQTable?: (ctx: SQTableContext) => void;
1170
1094
  /**
1171
- * Exit a parse tree produced by the `joinOn`
1172
- * labeled alternative in `MalloyParser.joinDef`.
1095
+ * Exit a parse tree produced by the `SQTable`
1096
+ * labeled alternative in `MalloyParser.sqExpr`.
1173
1097
  * @param ctx the parse tree
1174
1098
  */
1175
- exitJoinOn?: (ctx: JoinOnContext) => void;
1099
+ exitSQTable?: (ctx: SQTableContext) => void;
1100
+ /**
1101
+ * Enter a parse tree produced by the `SQLegacySQLBlock`
1102
+ * labeled alternative in `MalloyParser.sqExpr`.
1103
+ * @param ctx the parse tree
1104
+ */
1105
+ enterSQLegacySQLBlock?: (ctx: SQLegacySQLBlockContext) => void;
1106
+ /**
1107
+ * Exit a parse tree produced by the `SQLegacySQLBlock`
1108
+ * labeled alternative in `MalloyParser.sqExpr`.
1109
+ * @param ctx the parse tree
1110
+ */
1111
+ exitSQLegacySQLBlock?: (ctx: SQLegacySQLBlockContext) => void;
1112
+ /**
1113
+ * Enter a parse tree produced by the `SQSQL`
1114
+ * labeled alternative in `MalloyParser.sqExpr`.
1115
+ * @param ctx the parse tree
1116
+ */
1117
+ enterSQSQL?: (ctx: SQSQLContext) => void;
1118
+ /**
1119
+ * Exit a parse tree produced by the `SQSQL`
1120
+ * labeled alternative in `MalloyParser.sqExpr`.
1121
+ * @param ctx the parse tree
1122
+ */
1123
+ exitSQSQL?: (ctx: SQSQLContext) => void;
1176
1124
  /**
1177
1125
  * Enter a parse tree produced by `MalloyParser.malloyDocument`.
1178
1126
  * @param ctx the parse tree
@@ -1423,56 +1371,6 @@ export interface MalloyParserListener extends ParseTreeListener {
1423
1371
  * @param ctx the parse tree
1424
1372
  */
1425
1373
  exitSourceExtension?: (ctx: SourceExtensionContext) => void;
1426
- /**
1427
- * Enter a parse tree produced by `MalloyParser.query`.
1428
- * @param ctx the parse tree
1429
- */
1430
- enterQuery?: (ctx: QueryContext) => void;
1431
- /**
1432
- * Exit a parse tree produced by `MalloyParser.query`.
1433
- * @param ctx the parse tree
1434
- */
1435
- exitQuery?: (ctx: QueryContext) => void;
1436
- /**
1437
- * Enter a parse tree produced by `MalloyParser.unrefinableQuery`.
1438
- * @param ctx the parse tree
1439
- */
1440
- enterUnrefinableQuery?: (ctx: UnrefinableQueryContext) => void;
1441
- /**
1442
- * Exit a parse tree produced by `MalloyParser.unrefinableQuery`.
1443
- * @param ctx the parse tree
1444
- */
1445
- exitUnrefinableQuery?: (ctx: UnrefinableQueryContext) => void;
1446
- /**
1447
- * Enter a parse tree produced by `MalloyParser.refinableQuery`.
1448
- * @param ctx the parse tree
1449
- */
1450
- enterRefinableQuery?: (ctx: RefinableQueryContext) => void;
1451
- /**
1452
- * Exit a parse tree produced by `MalloyParser.refinableQuery`.
1453
- * @param ctx the parse tree
1454
- */
1455
- exitRefinableQuery?: (ctx: RefinableQueryContext) => void;
1456
- /**
1457
- * Enter a parse tree produced by `MalloyParser.unextendableSource`.
1458
- * @param ctx the parse tree
1459
- */
1460
- enterUnextendableSource?: (ctx: UnextendableSourceContext) => void;
1461
- /**
1462
- * Exit a parse tree produced by `MalloyParser.unextendableSource`.
1463
- * @param ctx the parse tree
1464
- */
1465
- exitUnextendableSource?: (ctx: UnextendableSourceContext) => void;
1466
- /**
1467
- * Enter a parse tree produced by `MalloyParser.extendableSource`.
1468
- * @param ctx the parse tree
1469
- */
1470
- enterExtendableSource?: (ctx: ExtendableSourceContext) => void;
1471
- /**
1472
- * Exit a parse tree produced by `MalloyParser.extendableSource`.
1473
- * @param ctx the parse tree
1474
- */
1475
- exitExtendableSource?: (ctx: ExtendableSourceContext) => void;
1476
1374
  /**
1477
1375
  * Enter a parse tree produced by `MalloyParser.sqlSource`.
1478
1376
  * @param ctx the parse tree
@@ -1594,15 +1492,15 @@ export interface MalloyParserListener extends ParseTreeListener {
1594
1492
  */
1595
1493
  exitSourceDefinition?: (ctx: SourceDefinitionContext) => void;
1596
1494
  /**
1597
- * Enter a parse tree produced by `MalloyParser.explore`.
1495
+ * Enter a parse tree produced by `MalloyParser.sqExplore`.
1598
1496
  * @param ctx the parse tree
1599
1497
  */
1600
- enterExplore?: (ctx: ExploreContext) => void;
1498
+ enterSqExplore?: (ctx: SqExploreContext) => void;
1601
1499
  /**
1602
- * Exit a parse tree produced by `MalloyParser.explore`.
1500
+ * Exit a parse tree produced by `MalloyParser.sqExplore`.
1603
1501
  * @param ctx the parse tree
1604
1502
  */
1605
- exitExplore?: (ctx: ExploreContext) => void;
1503
+ exitSqExplore?: (ctx: SqExploreContext) => void;
1606
1504
  /**
1607
1505
  * Enter a parse tree produced by `MalloyParser.sourceNameDef`.
1608
1506
  * @param ctx the parse tree
@@ -1753,6 +1651,56 @@ export interface MalloyParserListener extends ParseTreeListener {
1753
1651
  * @param ctx the parse tree
1754
1652
  */
1755
1653
  exitQueryExtend?: (ctx: QueryExtendContext) => void;
1654
+ /**
1655
+ * Enter a parse tree produced by `MalloyParser.ambiguousModification`.
1656
+ * @param ctx the parse tree
1657
+ */
1658
+ enterAmbiguousModification?: (ctx: AmbiguousModificationContext) => void;
1659
+ /**
1660
+ * Exit a parse tree produced by `MalloyParser.ambiguousModification`.
1661
+ * @param ctx the parse tree
1662
+ */
1663
+ exitAmbiguousModification?: (ctx: AmbiguousModificationContext) => void;
1664
+ /**
1665
+ * Enter a parse tree produced by `MalloyParser.modEither`.
1666
+ * @param ctx the parse tree
1667
+ */
1668
+ enterModEither?: (ctx: ModEitherContext) => void;
1669
+ /**
1670
+ * Exit a parse tree produced by `MalloyParser.modEither`.
1671
+ * @param ctx the parse tree
1672
+ */
1673
+ exitModEither?: (ctx: ModEitherContext) => void;
1674
+ /**
1675
+ * Enter a parse tree produced by `MalloyParser.sqExpr`.
1676
+ * @param ctx the parse tree
1677
+ */
1678
+ enterSqExpr?: (ctx: SqExprContext) => void;
1679
+ /**
1680
+ * Exit a parse tree produced by `MalloyParser.sqExpr`.
1681
+ * @param ctx the parse tree
1682
+ */
1683
+ exitSqExpr?: (ctx: SqExprContext) => void;
1684
+ /**
1685
+ * Enter a parse tree produced by `MalloyParser.leadSeg`.
1686
+ * @param ctx the parse tree
1687
+ */
1688
+ enterLeadSeg?: (ctx: LeadSegContext) => void;
1689
+ /**
1690
+ * Exit a parse tree produced by `MalloyParser.leadSeg`.
1691
+ * @param ctx the parse tree
1692
+ */
1693
+ exitLeadSeg?: (ctx: LeadSegContext) => void;
1694
+ /**
1695
+ * Enter a parse tree produced by `MalloyParser.qSeg`.
1696
+ * @param ctx the parse tree
1697
+ */
1698
+ enterQSeg?: (ctx: QSegContext) => void;
1699
+ /**
1700
+ * Exit a parse tree produced by `MalloyParser.qSeg`.
1701
+ * @param ctx the parse tree
1702
+ */
1703
+ exitQSeg?: (ctx: QSegContext) => void;
1756
1704
  /**
1757
1705
  * Enter a parse tree produced by `MalloyParser.queryExtendStatement`.
1758
1706
  * @param ctx the parse tree