@malloydata/malloy 0.0.75-dev230815172342 → 0.0.75-dev230815210351

package/dist/lang/lib/Malloy/MalloyParser.d.ts

@@ -2151,7 +2151,9 @@ export declare class ExprUngroupContext extends FieldExprContext {
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class PartialAllowedFieldExprContext extends ParserRuleContext {
+    OPAREN(): TerminalNode | undefined;
     fieldExpr(): FieldExprContext;
+    CPAREN(): TerminalNode | undefined;
     compareOp(): CompareOpContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;

package/dist/lang/lib/Malloy/MalloyParser.js

@@ -5778,19 +5778,45 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 216, MalloyParser.RULE_partialAllowedFieldExpr);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
-            {
-                this.state = 1087;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                if (((((_la - 112)) & ~0x1F) === 0 && ((1 << (_la - 112)) & ((1 << (MalloyParser.LT - 112)) | (1 << (MalloyParser.GT - 112)) | (1 << (MalloyParser.EQ - 112)) | (1 << (MalloyParser.NE - 112)) | (1 << (MalloyParser.LTE - 112)) | (1 << (MalloyParser.GTE - 112)) | (1 << (MalloyParser.NOT_MATCH - 112)) | (1 << (MalloyParser.MATCH - 112)))) !== 0)) {
+            this.state = 1097;
+            this._errHandler.sync(this);
+            switch (this.interpreter.adaptivePredict(this._input, 111, this._ctx)) {
+                case 1:
+                    this.enterOuterAlt(_localctx, 1);
                     {
                         this.state = 1086;
-                        this.compareOp();
+                        this.match(MalloyParser.OPAREN);
+                        this.state = 1088;
+                        this._errHandler.sync(this);
+                        _la = this._input.LA(1);
+                        if (((((_la - 112)) & ~0x1F) === 0 && ((1 << (_la - 112)) & ((1 << (MalloyParser.LT - 112)) | (1 << (MalloyParser.GT - 112)) | (1 << (MalloyParser.EQ - 112)) | (1 << (MalloyParser.NE - 112)) | (1 << (MalloyParser.LTE - 112)) | (1 << (MalloyParser.GTE - 112)) | (1 << (MalloyParser.NOT_MATCH - 112)) | (1 << (MalloyParser.MATCH - 112)))) !== 0)) {
+                            {
+                                this.state = 1087;
+                                this.compareOp();
+                            }
+                        }
+                        this.state = 1090;
+                        this.fieldExpr(0);
+                        this.state = 1091;
+                        this.match(MalloyParser.CPAREN);
                     }
-                }
-                this.state = 1089;
-                this.fieldExpr(0);
+                    break;
+                case 2:
+                    this.enterOuterAlt(_localctx, 2);
+                    {
+                        this.state = 1094;
+                        this._errHandler.sync(this);
+                        _la = this._input.LA(1);
+                        if (((((_la - 112)) & ~0x1F) === 0 && ((1 << (_la - 112)) & ((1 << (MalloyParser.LT - 112)) | (1 << (MalloyParser.GT - 112)) | (1 << (MalloyParser.EQ - 112)) | (1 << (MalloyParser.NE - 112)) | (1 << (MalloyParser.LTE - 112)) | (1 << (MalloyParser.GTE - 112)) | (1 << (MalloyParser.NOT_MATCH - 112)) | (1 << (MalloyParser.MATCH - 112)))) !== 0)) {
+                            {
+                                this.state = 1093;
+                                this.compareOp();
+                            }
+                        }
+                        this.state = 1096;
+                        this.fieldExpr(0);
+                    }
+                    break;
             }
         }
         catch (re) {
@@ -5816,7 +5842,7 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1092;
+                this.state = 1100;
                 this._errHandler.sync(this);
                 _alt = 1;
                 do {
@@ -5824,7 +5850,7 @@ class MalloyParser extends Parser_1.Parser {
                         case 1:
                             {
                                 {
-                                    this.state = 1091;
+                                    this.state = 1099;
                                     this.pick();
                                 }
                             }
@@ -5832,18 +5858,18 @@ class MalloyParser extends Parser_1.Parser {
                         default:
                             throw new NoViableAltException_1.NoViableAltException(this);
                     }
-                    this.state = 1094;
+                    this.state = 1102;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 110, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 112, this._ctx);
                 } while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER);
-                this.state = 1098;
+                this.state = 1106;
                 this._errHandler.sync(this);
-                switch (this.interpreter.adaptivePredict(this._input, 111, this._ctx)) {
+                switch (this.interpreter.adaptivePredict(this._input, 113, this._ctx)) {
                     case 1:
                         {
-                            this.state = 1096;
+                            this.state = 1104;
                             this.match(MalloyParser.ELSE);
-                            this.state = 1097;
+                            this.state = 1105;
                             _localctx._pickElse = this.fieldExpr(0);
                         }
                         break;
@@ -5873,20 +5899,20 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1100;
+                this.state = 1108;
                 this.match(MalloyParser.PICK);
-                this.state = 1102;
+                this.state = 1110;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.OPAREN - 100)) | (1 << (MalloyParser.MINUS - 100)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 100)) | (1 << (MalloyParser.LITERAL_HOUR - 100)))) !== 0) || ((((_la - 132)) & ~0x1F) === 0 && ((1 << (_la - 132)) & ((1 << (MalloyParser.LITERAL_DAY - 132)) | (1 << (MalloyParser.LITERAL_QUARTER - 132)) | (1 << (MalloyParser.LITERAL_MONTH - 132)) | (1 << (MalloyParser.LITERAL_WEEK - 132)) | (1 << (MalloyParser.LITERAL_YEAR - 132)) | (1 << (MalloyParser.IDENTIFIER - 132)) | (1 << (MalloyParser.NUMERIC_LITERAL - 132)) | (1 << (MalloyParser.INTEGER_LITERAL - 132)) | (1 << (MalloyParser.SQL_BEGIN - 132)))) !== 0)) {
                     {
-                        this.state = 1101;
+                        this.state = 1109;
                         _localctx._pickValue = this.fieldExpr(0);
                     }
                 }
-                this.state = 1104;
+                this.state = 1112;
                 this.match(MalloyParser.WHEN);
-                this.state = 1105;
+                this.state = 1113;
                 _localctx._pickWhen = this.partialAllowedFieldExpr();
             }
         }
@@ -5914,32 +5940,32 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1107;
+                this.state = 1115;
                 this.fieldExpr(0);
-                this.state = 1112;
+                this.state = 1120;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 113, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 115, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1108;
+                                this.state = 1116;
                                 this.match(MalloyParser.COMMA);
-                                this.state = 1109;
+                                this.state = 1117;
                                 this.fieldExpr(0);
                             }
                         }
                     }
-                    this.state = 1114;
+                    this.state = 1122;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 113, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 115, this._ctx);
                 }
-                this.state = 1116;
+                this.state = 1124;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 1115;
+                        this.state = 1123;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -5969,32 +5995,32 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1118;
+                this.state = 1126;
                 this.fieldName();
-                this.state = 1125;
+                this.state = 1133;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 116, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 118, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1120;
+                                this.state = 1128;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 1119;
+                                        this.state = 1127;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 1122;
+                                this.state = 1130;
                                 this.fieldName();
                             }
                         }
                     }
-                    this.state = 1127;
+                    this.state = 1135;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 116, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 118, this._ctx);
                 }
             }
         }
@@ -6022,39 +6048,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1128;
+                this.state = 1136;
                 this.collectionMember();
-                this.state = 1135;
+                this.state = 1143;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 118, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 120, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1130;
+                                this.state = 1138;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 1129;
+                                        this.state = 1137;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 1132;
+                                this.state = 1140;
                                 this.collectionMember();
                             }
                         }
                     }
-                    this.state = 1137;
+                    this.state = 1145;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 118, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 120, this._ctx);
                 }
-                this.state = 1139;
+                this.state = 1147;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 1138;
+                        this.state = 1146;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -6083,18 +6109,18 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1144;
+                this.state = 1152;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.BQ_STRING || _la === MalloyParser.IDENTIFIER) {
                     {
-                        this.state = 1141;
+                        this.state = 1149;
                         this.fieldPath();
-                        this.state = 1142;
+                        this.state = 1150;
                         this.match(MalloyParser.DOT);
                     }
                 }
-                this.state = 1146;
+                this.state = 1154;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.STAR || _la === MalloyParser.STARSTAR)) {
                     this._errHandler.recoverInline(this);
@@ -6131,16 +6157,16 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1148;
+                this.state = 1156;
                 this.tags();
-                this.state = 1149;
+                this.state = 1157;
                 this.fieldPath();
-                this.state = 1151;
+                this.state = 1159;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.DOT) {
                     {
-                        this.state = 1150;
+                        this.state = 1158;
                         this.refExpr();
                     }
                 }
@@ -6166,28 +6192,28 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new RefExprContext(this._ctx, this.state);
         this.enterRule(_localctx, 232, MalloyParser.RULE_refExpr);
         try {
-            this.state = 1160;
+            this.state = 1168;
             this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 122, this._ctx)) {
+            switch (this.interpreter.adaptivePredict(this._input, 124, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 1153;
+                        this.state = 1161;
                         this.match(MalloyParser.DOT);
-                        this.state = 1154;
+                        this.state = 1162;
                         this.timeframe();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 1155;
+                        this.state = 1163;
                         this.match(MalloyParser.DOT);
-                        this.state = 1156;
+                        this.state = 1164;
                         this.aggregate();
-                        this.state = 1157;
+                        this.state = 1165;
                         this.match(MalloyParser.OPAREN);
-                        this.state = 1158;
+                        this.state = 1166;
                         this.match(MalloyParser.CPAREN);
                     }
                     break;
@@ -6213,27 +6239,27 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new CollectionMemberContext(this._ctx, this.state);
         this.enterRule(_localctx, 234, MalloyParser.RULE_collectionMember);
         try {
-            this.state = 1165;
+            this.state = 1173;
             this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 123, this._ctx)) {
+            switch (this.interpreter.adaptivePredict(this._input, 125, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 1162;
+                        this.state = 1170;
                         this.taggedRef();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 1163;
+                        this.state = 1171;
                         this.collectionWildCard();
                     }
                     break;
                 case 3:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 1164;
+                        this.state = 1172;
                         this.fieldDef();
                     }
                     break;
@@ -6262,25 +6288,25 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1167;
+                this.state = 1175;
                 this.fieldName();
-                this.state = 1172;
+                this.state = 1180;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 124, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 126, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1168;
+                                this.state = 1176;
                                 this.match(MalloyParser.DOT);
-                                this.state = 1169;
+                                this.state = 1177;
                                 this.fieldName();
                             }
                         }
                     }
-                    this.state = 1174;
+                    this.state = 1182;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 124, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 126, this._ctx);
                 }
             }
         }
@@ -6306,7 +6332,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1175;
+                this.state = 1183;
                 this.id();
             }
         }
@@ -6332,7 +6358,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1177;
+                this.state = 1185;
                 this.id();
             }
         }
@@ -6358,9 +6384,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1179;
+                this.state = 1187;
                 this.fieldExpr(0);
-                this.state = 1180;
+                this.state = 1188;
                 this.match(MalloyParser.EOF);
             }
         }
@@ -6386,7 +6412,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1182;
+                this.state = 1190;
                 this.id();
             }
         }
@@ -6412,7 +6438,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1184;
+                this.state = 1192;
                 this.id();
             }
         }
@@ -6438,7 +6464,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1186;
+                this.state = 1194;
                 this.string();
             }
         }
@@ -6860,7 +6886,7 @@ MalloyParser._SYMBOLIC_NAMES = [
 ];
 MalloyParser.VOCABULARY = new VocabularyImpl_1.VocabularyImpl(MalloyParser._LITERAL_NAMES, MalloyParser._SYMBOLIC_NAMES, []);
 MalloyParser._serializedATNSegments = 3;
-MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x97\u04A7\x04" +
+MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x97\u04AF\x04" +
     "\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04" +
     "\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r" +
     "\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12" +
@@ -6951,34 +6977,35 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03" +
     "m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03" +
     "m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03" +
-    "m\x03m\x07m\u043C\nm\fm\x0Em\u043F\vm\x03n\x05n\u0442\nn\x03n\x03n\x03" +
-    "o\x06o\u0447\no\ro\x0Eo\u0448\x03o\x03o\x05o\u044D\no\x03p\x03p\x05p\u0451" +
-    "\np\x03p\x03p\x03p\x03q\x03q\x03q\x07q\u0459\nq\fq\x0Eq\u045C\vq\x03q" +
-    "\x05q\u045F\nq\x03r\x03r\x05r\u0463\nr\x03r\x07r\u0466\nr\fr\x0Er\u0469" +
-    "\vr\x03s\x03s\x05s\u046D\ns\x03s\x07s\u0470\ns\fs\x0Es\u0473\vs\x03s\x05" +
-    "s\u0476\ns\x03t\x03t\x03t\x05t\u047B\nt\x03t\x03t\x03u\x03u\x03u\x05u" +
-    "\u0482\nu\x03v\x03v\x03v\x03v\x03v\x03v\x03v\x05v\u048B\nv\x03w\x03w\x03" +
-    "w\x05w\u0490\nw\x03x\x03x\x03x\x07x\u0495\nx\fx\x0Ex\u0498\vx\x03y\x03" +
-    "y\x03z\x03z\x03{\x03{\x03{\x03|\x03|\x03}\x03}\x03~\x03~\x03~\x02\x02" +
-    "\x03\xD8\x7F\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02\x10\x02" +
-    "\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02 \x02\"\x02$\x02" +
-    "&\x02(\x02*\x02,\x02.\x020\x022\x024\x026\x028\x02:\x02<\x02>\x02@\x02" +
-    "B\x02D\x02F\x02H\x02J\x02L\x02N\x02P\x02R\x02T\x02V\x02X\x02Z\x02\\\x02" +
-    "^\x02`\x02b\x02d\x02f\x02h\x02j\x02l\x02n\x02p\x02r\x02t\x02v\x02x\x02" +
-    "z\x02|\x02~\x02\x80\x02\x82\x02\x84\x02\x86\x02\x88\x02\x8A\x02\x8C\x02" +
-    "\x8E\x02\x90\x02\x92\x02\x94\x02\x96\x02\x98\x02\x9A\x02\x9C\x02\x9E\x02" +
-    "\xA0\x02\xA2\x02\xA4\x02\xA6\x02\xA8\x02\xAA\x02\xAC\x02\xAE\x02\xB0\x02" +
-    "\xB2\x02\xB4\x02\xB6\x02\xB8\x02\xBA\x02\xBC\x02\xBE\x02\xC0\x02\xC2\x02" +
-    "\xC4\x02\xC6\x02\xC8\x02\xCA\x02\xCC\x02\xCE\x02\xD0\x02\xD2\x02\xD4\x02" +
-    "\xD6\x02\xD8\x02\xDA\x02\xDC\x02\xDE\x02\xE0\x02\xE2\x02\xE4\x02\xE6\x02" +
-    "\xE8\x02\xEA\x02\xEC\x02\xEE\x02\xF0\x02\xF2\x02\xF4\x02\xF6\x02\xF8\x02" +
-    "\xFA\x02\x02\x12\x04\x02kk\x93\x93\x04\x02\x03\x03\n\n\x04\x02%%//\x06" +
-    "\x0255UU\x8C\x8C\x8E\x8E\x06\x02&&,,?@NN\x07\x02\'\'--FFMMSS\x04\x02r" +
-    "w\x7F\x80\x03\x02^_\x03\x02\x8D\x8E\x04\x0255UU\x04\x02``\x8B\x8B\t\x02" +
-    "..::ABJJLLWWZZ\x04\x02\"\"33\x05\x02zz||\x81\x81\x03\x02xy\x03\x02z{\x02" +
-    "\u04EF\x02\u0100\x03\x02\x02\x02\x04\u010C\x03\x02\x02\x02\x06\u010E\x03" +
-    "\x02\x02\x02\b\u0117\x03\x02\x02\x02\n\u0119\x03\x02\x02\x02\f\u011F\x03" +
-    "\x02\x02\x02\x0E\u0122\x03\x02\x02\x02\x10\u0126\x03\x02\x02\x02\x12\u012B" +
+    "m\x03m\x07m\u043C\nm\fm\x0Em\u043F\vm\x03n\x03n\x05n\u0443\nn\x03n\x03" +
+    "n\x03n\x03n\x05n\u0449\nn\x03n\x05n\u044C\nn\x03o\x06o\u044F\no\ro\x0E" +
+    "o\u0450\x03o\x03o\x05o\u0455\no\x03p\x03p\x05p\u0459\np\x03p\x03p\x03" +
+    "p\x03q\x03q\x03q\x07q\u0461\nq\fq\x0Eq\u0464\vq\x03q\x05q\u0467\nq\x03" +
+    "r\x03r\x05r\u046B\nr\x03r\x07r\u046E\nr\fr\x0Er\u0471\vr\x03s\x03s\x05" +
+    "s\u0475\ns\x03s\x07s\u0478\ns\fs\x0Es\u047B\vs\x03s\x05s\u047E\ns\x03" +
+    "t\x03t\x03t\x05t\u0483\nt\x03t\x03t\x03u\x03u\x03u\x05u\u048A\nu\x03v" +
+    "\x03v\x03v\x03v\x03v\x03v\x03v\x05v\u0493\nv\x03w\x03w\x03w\x05w\u0498" +
+    "\nw\x03x\x03x\x03x\x07x\u049D\nx\fx\x0Ex\u04A0\vx\x03y\x03y\x03z\x03z" +
+    "\x03{\x03{\x03{\x03|\x03|\x03}\x03}\x03~\x03~\x03~\x02\x02\x03\xD8\x7F" +
+    "\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02\x10\x02\x12\x02\x14" +
+    "\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02 \x02\"\x02$\x02&\x02(\x02" +
+    "*\x02,\x02.\x020\x022\x024\x026\x028\x02:\x02<\x02>\x02@\x02B\x02D\x02" +
+    "F\x02H\x02J\x02L\x02N\x02P\x02R\x02T\x02V\x02X\x02Z\x02\\\x02^\x02`\x02" +
+    "b\x02d\x02f\x02h\x02j\x02l\x02n\x02p\x02r\x02t\x02v\x02x\x02z\x02|\x02" +
+    "~\x02\x80\x02\x82\x02\x84\x02\x86\x02\x88\x02\x8A\x02\x8C\x02\x8E\x02" +
+    "\x90\x02\x92\x02\x94\x02\x96\x02\x98\x02\x9A\x02\x9C\x02\x9E\x02\xA0\x02" +
+    "\xA2\x02\xA4\x02\xA6\x02\xA8\x02\xAA\x02\xAC\x02\xAE\x02\xB0\x02\xB2\x02" +
+    "\xB4\x02\xB6\x02\xB8\x02\xBA\x02\xBC\x02\xBE\x02\xC0\x02\xC2\x02\xC4\x02" +
+    "\xC6\x02\xC8\x02\xCA\x02\xCC\x02\xCE\x02\xD0\x02\xD2\x02\xD4\x02\xD6\x02" +
+    "\xD8\x02\xDA\x02\xDC\x02\xDE\x02\xE0\x02\xE2\x02\xE4\x02\xE6\x02\xE8\x02" +
+    "\xEA\x02\xEC\x02\xEE\x02\xF0\x02\xF2\x02\xF4\x02\xF6\x02\xF8\x02\xFA\x02" +
+    "\x02\x12\x04\x02kk\x93\x93\x04\x02\x03\x03\n\n\x04\x02%%//\x06\x0255U" +
+    "U\x8C\x8C\x8E\x8E\x06\x02&&,,?@NN\x07\x02\'\'--FFMMSS\x04\x02rw\x7F\x80" +
+    "\x03\x02^_\x03\x02\x8D\x8E\x04\x0255UU\x04\x02``\x8B\x8B\t\x02..::ABJ" +
+    "JLLWWZZ\x04\x02\"\"33\x05\x02zz||\x81\x81\x03\x02xy\x03\x02z{\x02\u04F9" +
+    "\x02\u0100\x03\x02\x02\x02\x04\u010C\x03\x02\x02\x02\x06\u010E\x03\x02" +
+    "\x02\x02\b\u0117\x03\x02\x02\x02\n\u0119\x03\x02\x02\x02\f\u011F\x03\x02" +
+    "\x02\x02\x0E\u0122\x03\x02\x02\x02\x10\u0126\x03\x02\x02\x02\x12\u012B" +
     "\x03\x02\x02\x02\x14\u0130\x03\x02\x02\x02\x16\u013C\x03\x02\x02\x02\x18" +
     "\u013E\x03\x02\x02\x02\x1A\u0147\x03\x02\x02\x02\x1C\u014B\x03\x02\x02" +
     "\x02\x1E\u014E\x03\x02\x02\x02 \u0151\x03\x02\x02\x02\"\u0156\x03\x02" +
@@ -7013,13 +7040,13 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\x02\x02\x02\xC6\u0397\x03\x02\x02\x02\xC8\u0399\x03\x02\x02\x02\xCA\u03A2" +
     "\x03\x02\x02\x02\xCC\u03AB\x03\x02\x02\x02\xCE\u03AD\x03\x02\x02\x02\xD0" +
     "\u03AF\x03\x02\x02\x02\xD2\u03B1\x03\x02\x02\x02\xD4\u03B3\x03\x02\x02" +
-    "\x02\xD6\u03B5\x03\x02\x02\x02\xD8\u0405\x03\x02\x02\x02\xDA\u0441\x03" +
-    "\x02\x02\x02\xDC\u0446\x03\x02\x02\x02\xDE\u044E\x03\x02\x02\x02\xE0\u0455" +
-    "\x03\x02\x02\x02\xE2\u0460\x03\x02\x02\x02\xE4\u046A\x03\x02\x02\x02\xE6" +
-    "\u047A\x03\x02\x02\x02\xE8\u047E\x03\x02\x02\x02\xEA\u048A\x03\x02\x02" +
-    "\x02\xEC\u048F\x03\x02\x02\x02\xEE\u0491\x03\x02\x02\x02\xF0\u0499\x03" +
-    "\x02\x02\x02\xF2\u049B\x03\x02\x02\x02\xF4\u049D\x03\x02\x02\x02\xF6\u04A0" +
-    "\x03\x02\x02\x02\xF8\u04A2\x03\x02\x02\x02\xFA\u04A4\x03\x02\x02\x02\xFC" +
+    "\x02\xD6\u03B5\x03\x02\x02\x02\xD8\u0405\x03\x02\x02\x02\xDA\u044B\x03" +
+    "\x02\x02\x02\xDC\u044E\x03\x02\x02\x02\xDE\u0456\x03\x02\x02\x02\xE0\u045D" +
+    "\x03\x02\x02\x02\xE2\u0468\x03\x02\x02\x02\xE4\u0472\x03\x02\x02\x02\xE6" +
+    "\u0482\x03\x02\x02\x02\xE8\u0486\x03\x02\x02\x02\xEA\u0492\x03\x02\x02" +
+    "\x02\xEC\u0497\x03\x02\x02\x02\xEE\u0499\x03\x02\x02\x02\xF0\u04A1\x03" +
+    "\x02\x02\x02\xF2\u04A3\x03\x02\x02\x02\xF4\u04A5\x03\x02\x02\x02\xF6\u04A8" +
+    "\x03\x02\x02\x02\xF8\u04AA\x03\x02\x02\x02\xFA\u04AC\x03\x02\x02\x02\xFC" +
     "\xFF\x05\x04\x03\x02\xFD\xFF\x07~\x02\x02\xFE\xFC\x03\x02\x02\x02\xFE" +
     "\xFD\x03\x02\x02\x02\xFF\u0102\x03\x02\x02\x02\u0100\xFE\x03\x02\x02\x02" +
     "\u0100\u0101\x03\x02\x02\x02\u0101\u0103\x03\x02\x02\x02\u0102\u0100\x03" +
@@ -7101,40 +7128,40 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\u01AF\u01B7\x03\x02\x02\x02\u01B0\u01B1\x078\x02\x02\u01B1\u01B2\x07" +
     "f\x02\x02\u01B2\u01B3\x05\xF6|\x02\u01B3\u01B4\x07g\x02\x02\u01B4\u01B7" +
     "\x03\x02\x02\x02\u01B5\u01B7\x05:\x1E\x02\u01B6\u01A9\x03\x02\x02\x02" +
-    "\u01B6\u01AA\x03\x02\x02\x02\u01B6\u01AB\x03\x02\x02\x02\u01B6\u01B0\x03" +
-    "\x02\x02\x02\u01B6\u01B5\x03\x02\x02\x02";
-MalloyParser._serializedATNSegment1 = "\u01B79\x03\x02\x02\x02\u01B8\u01B9\x05D#\x02\u01B9\u01BA\x07q\x02\x02" +
-    "\u01BA\u01BB\x07O\x02\x02\u01BB\u01BE\x07f\x02\x02\u01BC\u01BF\x05\x18" +
-    "\r\x02\u01BD\u01BF\x05\xC6d\x02\u01BE\u01BC\x03\x02\x02\x02\u01BE\u01BD" +
-    "\x03\x02\x02\x02\u01BF\u01C0\x03\x02\x02\x02\u01C0\u01C1\x07g\x02\x02" +
-    "\u01C1;\x03\x02\x02\x02\u01C2\u01C6\x05> \x02\u01C3\u01C5\x05@!\x02\u01C4" +
-    "\u01C3\x03\x02\x02\x02\u01C5\u01C8\x03\x02\x02\x02\u01C6\u01C4\x03\x02" +
-    "\x02\x02\u01C6\u01C7\x03\x02\x02\x02\u01C7=\x03\x02\x02\x02\u01C8\u01C6" +
-    "\x03\x02\x02\x02\u01C9\u01CB\x07d\x02\x02\u01CA\u01C9\x03\x02\x02\x02" +
-    "\u01CA\u01CB\x03\x02\x02\x02\u01CB\u01CC\x03\x02\x02\x02\u01CC\u01D2\x05" +
-    "F$\x02\u01CD\u01CF\x05J&\x02\u01CE\u01D0\x05,\x17\x02\u01CF\u01CE\x03" +
-    "\x02\x02\x02\u01CF\u01D0\x03\x02\x02\x02\u01D0\u01D2\x03\x02\x02\x02\u01D1" +
-    "\u01CA\x03\x02\x02\x02\u01D1\u01CD\x03\x02\x02\x02\u01D2?\x03\x02\x02" +
-    "\x02\u01D3\u01D4\x07d\x02\x02\u01D4\u01D5\x05F$\x02\u01D5A\x03\x02\x02" +
-    "\x02\u01D6\u01D7\x07P\x02\x02\u01D7\u01D8\x07f\x02\x02\u01D8\u01D9\x05" +
-    "\xD0i\x02\u01D9\u01DA\x07g\x02\x02\u01DA\u01E3\x03\x02\x02\x02\u01DB\u01DC" +
-    "\x05D#\x02\u01DC\u01DD\x07q\x02\x02\u01DD\u01DE\x07P\x02\x02\u01DE\u01DF" +
-    "\x07f\x02\x02\u01DF\u01E0\x05\xCEh\x02\u01E0\u01E1\x07g\x02\x02\u01E1" +
-    "\u01E3\x03\x02\x02\x02\u01E2\u01D6\x03\x02\x02\x02\u01E2\u01DB\x03\x02" +
-    "\x02\x02\u01E3C\x03\x02\x02\x02\u01E4\u01E5\x05\xD2j\x02\u01E5E\x03\x02" +
-    "\x02\x02\u01E6\u01F1\x05H%\x02\u01E7\u01EC\x07j\x02\x02\u01E8\u01EB\x05" +
-    "\x8EH\x02\u01E9\u01EB\x07~\x02\x02\u01EA\u01E8\x03\x02\x02\x02\u01EA\u01E9" +
-    "\x03\x02\x02\x02\u01EB\u01EE\x03\x02\x02\x02\u01EC\u01EA\x03\x02\x02\x02" +
-    "\u01EC\u01ED\x03\x02\x02\x02\u01ED\u01EF\x03\x02\x02\x02\u01EE\u01EC\x03" +
-    "\x02\x02\x02\u01EF\u01F1\x07k\x02\x02\u01F0\u01E6\x03\x02\x02\x02\u01F0" +
-    "\u01E7\x03\x02\x02\x02\u01F1G\x03\x02\x02\x02\u01F2\u01F3\x07j\x02\x02" +
-    "\u01F3\u01F4\x07\x83\x02\x02\u01F4\u01F5\x05\xD8m\x02\u01F5\u01F6\x07" +
-    "k\x02\x02\u01F6I\x03\x02\x02\x02\u01F7\u01F8\x05\xD2j\x02\u01F8K\x03\x02" +
-    "\x02\x02\u01F9\u01FA\x05\xD2j\x02\u01FAM\x03\x02\x02\x02\u01FB\u0202\x05" +
-    "P)\x02\u01FC\u01FE\x07p\x02\x02\u01FD\u01FC\x03\x02\x02\x02\u01FD\u01FE" +
-    "\x03\x02\x02\x02\u01FE\u01FF\x03\x02\x02\x02\u01FF\u0201\x05P)\x02\u0200" +
-    "\u01FD\x03\x02\x02\x02\u0201\u0204\x03\x02\x02\x02\u0202\u0200\x03\x02" +
-    "\x02\x02\u0202\u0203\x03\x02\x02\x02\u0203\u0206\x03\x02\x02\x02\u0204" +
+    "\u01B6\u01AA\x03\x02\x02\x02";
+MalloyParser._serializedATNSegment1 = "\u01B6\u01AB\x03\x02\x02\x02\u01B6\u01B0\x03\x02\x02\x02\u01B6\u01B5\x03" +
+    "\x02\x02\x02\u01B79\x03\x02\x02\x02\u01B8\u01B9\x05D#\x02\u01B9\u01BA" +
+    "\x07q\x02\x02\u01BA\u01BB\x07O\x02\x02\u01BB\u01BE\x07f\x02\x02\u01BC" +
+    "\u01BF\x05\x18\r\x02\u01BD\u01BF\x05\xC6d\x02\u01BE\u01BC\x03\x02\x02" +
+    "\x02\u01BE\u01BD\x03\x02\x02\x02\u01BF\u01C0\x03\x02\x02\x02\u01C0\u01C1" +
+    "\x07g\x02\x02\u01C1;\x03\x02\x02\x02\u01C2\u01C6\x05> \x02\u01C3\u01C5" +
+    "\x05@!\x02\u01C4\u01C3\x03\x02\x02\x02\u01C5\u01C8\x03\x02\x02\x02\u01C6" +
+    "\u01C4\x03\x02\x02\x02\u01C6\u01C7\x03\x02\x02\x02\u01C7=\x03\x02\x02" +
+    "\x02\u01C8\u01C6\x03\x02\x02\x02\u01C9\u01CB\x07d\x02\x02\u01CA\u01C9" +
+    "\x03\x02\x02\x02\u01CA\u01CB\x03\x02\x02\x02\u01CB\u01CC\x03\x02\x02\x02" +
+    "\u01CC\u01D2\x05F$\x02\u01CD\u01CF\x05J&\x02\u01CE\u01D0\x05,\x17\x02" +
+    "\u01CF\u01CE\x03\x02\x02\x02\u01CF\u01D0\x03\x02\x02\x02\u01D0\u01D2\x03" +
+    "\x02\x02\x02\u01D1\u01CA\x03\x02\x02\x02\u01D1\u01CD\x03\x02\x02\x02\u01D2" +
+    "?\x03\x02\x02\x02\u01D3\u01D4\x07d\x02\x02\u01D4\u01D5\x05F$\x02\u01D5" +
+    "A\x03\x02\x02\x02\u01D6\u01D7\x07P\x02\x02\u01D7\u01D8\x07f\x02\x02\u01D8" +
+    "\u01D9\x05\xD0i\x02\u01D9\u01DA\x07g\x02\x02\u01DA\u01E3\x03\x02\x02\x02" +
+    "\u01DB\u01DC\x05D#\x02\u01DC\u01DD\x07q\x02\x02\u01DD\u01DE\x07P\x02\x02" +
+    "\u01DE\u01DF\x07f\x02\x02\u01DF\u01E0\x05\xCEh\x02\u01E0\u01E1\x07g\x02" +
+    "\x02\u01E1\u01E3\x03\x02\x02\x02\u01E2\u01D6\x03\x02\x02\x02\u01E2\u01DB" +
+    "\x03\x02\x02\x02\u01E3C\x03\x02\x02\x02\u01E4\u01E5\x05\xD2j\x02\u01E5" +
+    "E\x03\x02\x02\x02\u01E6\u01F1\x05H%\x02\u01E7\u01EC\x07j\x02\x02\u01E8" +
+    "\u01EB\x05\x8EH\x02\u01E9\u01EB\x07~\x02\x02\u01EA\u01E8\x03\x02\x02\x02" +
+    "\u01EA\u01E9\x03\x02\x02\x02\u01EB\u01EE\x03\x02\x02\x02\u01EC\u01EA\x03" +
+    "\x02\x02\x02\u01EC\u01ED\x03\x02\x02\x02\u01ED\u01EF\x03\x02\x02\x02\u01EE" +
+    "\u01EC\x03\x02\x02\x02\u01EF\u01F1\x07k\x02\x02\u01F0\u01E6\x03\x02\x02" +
+    "\x02\u01F0\u01E7\x03\x02\x02\x02\u01F1G\x03\x02\x02\x02\u01F2\u01F3\x07" +
+    "j\x02\x02\u01F3\u01F4\x07\x83\x02\x02\u01F4\u01F5\x05\xD8m\x02\u01F5\u01F6" +
+    "\x07k\x02\x02\u01F6I\x03\x02\x02\x02\u01F7\u01F8\x05\xD2j\x02\u01F8K\x03" +
+    "\x02\x02\x02\u01F9\u01FA\x05\xD2j\x02\u01FAM\x03\x02\x02\x02\u01FB\u0202" +
+    "\x05P)\x02\u01FC\u01FE\x07p\x02\x02\u01FD\u01FC\x03\x02\x02\x02\u01FD" +
+    "\u01FE\x03\x02\x02\x02\u01FE\u01FF\x03\x02\x02\x02\u01FF\u0201\x05P)\x02" +
+    "\u0200\u01FD\x03\x02\x02\x02\u0201\u0204\x03\x02\x02\x02\u0202\u0200\x03" +
+    "\x02\x02\x02\u0202\u0203\x03\x02\x02\x02\u0203\u0206\x03\x02\x02\x02\u0204" +
     "\u0202\x03\x02\x02\x02\u0205\u0207\x07p\x02\x02\u0206\u0205\x03\x02\x02" +
     "\x02\u0206\u0207\x03\x02\x02\x02\u0207O\x03\x02\x02\x02\u0208\u0209\x05" +
     "\f\x07\x02\u0209\u020A\x05T+\x02\u020A\u020B\x05\x0E\b\x02\u020B\u020C" +
@@ -7396,53 +7423,57 @@ MalloyParser._serializedATNSegment1 = "\u01B79\x03\x02\x02\x02\u01B8\u01B9\x05D#
     "\x02\x02\u043B\u042D\x03\x02\x02\x02\u043B\u0432\x03\x02\x02\x02\u043B" +
     "\u0435\x03\x02\x02\x02\u043B\u0438\x03\x02\x02\x02\u043C\u043F\x03\x02" +
     "\x02\x02\u043D\u043B\x03\x02\x02\x02\u043D\u043E\x03\x02\x02\x02\u043E" +
-    "\xD9\x03\x02\x02\x02\u043F\u043D\x03\x02\x02\x02\u0440\u0442\x05\xC2b" +
-    "\x02\u0441\u0440\x03\x02\x02\x02\u0441\u0442\x03\x02\x02\x02\u0442\u0443" +
-    "\x03\x02\x02\x02\u0443\u0444\x05\xD8m\x02\u0444\xDB\x03\x02\x02\x02\u0445" +
-    "\u0447\x05\xDEp\x02\u0446\u0445\x03\x02\x02\x02\u0447\u0448\x03\x02\x02" +
-    "\x02\u0448\u0446\x03\x02\x02\x02\u0448\u0449\x03\x02\x02\x02\u0449\u044C" +
-    "\x03\x02\x02\x02\u044A\u044B\x071\x02\x02\u044B\u044D\x05\xD8m\x02\u044C" +
-    "\u044A\x03\x02\x02\x02\u044C\u044D\x03\x02\x02\x02\u044D\xDD\x03\x02\x02" +
-    "\x02\u044E\u0450\x07I\x02\x02\u044F\u0451\x05\xD8m\x02\u0450\u044F\x03" +
-    "\x02\x02\x02\u0450\u0451\x03\x02\x02\x02\u0451\u0452\x03\x02\x02\x02\u0452" +
-    "\u0453\x07X\x02\x02\u0453\u0454\x05\xDAn\x02\u0454\xDF\x03\x02\x02\x02" +
-    "\u0455\u045A\x05\xD8m\x02\u0456\u0457\x07p\x02\x02\u0457\u0459\x05\xD8" +
-    "m\x02\u0458\u0456\x03\x02\x02\x02\u0459\u045C\x03\x02\x02\x02\u045A\u0458" +
-    "\x03\x02\x02\x02\u045A\u045B\x03\x02\x02\x02\u045B\u045E\x03\x02\x02\x02" +
-    "\u045C\u045A\x03\x02\x02\x02\u045D\u045F\x07p\x02\x02\u045E\u045D\x03" +
-    "\x02\x02\x02\u045E\u045F\x03\x02\x02\x02\u045F\xE1\x03\x02\x02\x02\u0460" +
-    "\u0467";
-MalloyParser._serializedATNSegment2 = "\x05\xF2z\x02\u0461\u0463\x07p\x02\x02\u0462\u0461\x03\x02\x02\x02\u0462" +
-    "\u0463\x03\x02\x02\x02\u0463\u0464\x03\x02\x02\x02\u0464\u0466\x05\xF2" +
-    "z\x02\u0465\u0462\x03\x02\x02\x02\u0466\u0469\x03\x02\x02\x02\u0467\u0465" +
-    "\x03\x02\x02\x02\u0467\u0468\x03\x02\x02\x02\u0468\xE3\x03\x02\x02\x02" +
-    "\u0469\u0467\x03\x02\x02\x02\u046A\u0471\x05\xECw\x02\u046B\u046D\x07" +
-    "p\x02\x02\u046C\u046B\x03\x02\x02\x02\u046C\u046D\x03\x02\x02\x02\u046D" +
-    "\u046E\x03\x02\x02\x02\u046E\u0470\x05\xECw\x02\u046F\u046C\x03\x02\x02" +
-    "\x02\u0470\u0473\x03\x02\x02\x02\u0471\u046F\x03\x02\x02\x02\u0471\u0472" +
-    "\x03\x02\x02\x02\u0472\u0475\x03\x02\x02\x02\u0473\u0471\x03\x02\x02\x02" +
-    "\u0474\u0476\x07p\x02\x02\u0475\u0474\x03\x02\x02\x02\u0475\u0476\x03" +
-    "\x02\x02\x02\u0476\xE5\x03\x02\x02\x02\u0477\u0478\x05\xEEx\x02\u0478" +
-    "\u0479\x07q\x02\x02\u0479\u047B\x03\x02\x02\x02\u047A\u0477\x03\x02\x02" +
-    "\x02\u047A\u047B\x03\x02\x02\x02\u047B\u047C\x03\x02\x02\x02\u047C\u047D" +
-    "\t\x11\x02\x02\u047D\xE7\x03\x02\x02\x02\u047E\u047F\x05\f\x07\x02\u047F" +
-    "\u0481\x05\xEEx\x02\u0480\u0482\x05\xEAv\x02\u0481\u0480\x03\x02\x02\x02" +
-    "\u0481\u0482\x03\x02\x02\x02\u0482\xE9\x03\x02\x02\x02\u0483\u0484\x07" +
-    "q\x02\x02\u0484\u048B\x05\xD4k\x02\u0485\u0486\x07q\x02\x02\u0486\u0487" +
-    "\x05\xBE`\x02\u0487\u0488\x07f\x02\x02\u0488\u0489\x07g\x02\x02\u0489" +
-    "\u048B\x03\x02\x02\x02\u048A\u0483\x03\x02\x02\x02\u048A\u0485\x03\x02" +
-    "\x02\x02\u048B\xEB\x03\x02\x02\x02\u048C\u0490\x05\xE8u\x02\u048D\u0490" +
-    "\x05\xE6t\x02\u048E\u0490\x05f4\x02\u048F\u048C\x03\x02\x02\x02\u048F" +
-    "\u048D\x03\x02\x02\x02\u048F\u048E\x03\x02\x02\x02\u0490\xED\x03\x02\x02" +
-    "\x02\u0491\u0496\x05\xF2z\x02\u0492\u0493\x07q\x02\x02\u0493\u0495\x05" +
-    "\xF2z\x02\u0494\u0492\x03\x02\x02\x02\u0495\u0498\x03\x02\x02\x02\u0496" +
-    "\u0494\x03\x02\x02\x02\u0496\u0497\x03\x02\x02\x02\u0497\xEF\x03\x02\x02" +
-    "\x02\u0498\u0496\x03\x02\x02\x02\u0499\u049A\x05\xD2j\x02\u049A\xF1\x03" +
-    "\x02\x02\x02\u049B\u049C\x05\xD2j\x02\u049C\xF3\x03\x02\x02\x02\u049D" +
-    "\u049E\x05\xD8m\x02\u049E\u049F\x07\x02\x02\x03\u049F\xF5\x03\x02\x02" +
-    "\x02\u04A0\u04A1\x05\xD2j\x02\u04A1\xF7\x03\x02\x02\x02\u04A2\u04A3\x05" +
-    "\xD2j\x02\u04A3\xF9\x03\x02\x02\x02\u04A4\u04A5\x05\xC4c\x02\u04A5\xFB" +
-    "\x03\x02\x02\x02\x7F\xFE\u0100\u010C\u0117\u011F\u0134\u013C\u0142\u0153" +
+    "\xD9\x03\x02\x02\x02\u043F\u043D\x03\x02\x02\x02\u0440\u0442\x07f\x02" +
+    "\x02\u0441\u0443\x05\xC2b\x02\u0442\u0441\x03\x02\x02\x02\u0442\u0443" +
+    "\x03\x02\x02\x02\u0443\u0444\x03\x02\x02\x02\u0444\u0445\x05\xD8m\x02" +
+    "\u0445\u0446\x07g\x02\x02\u0446\u044C\x03\x02\x02\x02\u0447\u0449\x05" +
+    "\xC2b\x02\u0448\u0447\x03\x02\x02\x02\u0448\u0449\x03\x02\x02\x02\u0449" +
+    "\u044A\x03\x02\x02\x02\u044A\u044C\x05\xD8m\x02\u044B\u0440\x03\x02\x02" +
+    "\x02\u044B\u0448\x03\x02\x02\x02\u044C\xDB\x03\x02\x02\x02\u044D\u044F" +
+    "\x05\xDEp\x02\u044E\u044D\x03\x02\x02\x02\u044F\u0450\x03\x02\x02\x02" +
+    "\u0450\u044E\x03\x02\x02\x02\u0450\u0451\x03\x02\x02\x02\u0451\u0454\x03" +
+    "\x02\x02\x02\u0452\u0453\x071\x02\x02\u0453\u0455\x05\xD8m\x02\u0454\u0452" +
+    "\x03\x02\x02\x02\u0454\u0455\x03\x02\x02\x02\u0455\xDD\x03\x02\x02\x02" +
+    "\u0456\u0458\x07I\x02\x02\u0457\u0459\x05\xD8m\x02\u0458\u0457\x03\x02" +
+    "\x02\x02\u0458\u0459\x03\x02\x02\x02\u0459\u045A\x03\x02\x02\x02\u045A" +
+    "\u045B\x07X\x02\x02\u045B\u045C\x05\xDAn\x02\u045C\xDF\x03\x02\x02\x02" +
+    "\u045D\u0462";
+MalloyParser._serializedATNSegment2 = "\x05\xD8m\x02\u045E\u045F\x07p\x02\x02\u045F\u0461\x05\xD8m\x02\u0460" +
+    "\u045E\x03\x02\x02\x02\u0461\u0464\x03\x02\x02\x02\u0462\u0460\x03\x02" +
+    "\x02\x02\u0462\u0463\x03\x02\x02\x02\u0463\u0466\x03\x02\x02\x02\u0464" +
+    "\u0462\x03\x02\x02\x02\u0465\u0467\x07p\x02\x02\u0466\u0465\x03\x02\x02" +
+    "\x02\u0466\u0467\x03\x02\x02\x02\u0467\xE1\x03\x02\x02\x02\u0468\u046F" +
+    "\x05\xF2z\x02\u0469\u046B\x07p\x02\x02\u046A\u0469\x03\x02\x02\x02\u046A" +
+    "\u046B\x03\x02\x02\x02\u046B\u046C\x03\x02\x02\x02\u046C\u046E\x05\xF2" +
+    "z\x02\u046D\u046A\x03\x02\x02\x02\u046E\u0471\x03\x02\x02\x02\u046F\u046D" +
+    "\x03\x02\x02\x02\u046F\u0470\x03\x02\x02\x02\u0470\xE3\x03\x02\x02\x02" +
+    "\u0471\u046F\x03\x02\x02\x02\u0472\u0479\x05\xECw\x02\u0473\u0475\x07" +
+    "p\x02\x02\u0474\u0473\x03\x02\x02\x02\u0474\u0475\x03\x02\x02\x02\u0475" +
+    "\u0476\x03\x02\x02\x02\u0476\u0478\x05\xECw\x02\u0477\u0474\x03\x02\x02" +
+    "\x02\u0478\u047B\x03\x02\x02\x02\u0479\u0477\x03\x02\x02\x02\u0479\u047A" +
+    "\x03\x02\x02\x02\u047A\u047D\x03\x02\x02\x02\u047B\u0479\x03\x02\x02\x02" +
+    "\u047C\u047E\x07p\x02\x02\u047D\u047C\x03\x02\x02\x02\u047D\u047E\x03" +
+    "\x02\x02\x02\u047E\xE5\x03\x02\x02\x02\u047F\u0480\x05\xEEx\x02\u0480" +
+    "\u0481\x07q\x02\x02\u0481\u0483\x03\x02\x02\x02\u0482\u047F\x03\x02\x02" +
+    "\x02\u0482\u0483\x03\x02\x02\x02\u0483\u0484\x03\x02\x02\x02\u0484\u0485" +
+    "\t\x11\x02\x02\u0485\xE7\x03\x02\x02\x02\u0486\u0487\x05\f\x07\x02\u0487" +
+    "\u0489\x05\xEEx\x02\u0488\u048A\x05\xEAv\x02\u0489\u0488\x03\x02\x02\x02" +
+    "\u0489\u048A\x03\x02\x02\x02\u048A\xE9\x03\x02\x02\x02\u048B\u048C\x07" +
+    "q\x02\x02\u048C\u0493\x05\xD4k\x02\u048D\u048E\x07q\x02\x02\u048E\u048F" +
+    "\x05\xBE`\x02\u048F\u0490\x07f\x02\x02\u0490\u0491\x07g\x02\x02\u0491" +
+    "\u0493\x03\x02\x02\x02\u0492\u048B\x03\x02\x02\x02\u0492\u048D\x03\x02" +
+    "\x02\x02\u0493\xEB\x03\x02\x02\x02\u0494\u0498\x05\xE8u\x02\u0495\u0498" +
+    "\x05\xE6t\x02\u0496\u0498\x05f4\x02\u0497\u0494\x03\x02\x02\x02\u0497" +
+    "\u0495\x03\x02\x02\x02\u0497\u0496\x03\x02\x02\x02\u0498\xED\x03\x02\x02" +
+    "\x02\u0499\u049E\x05\xF2z\x02\u049A\u049B\x07q\x02\x02\u049B\u049D\x05" +
+    "\xF2z\x02\u049C\u049A\x03\x02\x02\x02\u049D\u04A0\x03\x02\x02\x02\u049E" +
+    "\u049C\x03\x02\x02\x02\u049E\u049F\x03\x02\x02\x02\u049F\xEF\x03\x02\x02" +
+    "\x02\u04A0\u049E\x03\x02\x02\x02\u04A1\u04A2\x05\xD2j\x02\u04A2\xF1\x03" +
+    "\x02\x02\x02\u04A3\u04A4\x05\xD2j\x02\u04A4\xF3\x03\x02\x02\x02\u04A5" +
+    "\u04A6\x05\xD8m\x02\u04A6\u04A7\x07\x02\x02\x03\u04A7\xF5\x03\x02\x02" +
+    "\x02\u04A8\u04A9\x05\xD2j\x02\u04A9\xF7\x03\x02\x02\x02\u04AA\u04AB\x05" +
+    "\xD2j\x02\u04AB\xF9\x03\x02\x02\x02\u04AC\u04AD\x05\xC4c\x02\u04AD\xFB" +
+    "\x03\x02\x02\x02\x81\xFE\u0100\u010C\u0117\u011F\u0134\u013C\u0142\u0153" +
     "\u0158\u015D\u0163\u0168\u016C\u0176\u017B\u017E\u0183\u0189\u018D\u0193" +
     "\u0197\u0199\u019C\u01A3\u01A7\u01B6\u01BE\u01C6\u01CA\u01CF\u01D1\u01E2" +
     "\u01EA\u01EC\u01F0\u01FD\u0202\u0206\u0211\u021A\u021C\u0221\u0236\u0239" +
@@ -7451,8 +7482,8 @@ MalloyParser._serializedATNSegment2 = "\x05\xF2z\x02\u0461\u0463\x07p\x02\x02\u0
     "\u02DF\u02E3\u02EA\u0303\u030D\u0312\u0316\u031A\u0322\u0327\u032B\u0330" +
     "\u0337\u034A\u034F\u0353\u0357\u035A\u0363\u0368\u036D\u0371\u0375\u037A" +
     "\u0381\u0395\u03A2\u03AB\u03CE\u03D4\u03DF\u03E4\u03EB\u03ED\u03F0\u03F4" +
-    "\u0400\u0405\u043B\u043D\u0441\u0448\u044C\u0450\u045A\u045E\u0462\u0467" +
-    "\u046C\u0471\u0475\u047A\u0481\u048A\u048F\u0496";
+    "\u0400\u0405\u043B\u043D\u0442\u0448\u044B\u0450\u0454\u0458\u0462\u0466" +
+    "\u046A\u046F\u0474\u0479\u047D\u0482\u0489\u0492\u0497\u049E";
 MalloyParser._serializedATN = Utils.join([
     MalloyParser._serializedATNSegment0,
     MalloyParser._serializedATNSegment1,
@@ -13822,9 +13853,11 @@ class ExprUngroupContext extends FieldExprContext {
 }
 exports.ExprUngroupContext = ExprUngroupContext;
 class PartialAllowedFieldExprContext extends ParserRuleContext_1.ParserRuleContext {
+    OPAREN() { return this.tryGetToken(MalloyParser.OPAREN, 0); }
     fieldExpr() {
         return this.getRuleContext(0, FieldExprContext);
     }
+    CPAREN() { return this.tryGetToken(MalloyParser.CPAREN, 0); }
     compareOp() {
         return this.tryGetRuleContext(0, CompareOpContext);
     }

package/dist/lang/test/parse.spec.js

@@ -1390,6 +1390,9 @@ describe('expressions', () => {
         test.each(noOffset.map(x => [x]))('disallow date delta %s', unit => {
             expect(new test_translator_1.BetaExpression(`ad + 10 ${unit}s`)).translationToFailWith(`Cannot offset date by ${unit}`);
         });
+        test('apply with parens', () => {
+            expect((0, test_translator_1.expr) `ai ? (> 1 & < 100)`).toTranslate();
+        });
     });
     test('filtered measure', () => {
         expect((0, test_translator_1.expr) `acount {? astr = 'why?' }`).toTranslate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.75-dev230815172342",
+  "version": "0.0.75-dev230815210351",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",