@malloydata/malloy 0.0.123-dev240203154014 → 0.0.123-dev240205203117

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

@@ -26,9 +26,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefExploreEditFieldContext = exports.DefExploreRenameContext = exports.DefExplorePrimaryKeyContext = exports.DefExploreWhere_stubContext = exports.DefJoin_stubContext = exports.DefDeclare_stubContext = exports.DefExploreMeasure_stubContext = exports.DefExploreDimension_stubContext = exports.ExploreStatementContext = exports.ExplorePropertiesContext = exports.SourceIDContext = exports.SourceNameDefContext = exports.SqExploreContext = exports.SourceDefinitionContext = exports.SourcePropertyListContext = exports.QueryNameContext = exports.FilterShortcutContext = exports.QueryPropertiesContext = exports.ConnectionIdContext = exports.TableMethodContext = exports.TableFunctionContext = exports.ExploreTableContext = exports.SqlSourceContext = exports.TurtleNameContext = exports.RefineOperatorContext = exports.TopLevelQueryDefContext = exports.TopLevelQueryDefsContext = exports.IgnoredModelAnnotationsContext = exports.IgnoredObjectAnnotationsContext = exports.DocAnnotationsContext = exports.ImportURLContext = exports.ImportItemContext = exports.ImportSelectContext = exports.ImportStatementContext = exports.SqlInterpolationContext = exports.SqlStringContext = exports.BlockSQLDefContext = exports.SqlBlockContext = exports.DefineSQLStatementContext = exports.RunStatementContext = exports.IsDefineContext = exports.TagsContext = exports.TopLevelAnonQueryDefContext = exports.AnonymousQueryContext = exports.Use_top_level_query_defsContext = exports.DefineQueryContext = exports.DefineSourceStatementContext = exports.MalloyStatementContext = exports.MalloyDocumentContext = exports.MalloyParser = void 0;
 exports.FieldPropertyLimitStatementContext = exports.AggregateOrderByStatementContext = exports.AggregateOrderBySpecContext = exports.AggregateOrderingContext = exports.FieldPropertiesContext = exports.FilterStatementContext = exports.JoinExpressionContext = exports.JoinOnContext = exports.JoinWithContext = exports.JoinDefContext = exports.MatrixOperationContext = exports.IsExploreContext = exports.JoinListContext = exports.QueryExtendStatementListContext = exports.QueryExtendStatementContext = exports.VArrowContext = exports.VSegContext = exports.VExprContext = exports.SegRefineContext = exports.SegParenContext = exports.SegOpsContext = exports.SegFieldContext = exports.SegExprContext = exports.SQSQLContext = exports.SQTableContext = exports.SQExtendedSourceContext = exports.SQArrowContext = exports.SQRefinedQueryContext = exports.SQParensContext = exports.SQIDContext = exports.SqExprContext = exports.ModEitherContext = exports.QueryExtendContext = exports.DefJoinCrossContext = exports.DefJoinManyContext = exports.DefJoinOneContext = exports.JoinStatementContext = exports.DeclareStatementContext = exports.JoinNameDefContext = exports.FieldNameDefContext = exports.FieldDefContext = exports.DefListContext = exports.ExploreRenameDefContext = exports.RenameListContext = exports.DefDimensionsContext = exports.DefMeasuresContext = exports.DefIgnoreModel_stubContext = exports.DefExploreAnnotationContext = exports.DefExploreTimezoneContext = exports.DefExploreQueryContext = void 0;
-exports.LiteralTimestampContext = exports.DateLiteralContext = exports.ExprNowContext = exports.ExprRegexContext = exports.ExprBoolContext = exports.ExprNULLContext = exports.ExprTimeContext = exports.ExprNumberContext = exports.ExprStringContext = exports.LiteralContext = exports.NumericLiteralContext = exports.ShortStringContext = exports.StringContext = exports.CompareOpContext = exports.MalloyTypeContext = exports.AggregateContext = exports.SampleSpecContext = exports.QueryAnnotationContext = exports.TimezoneStatementContext = exports.SampleStatementContext = exports.IndexStatementContext = exports.IndexFieldsContext = exports.IndexElementContext = exports.TopStatementContext = exports.BySpecContext = exports.LimitStatementContext = exports.OrderBySpecContext = exports.OrderingContext = exports.OrderByStatementContext = exports.PartitionByStatementContext = exports.ProjectStatementContext = exports.CalculateStatementContext = exports.AggregateStatementContext = exports.NestDefContext = exports.NestExistingContext = exports.NestEntryContext = exports.NestedQueryListContext = exports.NestStatementContext = exports.QueryFieldEntryContext = exports.QueryFieldListContext = exports.GroupByStatementContext = exports.QueryJoinStatementContext = exports.QueryStatementContext = exports.ExploreQueryDefContext = exports.ExploreQueryNameDefContext = exports.SubQueryDefListContext = exports.HavingStatementContext = exports.WhereStatementContext = exports.FilterClauseListContext = exports.FieldPropertyStatementContext = void 0;
-exports.TaggedRefContext = exports.StarQualifiedContext = exports.CollectionWildCardContext = exports.FieldCollectionContext = exports.FieldNameListContext = exports.ArgumentListContext = exports.PickContext = exports.PickStatementContext = exports.PartialAllowedFieldExprContext = exports.ExprUngroupContext = exports.ExprPickContext = exports.ExprFuncContext = exports.ExprAggFuncContext = exports.ExprExprContext = exports.ExprAggregateContext = exports.ExprPathlessAggregateContext = exports.ExprCountDisinctContext = exports.ExprCoalesceContext = exports.ExprLogicalOrContext = exports.ExprLogicalAndContext = exports.ExprNotContext = exports.ExprApplyContext = exports.ExprCompareContext = exports.ExprOrTreeContext = exports.ExprAndTreeContext = exports.ExprForRangeContext = exports.ExprRangeContext = exports.ExprAddSubContext = exports.ExprMulDivContext = exports.ExprMinusContext = exports.ExprSafeCastContext = exports.ExprCastContext = exports.ExprTimeTruncContext = exports.ExprDurationContext = exports.ExprLiteralContext = exports.ExprFieldPropsContext = exports.ExprFieldPathContext = exports.FieldExprContext = exports.MalloyOrSQLTypeContext = exports.UngroupContext = exports.TimeframeContext = exports.IdContext = exports.TableURIContext = exports.TablePathContext = exports.LiteralYearContext = exports.LiteralQuarterContext = exports.LiteralMonthContext = exports.LiteralWeekContext = exports.LiteralDayContext = exports.LiteralHourContext = void 0;
-exports.ExperimentalStatementForTestingContext = exports.ConnectionNameContext = exports.NameSQLBlockContext = exports.SqlExploreNameRefContext = exports.JustExprContext = exports.FieldNameContext = exports.JoinNameContext = exports.FieldPathContext = exports.CollectionMemberContext = exports.RefExprContext = void 0;
+exports.LiteralHourContext = exports.LiteralTimestampContext = exports.DateLiteralContext = exports.ExprNowContext = exports.ExprRegexContext = exports.ExprBoolContext = exports.ExprNULLContext = exports.ExprTimeContext = exports.ExprNumberContext = exports.ExprStringContext = exports.LiteralContext = exports.NumericLiteralContext = exports.ShortStringContext = exports.StringContext = exports.CompareOpContext = exports.MalloyTypeContext = exports.AggregateContext = exports.SampleSpecContext = exports.QueryAnnotationContext = exports.TimezoneStatementContext = exports.SampleStatementContext = exports.IndexStatementContext = exports.IndexFieldsContext = exports.IndexElementContext = exports.TopStatementContext = exports.BySpecContext = exports.LimitStatementContext = exports.OrderBySpecContext = exports.OrderingContext = exports.OrderByStatementContext = exports.PartitionByStatementContext = exports.ProjectStatementContext = exports.CalculateStatementContext = exports.AggregateStatementContext = exports.NestDefContext = exports.NestEntryContext = exports.NestedQueryListContext = exports.NestStatementContext = exports.QueryFieldEntryContext = exports.QueryFieldListContext = exports.GroupByStatementContext = exports.QueryJoinStatementContext = exports.QueryStatementContext = exports.ExploreQueryDefContext = exports.ExploreQueryNameDefContext = exports.SubQueryDefListContext = exports.HavingStatementContext = exports.WhereStatementContext = exports.FilterClauseListContext = exports.FieldPropertyStatementContext = void 0;
+exports.RefExprContext = exports.TaggedRefContext = exports.StarQualifiedContext = exports.CollectionWildCardContext = exports.FieldCollectionContext = exports.FieldNameListContext = exports.ArgumentListContext = exports.PickContext = exports.PickStatementContext = exports.PartialAllowedFieldExprContext = exports.ExprUngroupContext = exports.ExprPickContext = exports.ExprFuncContext = exports.ExprAggFuncContext = exports.ExprExprContext = exports.ExprAggregateContext = exports.ExprPathlessAggregateContext = exports.ExprCountDisinctContext = exports.ExprCoalesceContext = exports.ExprLogicalOrContext = exports.ExprLogicalAndContext = exports.ExprNotContext = exports.ExprApplyContext = exports.ExprCompareContext = exports.ExprOrTreeContext = exports.ExprAndTreeContext = exports.ExprForRangeContext = exports.ExprRangeContext = exports.ExprAddSubContext = exports.ExprMulDivContext = exports.ExprMinusContext = exports.ExprSafeCastContext = exports.ExprCastContext = exports.ExprTimeTruncContext = exports.ExprDurationContext = exports.ExprLiteralContext = exports.ExprFieldPropsContext = exports.ExprFieldPathContext = exports.FieldExprContext = exports.MalloyOrSQLTypeContext = exports.UngroupContext = exports.TimeframeContext = exports.IdContext = exports.TableURIContext = exports.TablePathContext = exports.LiteralYearContext = exports.LiteralQuarterContext = exports.LiteralMonthContext = exports.LiteralWeekContext = exports.LiteralDayContext = void 0;
+exports.ExperimentalStatementForTestingContext = exports.ConnectionNameContext = exports.NameSQLBlockContext = exports.SqlExploreNameRefContext = exports.JustExprContext = exports.FieldNameContext = exports.JoinNameContext = exports.FieldPathContext = exports.CollectionMemberContext = void 0;
 const ATN_1 = require("antlr4ts/atn/ATN");
 const ATNDeserializer_1 = require("antlr4ts/atn/ATNDeserializer");
 const FailedPredicateException_1 = require("antlr4ts/FailedPredicateException");
@@ -3258,29 +3258,90 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 124, MalloyParser.RULE_aggregateOrderBySpec);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
-            {
-                this.state = 727;
-                this.fieldExpr(0);
-                this.state = 729;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                if (_la === MalloyParser.ASC || _la === MalloyParser.DESC) {
+            this.state = 733;
+            this._errHandler.sync(this);
+            switch (this._input.LA(1)) {
+                case MalloyParser.ALL:
+                case MalloyParser.AVG:
+                case MalloyParser.CAST:
+                case MalloyParser.COUNT:
+                case MalloyParser.DAY:
+                case MalloyParser.EXCLUDE:
+                case MalloyParser.FALSE:
+                case MalloyParser.HOUR:
+                case MalloyParser.MAX:
+                case MalloyParser.MIN:
+                case MalloyParser.MINUTE:
+                case MalloyParser.MONTH:
+                case MalloyParser.NOT:
+                case MalloyParser.NOW:
+                case MalloyParser.NULL:
+                case MalloyParser.PICK:
+                case MalloyParser.QUARTER:
+                case MalloyParser.SECOND:
+                case MalloyParser.SOURCE_KW:
+                case MalloyParser.SUM:
+                case MalloyParser.TRUE:
+                case MalloyParser.WEEK:
+                case MalloyParser.YEAR:
+                case MalloyParser.HACKY_REGEX:
+                case MalloyParser.SQ_STRING:
+                case MalloyParser.DQ_STRING:
+                case MalloyParser.BQ_STRING:
+                case MalloyParser.OPAREN:
+                case MalloyParser.MINUS:
+                case MalloyParser.LITERAL_TIMESTAMP:
+                case MalloyParser.LITERAL_HOUR:
+                case MalloyParser.LITERAL_DAY:
+                case MalloyParser.LITERAL_QUARTER:
+                case MalloyParser.LITERAL_MONTH:
+                case MalloyParser.LITERAL_WEEK:
+                case MalloyParser.LITERAL_YEAR:
+                case MalloyParser.IDENTIFIER:
+                case MalloyParser.NUMERIC_LITERAL:
+                case MalloyParser.INTEGER_LITERAL:
+                case MalloyParser.SQL_BEGIN:
+                    this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 728;
+                        this.state = 727;
+                        this.fieldExpr(0);
+                        this.state = 729;
+                        this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        if (!(_la === MalloyParser.ASC || _la === MalloyParser.DESC)) {
-                            this._errHandler.recoverInline(this);
-                        }
-                        else {
-                            if (this._input.LA(1) === Token_1.Token.EOF) {
-                                this.matchedEOF = true;
+                        if (_la === MalloyParser.ASC || _la === MalloyParser.DESC) {
+                            {
+                                this.state = 728;
+                                _la = this._input.LA(1);
+                                if (!(_la === MalloyParser.ASC || _la === MalloyParser.DESC)) {
+                                    this._errHandler.recoverInline(this);
+                                }
+                                else {
+                                    if (this._input.LA(1) === Token_1.Token.EOF) {
+                                        this.matchedEOF = true;
+                                    }
+                                    this._errHandler.reportMatch(this);
+                                    this.consume();
+                                }
                             }
-                            this._errHandler.reportMatch(this);
-                            this.consume();
                         }
                     }
-                }
+                    break;
+                case MalloyParser.ASC:
+                    this.enterOuterAlt(_localctx, 2);
+                    {
+                        this.state = 731;
+                        this.match(MalloyParser.ASC);
+                    }
+                    break;
+                case MalloyParser.DESC:
+                    this.enterOuterAlt(_localctx, 3);
+                    {
+                        this.state = 732;
+                        this.match(MalloyParser.DESC);
+                    }
+                    break;
+                default:
+                    throw new NoViableAltException_1.NoViableAltException(this);
             }
         }
         catch (re) {
@@ -3305,9 +3366,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 731;
+                this.state = 735;
                 this.match(MalloyParser.ORDER_BY);
-                this.state = 732;
+                this.state = 736;
                 this.aggregateOrdering();
             }
         }
@@ -3333,7 +3394,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 734;
+                this.state = 738;
                 this.limitStatement();
             }
         }
@@ -3357,34 +3418,34 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new FieldPropertyStatementContext(this._ctx, this.state);
         this.enterRule(_localctx, 130, MalloyParser.RULE_fieldPropertyStatement);
         try {
-            this.state = 740;
+            this.state = 744;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.WHERE:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 736;
+                        this.state = 740;
                         this.whereStatement();
                     }
                     break;
                 case MalloyParser.PARTITION_BY:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 737;
+                        this.state = 741;
                         this.partitionByStatement();
                     }
                     break;
                 case MalloyParser.ORDER_BY:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 738;
+                        this.state = 742;
                         this.aggregateOrderByStatement();
                     }
                     break;
                 case MalloyParser.LIMIT:
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 739;
+                        this.state = 743;
                         this.fieldPropertyLimitStatement();
                     }
                     break;
@@ -3416,32 +3477,32 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 742;
+                this.state = 746;
                 this.fieldExpr(0);
-                this.state = 747;
+                this.state = 751;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 65, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 66, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 743;
+                                this.state = 747;
                                 this.match(MalloyParser.COMMA);
-                                this.state = 744;
+                                this.state = 748;
                                 this.fieldExpr(0);
                             }
                         }
                     }
-                    this.state = 749;
+                    this.state = 753;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 65, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 66, this._ctx);
                 }
-                this.state = 751;
+                this.state = 755;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 750;
+                        this.state = 754;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -3469,9 +3530,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 753;
+                this.state = 757;
                 this.match(MalloyParser.WHERE);
-                this.state = 754;
+                this.state = 758;
                 this.filterClauseList();
             }
         }
@@ -3497,9 +3558,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 756;
+                this.state = 760;
                 this.match(MalloyParser.HAVING);
-                this.state = 757;
+                this.state = 761;
                 this.filterClauseList();
             }
         }
@@ -3527,39 +3588,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 759;
+                this.state = 763;
                 this.exploreQueryDef();
-                this.state = 766;
+                this.state = 770;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 68, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 69, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 761;
+                                this.state = 765;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 760;
+                                        this.state = 764;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 763;
+                                this.state = 767;
                                 this.exploreQueryDef();
                             }
                         }
                     }
-                    this.state = 768;
+                    this.state = 772;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 68, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 69, this._ctx);
                 }
-                this.state = 770;
+                this.state = 774;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 769;
+                        this.state = 773;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -3587,7 +3648,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 772;
+                this.state = 776;
                 this.id();
             }
         }
@@ -3614,25 +3675,25 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 777;
+                this.state = 781;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 while (_la === MalloyParser.ANNOTATION) {
                     {
                         {
-                            this.state = 774;
+                            this.state = 778;
                             this.match(MalloyParser.ANNOTATION);
                         }
                     }
-                    this.state = 779;
+                    this.state = 783;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
-                this.state = 780;
+                this.state = 784;
                 this.exploreQueryNameDef();
-                this.state = 781;
+                this.state = 785;
                 this.isDefine();
-                this.state = 782;
+                this.state = 786;
                 this.vExpr();
             }
         }
@@ -3656,132 +3717,132 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new QueryStatementContext(this._ctx, this.state);
         this.enterRule(_localctx, 144, MalloyParser.RULE_queryStatement);
         try {
-            this.state = 802;
+            this.state = 806;
             this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 71, this._ctx)) {
+            switch (this.interpreter.adaptivePredict(this._input, 72, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 784;
+                        this.state = 788;
                         this.groupByStatement();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 785;
+                        this.state = 789;
                         this.declareStatement();
                     }
                     break;
                 case 3:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 786;
+                        this.state = 790;
                         this.queryJoinStatement();
                     }
                     break;
                 case 4:
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 787;
+                        this.state = 791;
                         this.queryExtend();
                     }
                     break;
                 case 5:
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 788;
+                        this.state = 792;
                         this.projectStatement();
                     }
                     break;
                 case 6:
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 789;
+                        this.state = 793;
                         this.indexStatement();
                     }
                     break;
                 case 7:
                     this.enterOuterAlt(_localctx, 7);
                     {
-                        this.state = 790;
+                        this.state = 794;
                         this.aggregateStatement();
                     }
                     break;
                 case 8:
                     this.enterOuterAlt(_localctx, 8);
                     {
-                        this.state = 791;
+                        this.state = 795;
                         this.calculateStatement();
                     }
                     break;
                 case 9:
                     this.enterOuterAlt(_localctx, 9);
                     {
-                        this.state = 792;
+                        this.state = 796;
                         this.topStatement();
                     }
                     break;
                 case 10:
                     this.enterOuterAlt(_localctx, 10);
                     {
-                        this.state = 793;
+                        this.state = 797;
                         this.limitStatement();
                     }
                     break;
                 case 11:
                     this.enterOuterAlt(_localctx, 11);
                     {
-                        this.state = 794;
+                        this.state = 798;
                         this.orderByStatement();
                     }
                     break;
                 case 12:
                     this.enterOuterAlt(_localctx, 12);
                     {
-                        this.state = 795;
+                        this.state = 799;
                         this.whereStatement();
                     }
                     break;
                 case 13:
                     this.enterOuterAlt(_localctx, 13);
                     {
-                        this.state = 796;
+                        this.state = 800;
                         this.havingStatement();
                     }
                     break;
                 case 14:
                     this.enterOuterAlt(_localctx, 14);
                     {
-                        this.state = 797;
+                        this.state = 801;
                         this.nestStatement();
                     }
                     break;
                 case 15:
                     this.enterOuterAlt(_localctx, 15);
                     {
-                        this.state = 798;
+                        this.state = 802;
                         this.sampleStatement();
                     }
                     break;
                 case 16:
                     this.enterOuterAlt(_localctx, 16);
                     {
-                        this.state = 799;
+                        this.state = 803;
                         this.timezoneStatement();
                     }
                     break;
                 case 17:
                     this.enterOuterAlt(_localctx, 17);
                     {
-                        this.state = 800;
+                        this.state = 804;
                         this.queryAnnotation();
                     }
                     break;
                 case 18:
                     this.enterOuterAlt(_localctx, 18);
                     {
-                        this.state = 801;
+                        this.state = 805;
                         this.ignoredModelAnnotations();
                     }
                     break;
@@ -3809,7 +3870,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 804;
+                this.state = 808;
                 this.joinStatement();
             }
         }
@@ -3835,11 +3896,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 806;
+                this.state = 810;
                 this.tags();
-                this.state = 807;
+                this.state = 811;
                 this.match(MalloyParser.GROUP_BY);
-                this.state = 808;
+                this.state = 812;
                 this.queryFieldList();
             }
         }
@@ -3867,39 +3928,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 810;
+                this.state = 814;
                 this.queryFieldEntry();
-                this.state = 817;
+                this.state = 821;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 73, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 74, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 812;
+                                this.state = 816;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 811;
+                                        this.state = 815;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 814;
+                                this.state = 818;
                                 this.queryFieldEntry();
                             }
                         }
                     }
-                    this.state = 819;
+                    this.state = 823;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 73, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 74, this._ctx);
                 }
-                this.state = 821;
+                this.state = 825;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 820;
+                        this.state = 824;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -3925,20 +3986,20 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new QueryFieldEntryContext(this._ctx, this.state);
         this.enterRule(_localctx, 152, MalloyParser.RULE_queryFieldEntry);
         try {
-            this.state = 825;
+            this.state = 829;
             this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 75, this._ctx)) {
+            switch (this.interpreter.adaptivePredict(this._input, 76, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 823;
+                        this.state = 827;
                         this.taggedRef();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 824;
+                        this.state = 828;
                         this.fieldDef();
                     }
                     break;
@@ -3966,11 +4027,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 827;
+                this.state = 831;
                 this.tags();
-                this.state = 828;
+                this.state = 832;
                 this.match(MalloyParser.NEST);
-                this.state = 829;
+                this.state = 833;
                 this.nestedQueryList();
             }
         }
@@ -3998,39 +4059,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 831;
+                this.state = 835;
                 this.nestEntry();
-                this.state = 838;
+                this.state = 842;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 77, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 78, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 833;
+                                this.state = 837;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 832;
+                                        this.state = 836;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 835;
+                                this.state = 839;
                                 this.nestEntry();
                             }
                         }
                     }
-                    this.state = 840;
+                    this.state = 844;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 77, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 78, this._ctx);
                 }
-                this.state = 842;
+                this.state = 846;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 841;
+                        this.state = 845;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -4055,46 +4116,26 @@ class MalloyParser extends Parser_1.Parser {
     nestEntry() {
         let _localctx = new NestEntryContext(this._ctx, this.state);
         this.enterRule(_localctx, 158, MalloyParser.RULE_nestEntry);
-        let _la;
         try {
-            this.state = 855;
-            this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 80, this._ctx)) {
-                case 1:
-                    _localctx = new NestExistingContext(_localctx);
-                    this.enterOuterAlt(_localctx, 1);
-                    {
-                        this.state = 844;
-                        this.tags();
-                        this.state = 845;
-                        this.fieldPath();
-                        this.state = 848;
-                        this._errHandler.sync(this);
-                        _la = this._input.LA(1);
-                        if (_la === MalloyParser.PLUS) {
-                            {
-                                this.state = 846;
-                                this.match(MalloyParser.PLUS);
-                                this.state = 847;
-                                this.vExpr();
-                            }
+            _localctx = new NestDefContext(_localctx);
+            this.enterOuterAlt(_localctx, 1);
+            {
+                this.state = 848;
+                this.tags();
+                this.state = 852;
+                this._errHandler.sync(this);
+                switch (this.interpreter.adaptivePredict(this._input, 80, this._ctx)) {
+                    case 1:
+                        {
+                            this.state = 849;
+                            this.queryName();
+                            this.state = 850;
+                            this.isDefine();
                         }
-                    }
-                    break;
-                case 2:
-                    _localctx = new NestDefContext(_localctx);
-                    this.enterOuterAlt(_localctx, 2);
-                    {
-                        this.state = 850;
-                        this.tags();
-                        this.state = 851;
-                        this.queryName();
-                        this.state = 852;
-                        this.isDefine();
-                        this.state = 853;
-                        this.vExpr();
-                    }
-                    break;
+                        break;
+                }
+                this.state = 854;
+                this.vExpr();
             }
         }
         catch (re) {
@@ -4119,11 +4160,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 857;
+                this.state = 856;
                 this.tags();
-                this.state = 858;
+                this.state = 857;
                 this.match(MalloyParser.AGGREGATE);
-                this.state = 859;
+                this.state = 858;
                 this.queryFieldList();
             }
         }
@@ -4149,11 +4190,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 861;
+                this.state = 860;
                 this.tags();
-                this.state = 862;
+                this.state = 861;
                 this.match(MalloyParser.CALCULATE);
-                this.state = 863;
+                this.state = 862;
                 this.queryFieldList();
             }
         }
@@ -4180,9 +4221,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 865;
+                this.state = 864;
                 this.tags();
-                this.state = 866;
+                this.state = 865;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.PROJECT || _la === MalloyParser.SELECT)) {
                     this._errHandler.recoverInline(this);
@@ -4194,7 +4235,7 @@ class MalloyParser extends Parser_1.Parser {
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
-                this.state = 867;
+                this.state = 866;
                 this.fieldCollection();
             }
         }
@@ -4222,34 +4263,34 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 869;
+                this.state = 868;
                 this.match(MalloyParser.PARTITION_BY);
-                this.state = 870;
+                this.state = 869;
                 this.id();
-                this.state = 875;
+                this.state = 874;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 81, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 871;
+                                this.state = 870;
                                 this.match(MalloyParser.COMMA);
-                                this.state = 872;
+                                this.state = 871;
                                 this.id();
                             }
                         }
                     }
-                    this.state = 877;
+                    this.state = 876;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 81, this._ctx);
                 }
-                this.state = 879;
+                this.state = 878;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 878;
+                        this.state = 877;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -4277,9 +4318,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 881;
+                this.state = 880;
                 this.match(MalloyParser.ORDER_BY);
-                this.state = 882;
+                this.state = 881;
                 this.ordering();
             }
         }
@@ -4307,39 +4348,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 884;
+                this.state = 883;
                 this.orderBySpec();
-                this.state = 891;
+                this.state = 890;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 84, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 886;
+                                this.state = 885;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 885;
+                                        this.state = 884;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 888;
+                                this.state = 887;
                                 this.orderBySpec();
                             }
                         }
                     }
-                    this.state = 893;
+                    this.state = 892;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 84, this._ctx);
                 }
-                this.state = 895;
+                this.state = 894;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 894;
+                        this.state = 893;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -4368,31 +4409,31 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 899;
+                this.state = 898;
                 this._errHandler.sync(this);
                 switch (this._input.LA(1)) {
                     case MalloyParser.INTEGER_LITERAL:
                         {
-                            this.state = 897;
+                            this.state = 896;
                             this.match(MalloyParser.INTEGER_LITERAL);
                         }
                         break;
                     case MalloyParser.BQ_STRING:
                     case MalloyParser.IDENTIFIER:
                         {
-                            this.state = 898;
+                            this.state = 897;
                             this.fieldName();
                         }
                         break;
                     default:
                         throw new NoViableAltException_1.NoViableAltException(this);
                 }
-                this.state = 902;
+                this.state = 901;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.ASC || _la === MalloyParser.DESC) {
                     {
-                        this.state = 901;
+                        this.state = 900;
                         _la = this._input.LA(1);
                         if (!(_la === MalloyParser.ASC || _la === MalloyParser.DESC)) {
                             this._errHandler.recoverInline(this);
@@ -4430,9 +4471,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 904;
+                this.state = 903;
                 this.match(MalloyParser.LIMIT);
-                this.state = 905;
+                this.state = 904;
                 this.match(MalloyParser.INTEGER_LITERAL);
             }
         }
@@ -4456,24 +4497,24 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new BySpecContext(this._ctx, this.state);
         this.enterRule(_localctx, 176, MalloyParser.RULE_bySpec);
         try {
-            this.state = 911;
+            this.state = 910;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 88, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 907;
+                        this.state = 906;
                         this.match(MalloyParser.BY);
-                        this.state = 908;
+                        this.state = 907;
                         this.fieldName();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 909;
+                        this.state = 908;
                         this.match(MalloyParser.BY);
-                        this.state = 910;
+                        this.state = 909;
                         this.fieldExpr(0);
                     }
                     break;
@@ -4502,16 +4543,16 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 913;
+                this.state = 912;
                 this.match(MalloyParser.TOP);
-                this.state = 914;
+                this.state = 913;
                 this.match(MalloyParser.INTEGER_LITERAL);
-                this.state = 916;
+                this.state = 915;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.BY) {
                     {
-                        this.state = 915;
+                        this.state = 914;
                         this.bySpec();
                     }
                 }
@@ -4538,23 +4579,23 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 180, MalloyParser.RULE_indexElement);
         let _la;
         try {
-            this.state = 924;
+            this.state = 923;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.BQ_STRING:
                 case MalloyParser.IDENTIFIER:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 918;
+                        this.state = 917;
                         this.fieldPath();
-                        this.state = 921;
+                        this.state = 920;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.DOT) {
                             {
-                                this.state = 919;
+                                this.state = 918;
                                 this.match(MalloyParser.DOT);
-                                this.state = 920;
+                                this.state = 919;
                                 this.match(MalloyParser.STAR);
                             }
                         }
@@ -4563,7 +4604,7 @@ class MalloyParser extends Parser_1.Parser {
                 case MalloyParser.STAR:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 923;
+                        this.state = 922;
                         this.match(MalloyParser.STAR);
                     }
                     break;
@@ -4595,30 +4636,30 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 926;
+                this.state = 925;
                 this.indexElement();
-                this.state = 933;
+                this.state = 932;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 93, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 928;
+                                this.state = 927;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 927;
+                                        this.state = 926;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 930;
+                                this.state = 929;
                                 this.indexElement();
                             }
                         }
                     }
-                    this.state = 935;
+                    this.state = 934;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 93, this._ctx);
                 }
@@ -4647,18 +4688,18 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 936;
+                this.state = 935;
                 this.match(MalloyParser.INDEX);
-                this.state = 937;
+                this.state = 936;
                 this.indexFields();
-                this.state = 940;
+                this.state = 939;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.BY) {
                     {
-                        this.state = 938;
+                        this.state = 937;
                         this.match(MalloyParser.BY);
-                        this.state = 939;
+                        this.state = 938;
                         this.fieldName();
                     }
                 }
@@ -4686,9 +4727,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 942;
+                this.state = 941;
                 this.match(MalloyParser.SAMPLE);
-                this.state = 943;
+                this.state = 942;
                 this.sampleSpec();
             }
         }
@@ -4714,9 +4755,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 945;
+                this.state = 944;
                 this.match(MalloyParser.TIMEZONE);
-                this.state = 946;
+                this.state = 945;
                 this.string();
             }
         }
@@ -4742,7 +4783,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 948;
+                this.state = 947;
                 this.match(MalloyParser.ANNOTATION);
             }
         }
@@ -4769,7 +4810,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 950;
+                this.state = 949;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.FALSE || _la === MalloyParser.TRUE || _la === MalloyParser.PERCENT_LITERAL || _la === MalloyParser.INTEGER_LITERAL)) {
                     this._errHandler.recoverInline(this);
@@ -4806,7 +4847,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 952;
+                this.state = 951;
                 _la = this._input.LA(1);
                 if (!(((((_la - 38)) & ~0x1F) === 0 && ((1 << (_la - 38)) & ((1 << (MalloyParser.AVG - 38)) | (1 << (MalloyParser.COUNT - 38)) | (1 << (MalloyParser.MAX - 38)) | (1 << (MalloyParser.MIN - 38)))) !== 0) || _la === MalloyParser.SUM)) {
                     this._errHandler.recoverInline(this);
@@ -4843,7 +4884,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 954;
+                this.state = 953;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.BOOLEAN || _la === MalloyParser.DATE || ((((_la - 73)) & ~0x1F) === 0 && ((1 << (_la - 73)) & ((1 << (MalloyParser.NUMBER - 73)) | (1 << (MalloyParser.STRING - 73)) | (1 << (MalloyParser.TIMESTAMP - 73)))) !== 0))) {
                     this._errHandler.recoverInline(this);
@@ -4880,7 +4921,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 956;
+                this.state = 955;
                 _la = this._input.LA(1);
                 if (!(((((_la - 118)) & ~0x1F) === 0 && ((1 << (_la - 118)) & ((1 << (MalloyParser.LT - 118)) | (1 << (MalloyParser.GT - 118)) | (1 << (MalloyParser.EQ - 118)) | (1 << (MalloyParser.NE - 118)) | (1 << (MalloyParser.LTE - 118)) | (1 << (MalloyParser.GTE - 118)) | (1 << (MalloyParser.NOT_MATCH - 118)) | (1 << (MalloyParser.MATCH - 118)))) !== 0))) {
                     this._errHandler.recoverInline(this);
@@ -4914,21 +4955,21 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new StringContext(this._ctx, this.state);
         this.enterRule(_localctx, 200, MalloyParser.RULE_string);
         try {
-            this.state = 960;
+            this.state = 959;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.SQ_STRING:
                 case MalloyParser.DQ_STRING:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 958;
+                        this.state = 957;
                         this.shortString();
                     }
                     break;
                 case MalloyParser.SQL_BEGIN:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 959;
+                        this.state = 958;
                         this.sqlString();
                     }
                     break;
@@ -4959,7 +5000,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 962;
+                this.state = 961;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.SQ_STRING || _la === MalloyParser.DQ_STRING)) {
                     this._errHandler.recoverInline(this);
@@ -4996,7 +5037,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 964;
+                this.state = 963;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.NUMERIC_LITERAL || _la === MalloyParser.INTEGER_LITERAL)) {
                     this._errHandler.recoverInline(this);
@@ -5031,7 +5072,7 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 206, MalloyParser.RULE_literal);
         let _la;
         try {
-            this.state = 973;
+            this.state = 972;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.SQ_STRING:
@@ -5040,7 +5081,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprStringContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 966;
+                        this.state = 965;
                         this.string();
                     }
                     break;
@@ -5049,7 +5090,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprNumberContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 967;
+                        this.state = 966;
                         this.numericLiteral();
                     }
                     break;
@@ -5063,7 +5104,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprTimeContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 968;
+                        this.state = 967;
                         this.dateLiteral();
                     }
                     break;
@@ -5071,7 +5112,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprNULLContext(_localctx);
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 969;
+                        this.state = 968;
                         this.match(MalloyParser.NULL);
                     }
                     break;
@@ -5080,7 +5121,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprBoolContext(_localctx);
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 970;
+                        this.state = 969;
                         _la = this._input.LA(1);
                         if (!(_la === MalloyParser.FALSE || _la === MalloyParser.TRUE)) {
                             this._errHandler.recoverInline(this);
@@ -5098,7 +5139,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprRegexContext(_localctx);
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 971;
+                        this.state = 970;
                         this.match(MalloyParser.HACKY_REGEX);
                     }
                     break;
@@ -5106,7 +5147,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprNowContext(_localctx);
                     this.enterOuterAlt(_localctx, 7);
                     {
-                        this.state = 972;
+                        this.state = 971;
                         this.match(MalloyParser.NOW);
                     }
                     break;
@@ -5134,14 +5175,14 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new DateLiteralContext(this._ctx, this.state);
         this.enterRule(_localctx, 208, MalloyParser.RULE_dateLiteral);
         try {
-            this.state = 982;
+            this.state = 981;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.LITERAL_TIMESTAMP:
                     _localctx = new LiteralTimestampContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 975;
+                        this.state = 974;
                         this.match(MalloyParser.LITERAL_TIMESTAMP);
                     }
                     break;
@@ -5149,7 +5190,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralHourContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 976;
+                        this.state = 975;
                         this.match(MalloyParser.LITERAL_HOUR);
                     }
                     break;
@@ -5157,7 +5198,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralDayContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 977;
+                        this.state = 976;
                         this.match(MalloyParser.LITERAL_DAY);
                     }
                     break;
@@ -5165,7 +5206,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralWeekContext(_localctx);
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 978;
+                        this.state = 977;
                         this.match(MalloyParser.LITERAL_WEEK);
                     }
                     break;
@@ -5173,7 +5214,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralMonthContext(_localctx);
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 979;
+                        this.state = 978;
                         this.match(MalloyParser.LITERAL_MONTH);
                     }
                     break;
@@ -5181,7 +5222,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralQuarterContext(_localctx);
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 980;
+                        this.state = 979;
                         this.match(MalloyParser.LITERAL_QUARTER);
                     }
                     break;
@@ -5189,7 +5230,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralYearContext(_localctx);
                     this.enterOuterAlt(_localctx, 7);
                     {
-                        this.state = 981;
+                        this.state = 980;
                         this.match(MalloyParser.LITERAL_YEAR);
                     }
                     break;
@@ -5219,7 +5260,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 984;
+                this.state = 983;
                 this.string();
             }
         }
@@ -5245,7 +5286,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 986;
+                this.state = 985;
                 this.string();
             }
         }
@@ -5272,7 +5313,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 988;
+                this.state = 987;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.BQ_STRING || _la === MalloyParser.IDENTIFIER)) {
                     this._errHandler.recoverInline(this);
@@ -5309,7 +5350,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 990;
+                this.state = 989;
                 _la = this._input.LA(1);
                 if (!(((((_la - 46)) & ~0x1F) === 0 && ((1 << (_la - 46)) & ((1 << (MalloyParser.DAY - 46)) | (1 << (MalloyParser.HOUR - 46)) | (1 << (MalloyParser.MINUTE - 46)) | (1 << (MalloyParser.MONTH - 46)) | (1 << (MalloyParser.QUARTER - 46)))) !== 0) || ((((_la - 79)) & ~0x1F) === 0 && ((1 << (_la - 79)) & ((1 << (MalloyParser.SECOND - 79)) | (1 << (MalloyParser.WEEK - 79)) | (1 << (MalloyParser.YEAR - 79)))) !== 0))) {
                     this._errHandler.recoverInline(this);
@@ -5346,7 +5387,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 992;
+                this.state = 991;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.ALL || _la === MalloyParser.EXCLUDE)) {
                     this._errHandler.recoverInline(this);
@@ -5380,7 +5421,7 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new MalloyOrSQLTypeContext(this._ctx, this.state);
         this.enterRule(_localctx, 220, MalloyParser.RULE_malloyOrSQLType);
         try {
-            this.state = 996;
+            this.state = 995;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.BOOLEAN:
@@ -5390,7 +5431,7 @@ class MalloyParser extends Parser_1.Parser {
                 case MalloyParser.TIMESTAMP:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 994;
+                        this.state = 993;
                         this.malloyType();
                     }
                     break;
@@ -5399,7 +5440,7 @@ class MalloyParser extends Parser_1.Parser {
                 case MalloyParser.SQL_BEGIN:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 995;
+                        this.state = 994;
                         this.string();
                     }
                     break;
@@ -5438,7 +5479,7 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1081;
+                this.state = 1080;
                 this._errHandler.sync(this);
                 switch (this.interpreter.adaptivePredict(this._input, 108, this._ctx)) {
                     case 1:
@@ -5446,7 +5487,7 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprFieldPathContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 999;
+                            this.state = 998;
                             this.fieldPath();
                         }
                         break;
@@ -5455,7 +5496,7 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprLiteralContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1000;
+                            this.state = 999;
                             this.literal();
                         }
                         break;
@@ -5464,9 +5505,9 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprMinusContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1001;
+                            this.state = 1000;
                             this.match(MalloyParser.MINUS);
-                            this.state = 1002;
+                            this.state = 1001;
                             this.fieldExpr(22);
                         }
                         break;
@@ -5475,9 +5516,9 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprNotContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1003;
+                            this.state = 1002;
                             this.match(MalloyParser.NOT);
-                            this.state = 1004;
+                            this.state = 1003;
                             this.fieldExpr(13);
                         }
                         break;
@@ -5486,17 +5527,17 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprCastContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1005;
+                            this.state = 1004;
                             this.match(MalloyParser.CAST);
-                            this.state = 1006;
+                            this.state = 1005;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 1007;
+                            this.state = 1006;
                             this.fieldExpr(0);
-                            this.state = 1008;
+                            this.state = 1007;
                             this.match(MalloyParser.AS);
-                            this.state = 1009;
+                            this.state = 1008;
                             this.malloyOrSQLType();
-                            this.state = 1010;
+                            this.state = 1009;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -5505,15 +5546,15 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprCountDisinctContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1012;
+                            this.state = 1011;
                             this.match(MalloyParser.COUNT);
-                            this.state = 1013;
+                            this.state = 1012;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 1014;
+                            this.state = 1013;
                             this.match(MalloyParser.DISTINCT);
-                            this.state = 1015;
+                            this.state = 1014;
                             this.fieldExpr(0);
-                            this.state = 1016;
+                            this.state = 1015;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -5522,22 +5563,22 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprPathlessAggregateContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1020;
+                            this.state = 1019;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             if (_la === MalloyParser.SOURCE_KW) {
                                 {
-                                    this.state = 1018;
+                                    this.state = 1017;
                                     this.match(MalloyParser.SOURCE_KW);
-                                    this.state = 1019;
+                                    this.state = 1018;
                                     this.match(MalloyParser.DOT);
                                 }
                             }
-                            this.state = 1022;
+                            this.state = 1021;
                             this.aggregate();
-                            this.state = 1023;
+                            this.state = 1022;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 1026;
+                            this.state = 1025;
                             this._errHandler.sync(this);
                             switch (this._input.LA(1)) {
                                 case MalloyParser.ALL:
@@ -5581,13 +5622,13 @@ class MalloyParser extends Parser_1.Parser {
                                 case MalloyParser.INTEGER_LITERAL:
                                 case MalloyParser.SQL_BEGIN:
                                     {
-                                        this.state = 1024;
+                                        this.state = 1023;
                                         this.fieldExpr(0);
                                     }
                                     break;
                                 case MalloyParser.STAR:
                                     {
-                                        this.state = 1025;
+                                        this.state = 1024;
                                         this.match(MalloyParser.STAR);
                                     }
                                     break;
@@ -5596,7 +5637,7 @@ class MalloyParser extends Parser_1.Parser {
                                 default:
                                     break;
                             }
-                            this.state = 1028;
+                            this.state = 1027;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -5605,24 +5646,24 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprAggregateContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1030;
+                            this.state = 1029;
                             this.fieldPath();
-                            this.state = 1031;
+                            this.state = 1030;
                             this.match(MalloyParser.DOT);
-                            this.state = 1032;
+                            this.state = 1031;
                             this.aggregate();
-                            this.state = 1033;
+                            this.state = 1032;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 1035;
+                            this.state = 1034;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             if (((((_la - 34)) & ~0x1F) === 0 && ((1 << (_la - 34)) & ((1 << (MalloyParser.ALL - 34)) | (1 << (MalloyParser.AVG - 34)) | (1 << (MalloyParser.CAST - 34)) | (1 << (MalloyParser.COUNT - 34)) | (1 << (MalloyParser.DAY - 34)) | (1 << (MalloyParser.EXCLUDE - 34)) | (1 << (MalloyParser.FALSE - 34)) | (1 << (MalloyParser.HOUR - 34)))) !== 0) || ((((_la - 66)) & ~0x1F) === 0 && ((1 << (_la - 66)) & ((1 << (MalloyParser.MAX - 66)) | (1 << (MalloyParser.MIN - 66)) | (1 << (MalloyParser.MINUTE - 66)) | (1 << (MalloyParser.MONTH - 66)) | (1 << (MalloyParser.NOT - 66)) | (1 << (MalloyParser.NOW - 66)) | (1 << (MalloyParser.NULL - 66)) | (1 << (MalloyParser.PICK - 66)) | (1 << (MalloyParser.QUARTER - 66)) | (1 << (MalloyParser.SECOND - 66)) | (1 << (MalloyParser.SOURCE_KW - 66)) | (1 << (MalloyParser.SUM - 66)) | (1 << (MalloyParser.TRUE - 66)) | (1 << (MalloyParser.WEEK - 66)) | (1 << (MalloyParser.YEAR - 66)) | (1 << (MalloyParser.HACKY_REGEX - 66)))) !== 0) || ((((_la - 98)) & ~0x1F) === 0 && ((1 << (_la - 98)) & ((1 << (MalloyParser.SQ_STRING - 98)) | (1 << (MalloyParser.DQ_STRING - 98)) | (1 << (MalloyParser.BQ_STRING - 98)) | (1 << (MalloyParser.OPAREN - 98)) | (1 << (MalloyParser.MINUS - 98)))) !== 0) || ((((_la - 136)) & ~0x1F) === 0 && ((1 << (_la - 136)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 136)) | (1 << (MalloyParser.LITERAL_HOUR - 136)) | (1 << (MalloyParser.LITERAL_DAY - 136)) | (1 << (MalloyParser.LITERAL_QUARTER - 136)) | (1 << (MalloyParser.LITERAL_MONTH - 136)) | (1 << (MalloyParser.LITERAL_WEEK - 136)) | (1 << (MalloyParser.LITERAL_YEAR - 136)) | (1 << (MalloyParser.IDENTIFIER - 136)) | (1 << (MalloyParser.NUMERIC_LITERAL - 136)) | (1 << (MalloyParser.INTEGER_LITERAL - 136)) | (1 << (MalloyParser.SQL_BEGIN - 136)))) !== 0)) {
                                 {
-                                    this.state = 1034;
+                                    this.state = 1033;
                                     this.fieldExpr(0);
                                 }
                             }
-                            this.state = 1037;
+                            this.state = 1036;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -5631,11 +5672,11 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprExprContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1039;
+                            this.state = 1038;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 1040;
+                            this.state = 1039;
                             this.partialAllowedFieldExpr();
-                            this.state = 1041;
+                            this.state = 1040;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -5644,26 +5685,26 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprAggFuncContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1043;
+                            this.state = 1042;
                             this.fieldPath();
-                            this.state = 1044;
+                            this.state = 1043;
                             this.match(MalloyParser.DOT);
-                            this.state = 1045;
+                            this.state = 1044;
                             this.id();
-                            this.state = 1046;
+                            this.state = 1045;
                             this.match(MalloyParser.OPAREN);
                             {
-                                this.state = 1048;
+                                this.state = 1047;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (((((_la - 34)) & ~0x1F) === 0 && ((1 << (_la - 34)) & ((1 << (MalloyParser.ALL - 34)) | (1 << (MalloyParser.AVG - 34)) | (1 << (MalloyParser.CAST - 34)) | (1 << (MalloyParser.COUNT - 34)) | (1 << (MalloyParser.DAY - 34)) | (1 << (MalloyParser.EXCLUDE - 34)) | (1 << (MalloyParser.FALSE - 34)) | (1 << (MalloyParser.HOUR - 34)))) !== 0) || ((((_la - 66)) & ~0x1F) === 0 && ((1 << (_la - 66)) & ((1 << (MalloyParser.MAX - 66)) | (1 << (MalloyParser.MIN - 66)) | (1 << (MalloyParser.MINUTE - 66)) | (1 << (MalloyParser.MONTH - 66)) | (1 << (MalloyParser.NOT - 66)) | (1 << (MalloyParser.NOW - 66)) | (1 << (MalloyParser.NULL - 66)) | (1 << (MalloyParser.PICK - 66)) | (1 << (MalloyParser.QUARTER - 66)) | (1 << (MalloyParser.SECOND - 66)) | (1 << (MalloyParser.SOURCE_KW - 66)) | (1 << (MalloyParser.SUM - 66)) | (1 << (MalloyParser.TRUE - 66)) | (1 << (MalloyParser.WEEK - 66)) | (1 << (MalloyParser.YEAR - 66)) | (1 << (MalloyParser.HACKY_REGEX - 66)))) !== 0) || ((((_la - 98)) & ~0x1F) === 0 && ((1 << (_la - 98)) & ((1 << (MalloyParser.SQ_STRING - 98)) | (1 << (MalloyParser.DQ_STRING - 98)) | (1 << (MalloyParser.BQ_STRING - 98)) | (1 << (MalloyParser.OPAREN - 98)) | (1 << (MalloyParser.MINUS - 98)))) !== 0) || ((((_la - 136)) & ~0x1F) === 0 && ((1 << (_la - 136)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 136)) | (1 << (MalloyParser.LITERAL_HOUR - 136)) | (1 << (MalloyParser.LITERAL_DAY - 136)) | (1 << (MalloyParser.LITERAL_QUARTER - 136)) | (1 << (MalloyParser.LITERAL_MONTH - 136)) | (1 << (MalloyParser.LITERAL_WEEK - 136)) | (1 << (MalloyParser.LITERAL_YEAR - 136)) | (1 << (MalloyParser.IDENTIFIER - 136)) | (1 << (MalloyParser.NUMERIC_LITERAL - 136)) | (1 << (MalloyParser.INTEGER_LITERAL - 136)) | (1 << (MalloyParser.SQL_BEGIN - 136)))) !== 0)) {
                                     {
-                                        this.state = 1047;
+                                        this.state = 1046;
                                         this.argumentList();
                                     }
                                 }
                             }
-                            this.state = 1050;
+                            this.state = 1049;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -5672,28 +5713,28 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprFuncContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1060;
+                            this.state = 1059;
                             this._errHandler.sync(this);
                             switch (this._input.LA(1)) {
                                 case MalloyParser.BQ_STRING:
                                 case MalloyParser.IDENTIFIER:
                                     {
                                         {
-                                            this.state = 1052;
+                                            this.state = 1051;
                                             this.id();
-                                            this.state = 1057;
+                                            this.state = 1056;
                                             this._errHandler.sync(this);
                                             _la = this._input.LA(1);
                                             if (_la === MalloyParser.EXCLAM) {
                                                 {
-                                                    this.state = 1053;
+                                                    this.state = 1052;
                                                     this.match(MalloyParser.EXCLAM);
-                                                    this.state = 1055;
+                                                    this.state = 1054;
                                                     this._errHandler.sync(this);
                                                     _la = this._input.LA(1);
                                                     if (_la === MalloyParser.BOOLEAN || _la === MalloyParser.DATE || ((((_la - 73)) & ~0x1F) === 0 && ((1 << (_la - 73)) & ((1 << (MalloyParser.NUMBER - 73)) | (1 << (MalloyParser.STRING - 73)) | (1 << (MalloyParser.TIMESTAMP - 73)))) !== 0)) {
                                                         {
-                                                            this.state = 1054;
+                                                            this.state = 1053;
                                                             this.malloyType();
                                                         }
                                                     }
@@ -5711,27 +5752,27 @@ class MalloyParser extends Parser_1.Parser {
                                 case MalloyParser.WEEK:
                                 case MalloyParser.YEAR:
                                     {
-                                        this.state = 1059;
+                                        this.state = 1058;
                                         this.timeframe();
                                     }
                                     break;
                                 default:
                                     throw new NoViableAltException_1.NoViableAltException(this);
                             }
-                            this.state = 1062;
+                            this.state = 1061;
                             this.match(MalloyParser.OPAREN);
                             {
-                                this.state = 1064;
+                                this.state = 1063;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (((((_la - 34)) & ~0x1F) === 0 && ((1 << (_la - 34)) & ((1 << (MalloyParser.ALL - 34)) | (1 << (MalloyParser.AVG - 34)) | (1 << (MalloyParser.CAST - 34)) | (1 << (MalloyParser.COUNT - 34)) | (1 << (MalloyParser.DAY - 34)) | (1 << (MalloyParser.EXCLUDE - 34)) | (1 << (MalloyParser.FALSE - 34)) | (1 << (MalloyParser.HOUR - 34)))) !== 0) || ((((_la - 66)) & ~0x1F) === 0 && ((1 << (_la - 66)) & ((1 << (MalloyParser.MAX - 66)) | (1 << (MalloyParser.MIN - 66)) | (1 << (MalloyParser.MINUTE - 66)) | (1 << (MalloyParser.MONTH - 66)) | (1 << (MalloyParser.NOT - 66)) | (1 << (MalloyParser.NOW - 66)) | (1 << (MalloyParser.NULL - 66)) | (1 << (MalloyParser.PICK - 66)) | (1 << (MalloyParser.QUARTER - 66)) | (1 << (MalloyParser.SECOND - 66)) | (1 << (MalloyParser.SOURCE_KW - 66)) | (1 << (MalloyParser.SUM - 66)) | (1 << (MalloyParser.TRUE - 66)) | (1 << (MalloyParser.WEEK - 66)) | (1 << (MalloyParser.YEAR - 66)) | (1 << (MalloyParser.HACKY_REGEX - 66)))) !== 0) || ((((_la - 98)) & ~0x1F) === 0 && ((1 << (_la - 98)) & ((1 << (MalloyParser.SQ_STRING - 98)) | (1 << (MalloyParser.DQ_STRING - 98)) | (1 << (MalloyParser.BQ_STRING - 98)) | (1 << (MalloyParser.OPAREN - 98)) | (1 << (MalloyParser.MINUS - 98)))) !== 0) || ((((_la - 136)) & ~0x1F) === 0 && ((1 << (_la - 136)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 136)) | (1 << (MalloyParser.LITERAL_HOUR - 136)) | (1 << (MalloyParser.LITERAL_DAY - 136)) | (1 << (MalloyParser.LITERAL_QUARTER - 136)) | (1 << (MalloyParser.LITERAL_MONTH - 136)) | (1 << (MalloyParser.LITERAL_WEEK - 136)) | (1 << (MalloyParser.LITERAL_YEAR - 136)) | (1 << (MalloyParser.IDENTIFIER - 136)) | (1 << (MalloyParser.NUMERIC_LITERAL - 136)) | (1 << (MalloyParser.INTEGER_LITERAL - 136)) | (1 << (MalloyParser.SQL_BEGIN - 136)))) !== 0)) {
                                     {
-                                        this.state = 1063;
+                                        this.state = 1062;
                                         this.argumentList();
                                     }
                                 }
                             }
-                            this.state = 1066;
+                            this.state = 1065;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -5740,7 +5781,7 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprPickContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1068;
+                            this.state = 1067;
                             this.pickStatement();
                         }
                         break;
@@ -5749,35 +5790,35 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprUngroupContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 1069;
+                            this.state = 1068;
                             this.ungroup();
-                            this.state = 1070;
+                            this.state = 1069;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 1071;
+                            this.state = 1070;
                             this.fieldExpr(0);
-                            this.state = 1076;
+                            this.state = 1075;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             while (_la === MalloyParser.COMMA) {
                                 {
                                     {
-                                        this.state = 1072;
+                                        this.state = 1071;
                                         this.match(MalloyParser.COMMA);
-                                        this.state = 1073;
+                                        this.state = 1072;
                                         this.fieldName();
                                     }
                                 }
-                                this.state = 1078;
+                                this.state = 1077;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                             }
-                            this.state = 1079;
+                            this.state = 1078;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
                 }
                 this._ctx._stop = this._input.tryLT(-1);
-                this.state = 1134;
+                this.state = 1133;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 110, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
@@ -5787,18 +5828,18 @@ class MalloyParser extends Parser_1.Parser {
                         }
                         _prevctx = _localctx;
                         {
-                            this.state = 1132;
+                            this.state = 1131;
                             this._errHandler.sync(this);
                             switch (this.interpreter.adaptivePredict(this._input, 109, this._ctx)) {
                                 case 1:
                                     {
                                         _localctx = new ExprMulDivContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1083;
+                                        this.state = 1082;
                                         if (!(this.precpred(this._ctx, 21))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 21)");
                                         }
-                                        this.state = 1084;
+                                        this.state = 1083;
                                         _la = this._input.LA(1);
                                         if (!(((((_la - 126)) & ~0x1F) === 0 && ((1 << (_la - 126)) & ((1 << (MalloyParser.STAR - 126)) | (1 << (MalloyParser.SLASH - 126)) | (1 << (MalloyParser.PERCENT - 126)))) !== 0))) {
                                             this._errHandler.recoverInline(this);
@@ -5810,7 +5851,7 @@ class MalloyParser extends Parser_1.Parser {
                                             this._errHandler.reportMatch(this);
                                             this.consume();
                                         }
-                                        this.state = 1085;
+                                        this.state = 1084;
                                         this.fieldExpr(22);
                                     }
                                     break;
@@ -5818,11 +5859,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprAddSubContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1086;
+                                        this.state = 1085;
                                         if (!(this.precpred(this._ctx, 20))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 20)");
                                         }
-                                        this.state = 1087;
+                                        this.state = 1086;
                                         _la = this._input.LA(1);
                                         if (!(_la === MalloyParser.PLUS || _la === MalloyParser.MINUS)) {
                                             this._errHandler.recoverInline(this);
@@ -5834,7 +5875,7 @@ class MalloyParser extends Parser_1.Parser {
                                             this._errHandler.reportMatch(this);
                                             this.consume();
                                         }
-                                        this.state = 1088;
+                                        this.state = 1087;
                                         this.fieldExpr(21);
                                     }
                                     break;
@@ -5842,13 +5883,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprRangeContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1089;
+                                        this.state = 1088;
                                         if (!(this.precpred(this._ctx, 19))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
                                         }
-                                        this.state = 1090;
+                                        this.state = 1089;
                                         this.match(MalloyParser.TO);
-                                        this.state = 1091;
+                                        this.state = 1090;
                                         this.fieldExpr(20);
                                     }
                                     break;
@@ -5856,13 +5897,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprCompareContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1092;
+                                        this.state = 1091;
                                         if (!(this.precpred(this._ctx, 15))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
                                         }
-                                        this.state = 1093;
+                                        this.state = 1092;
                                         this.compareOp();
-                                        this.state = 1094;
+                                        this.state = 1093;
                                         this.fieldExpr(16);
                                     }
                                     break;
@@ -5870,13 +5911,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprLogicalAndContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1096;
+                                        this.state = 1095;
                                         if (!(this.precpred(this._ctx, 12))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
                                         }
-                                        this.state = 1097;
+                                        this.state = 1096;
                                         this.match(MalloyParser.AND);
-                                        this.state = 1098;
+                                        this.state = 1097;
                                         this.fieldExpr(13);
                                     }
                                     break;
@@ -5884,13 +5925,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprLogicalOrContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1099;
+                                        this.state = 1098;
                                         if (!(this.precpred(this._ctx, 11))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
                                         }
-                                        this.state = 1100;
+                                        this.state = 1099;
                                         this.match(MalloyParser.OR);
-                                        this.state = 1101;
+                                        this.state = 1100;
                                         this.fieldExpr(12);
                                     }
                                     break;
@@ -5898,13 +5939,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprCoalesceContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1102;
+                                        this.state = 1101;
                                         if (!(this.precpred(this._ctx, 10))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
                                         }
-                                        this.state = 1103;
+                                        this.state = 1102;
                                         this.match(MalloyParser.DOUBLE_QMARK);
-                                        this.state = 1104;
+                                        this.state = 1103;
                                         this.fieldExpr(11);
                                     }
                                     break;
@@ -5912,11 +5953,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprFieldPropsContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1105;
+                                        this.state = 1104;
                                         if (!(this.precpred(this._ctx, 28))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 28)");
                                         }
-                                        this.state = 1106;
+                                        this.state = 1105;
                                         this.fieldProperties();
                                     }
                                     break;
@@ -5924,11 +5965,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprDurationContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1107;
+                                        this.state = 1106;
                                         if (!(this.precpred(this._ctx, 26))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 26)");
                                         }
-                                        this.state = 1108;
+                                        this.state = 1107;
                                         this.timeframe();
                                     }
                                     break;
@@ -5936,13 +5977,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprTimeTruncContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1109;
+                                        this.state = 1108;
                                         if (!(this.precpred(this._ctx, 25))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 25)");
                                         }
-                                        this.state = 1110;
+                                        this.state = 1109;
                                         this.match(MalloyParser.DOT);
-                                        this.state = 1111;
+                                        this.state = 1110;
                                         this.timeframe();
                                     }
                                     break;
@@ -5950,13 +5991,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprCastContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1112;
+                                        this.state = 1111;
                                         if (!(this.precpred(this._ctx, 24))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 24)");
                                         }
-                                        this.state = 1113;
+                                        this.state = 1112;
                                         this.match(MalloyParser.DOUBLECOLON);
-                                        this.state = 1114;
+                                        this.state = 1113;
                                         this.malloyOrSQLType();
                                     }
                                     break;
@@ -5964,13 +6005,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprSafeCastContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1115;
+                                        this.state = 1114;
                                         if (!(this.precpred(this._ctx, 23))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 23)");
                                         }
-                                        this.state = 1116;
+                                        this.state = 1115;
                                         this.match(MalloyParser.TRIPLECOLON);
-                                        this.state = 1117;
+                                        this.state = 1116;
                                         this.malloyOrSQLType();
                                     }
                                     break;
@@ -5979,15 +6020,15 @@ class MalloyParser extends Parser_1.Parser {
                                         _localctx = new ExprForRangeContext(new FieldExprContext(_parentctx, _parentState));
                                         _localctx._startAt = _prevctx;
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1118;
+                                        this.state = 1117;
                                         if (!(this.precpred(this._ctx, 18))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 18)");
                                         }
-                                        this.state = 1119;
+                                        this.state = 1118;
                                         this.match(MalloyParser.FOR);
-                                        this.state = 1120;
+                                        this.state = 1119;
                                         _localctx._duration = this.fieldExpr(0);
-                                        this.state = 1121;
+                                        this.state = 1120;
                                         this.timeframe();
                                     }
                                     break;
@@ -5995,13 +6036,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprAndTreeContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1123;
+                                        this.state = 1122;
                                         if (!(this.precpred(this._ctx, 17))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 17)");
                                         }
-                                        this.state = 1124;
+                                        this.state = 1123;
                                         this.match(MalloyParser.AMPER);
-                                        this.state = 1125;
+                                        this.state = 1124;
                                         this.partialAllowedFieldExpr();
                                     }
                                     break;
@@ -6009,13 +6050,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprOrTreeContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1126;
+                                        this.state = 1125;
                                         if (!(this.precpred(this._ctx, 16))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
                                         }
-                                        this.state = 1127;
+                                        this.state = 1126;
                                         this.match(MalloyParser.BAR);
-                                        this.state = 1128;
+                                        this.state = 1127;
                                         this.partialAllowedFieldExpr();
                                     }
                                     break;
@@ -6023,20 +6064,20 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprApplyContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 1129;
+                                        this.state = 1128;
                                         if (!(this.precpred(this._ctx, 14))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 14)");
                                         }
-                                        this.state = 1130;
+                                        this.state = 1129;
                                         this.match(MalloyParser.QMARK);
-                                        this.state = 1131;
+                                        this.state = 1130;
                                         this.partialAllowedFieldExpr();
                                     }
                                     break;
                             }
                         }
                     }
-                    this.state = 1136;
+                    this.state = 1135;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 110, this._ctx);
                 }
@@ -6063,42 +6104,42 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 224, MalloyParser.RULE_partialAllowedFieldExpr);
         let _la;
         try {
-            this.state = 1148;
+            this.state = 1147;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 113, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 1137;
+                        this.state = 1136;
                         this.match(MalloyParser.OPAREN);
-                        this.state = 1139;
+                        this.state = 1138;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (((((_la - 118)) & ~0x1F) === 0 && ((1 << (_la - 118)) & ((1 << (MalloyParser.LT - 118)) | (1 << (MalloyParser.GT - 118)) | (1 << (MalloyParser.EQ - 118)) | (1 << (MalloyParser.NE - 118)) | (1 << (MalloyParser.LTE - 118)) | (1 << (MalloyParser.GTE - 118)) | (1 << (MalloyParser.NOT_MATCH - 118)) | (1 << (MalloyParser.MATCH - 118)))) !== 0)) {
                             {
-                                this.state = 1138;
+                                this.state = 1137;
                                 this.compareOp();
                             }
                         }
-                        this.state = 1141;
+                        this.state = 1140;
                         this.fieldExpr(0);
-                        this.state = 1142;
+                        this.state = 1141;
                         this.match(MalloyParser.CPAREN);
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 1145;
+                        this.state = 1144;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (((((_la - 118)) & ~0x1F) === 0 && ((1 << (_la - 118)) & ((1 << (MalloyParser.LT - 118)) | (1 << (MalloyParser.GT - 118)) | (1 << (MalloyParser.EQ - 118)) | (1 << (MalloyParser.NE - 118)) | (1 << (MalloyParser.LTE - 118)) | (1 << (MalloyParser.GTE - 118)) | (1 << (MalloyParser.NOT_MATCH - 118)) | (1 << (MalloyParser.MATCH - 118)))) !== 0)) {
                             {
-                                this.state = 1144;
+                                this.state = 1143;
                                 this.compareOp();
                             }
                         }
-                        this.state = 1147;
+                        this.state = 1146;
                         this.fieldExpr(0);
                     }
                     break;
@@ -6127,7 +6168,7 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1151;
+                this.state = 1150;
                 this._errHandler.sync(this);
                 _alt = 1;
                 do {
@@ -6135,7 +6176,7 @@ class MalloyParser extends Parser_1.Parser {
                         case 1:
                             {
                                 {
-                                    this.state = 1150;
+                                    this.state = 1149;
                                     this.pick();
                                 }
                             }
@@ -6143,18 +6184,18 @@ class MalloyParser extends Parser_1.Parser {
                         default:
                             throw new NoViableAltException_1.NoViableAltException(this);
                     }
-                    this.state = 1153;
+                    this.state = 1152;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 114, this._ctx);
                 } while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER);
-                this.state = 1157;
+                this.state = 1156;
                 this._errHandler.sync(this);
                 switch (this.interpreter.adaptivePredict(this._input, 115, this._ctx)) {
                     case 1:
                         {
-                            this.state = 1155;
+                            this.state = 1154;
                             this.match(MalloyParser.ELSE);
-                            this.state = 1156;
+                            this.state = 1155;
                             _localctx._pickElse = this.fieldExpr(0);
                         }
                         break;
@@ -6184,20 +6225,20 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1159;
+                this.state = 1158;
                 this.match(MalloyParser.PICK);
-                this.state = 1161;
+                this.state = 1160;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (((((_la - 34)) & ~0x1F) === 0 && ((1 << (_la - 34)) & ((1 << (MalloyParser.ALL - 34)) | (1 << (MalloyParser.AVG - 34)) | (1 << (MalloyParser.CAST - 34)) | (1 << (MalloyParser.COUNT - 34)) | (1 << (MalloyParser.DAY - 34)) | (1 << (MalloyParser.EXCLUDE - 34)) | (1 << (MalloyParser.FALSE - 34)) | (1 << (MalloyParser.HOUR - 34)))) !== 0) || ((((_la - 66)) & ~0x1F) === 0 && ((1 << (_la - 66)) & ((1 << (MalloyParser.MAX - 66)) | (1 << (MalloyParser.MIN - 66)) | (1 << (MalloyParser.MINUTE - 66)) | (1 << (MalloyParser.MONTH - 66)) | (1 << (MalloyParser.NOT - 66)) | (1 << (MalloyParser.NOW - 66)) | (1 << (MalloyParser.NULL - 66)) | (1 << (MalloyParser.PICK - 66)) | (1 << (MalloyParser.QUARTER - 66)) | (1 << (MalloyParser.SECOND - 66)) | (1 << (MalloyParser.SOURCE_KW - 66)) | (1 << (MalloyParser.SUM - 66)) | (1 << (MalloyParser.TRUE - 66)) | (1 << (MalloyParser.WEEK - 66)) | (1 << (MalloyParser.YEAR - 66)) | (1 << (MalloyParser.HACKY_REGEX - 66)))) !== 0) || ((((_la - 98)) & ~0x1F) === 0 && ((1 << (_la - 98)) & ((1 << (MalloyParser.SQ_STRING - 98)) | (1 << (MalloyParser.DQ_STRING - 98)) | (1 << (MalloyParser.BQ_STRING - 98)) | (1 << (MalloyParser.OPAREN - 98)) | (1 << (MalloyParser.MINUS - 98)))) !== 0) || ((((_la - 136)) & ~0x1F) === 0 && ((1 << (_la - 136)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 136)) | (1 << (MalloyParser.LITERAL_HOUR - 136)) | (1 << (MalloyParser.LITERAL_DAY - 136)) | (1 << (MalloyParser.LITERAL_QUARTER - 136)) | (1 << (MalloyParser.LITERAL_MONTH - 136)) | (1 << (MalloyParser.LITERAL_WEEK - 136)) | (1 << (MalloyParser.LITERAL_YEAR - 136)) | (1 << (MalloyParser.IDENTIFIER - 136)) | (1 << (MalloyParser.NUMERIC_LITERAL - 136)) | (1 << (MalloyParser.INTEGER_LITERAL - 136)) | (1 << (MalloyParser.SQL_BEGIN - 136)))) !== 0)) {
                     {
-                        this.state = 1160;
+                        this.state = 1159;
                         _localctx._pickValue = this.fieldExpr(0);
                     }
                 }
-                this.state = 1163;
+                this.state = 1162;
                 this.match(MalloyParser.WHEN);
-                this.state = 1164;
+                this.state = 1163;
                 _localctx._pickWhen = this.partialAllowedFieldExpr();
             }
         }
@@ -6225,32 +6266,32 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1166;
+                this.state = 1165;
                 this.fieldExpr(0);
-                this.state = 1171;
+                this.state = 1170;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 117, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1167;
+                                this.state = 1166;
                                 this.match(MalloyParser.COMMA);
-                                this.state = 1168;
+                                this.state = 1167;
                                 this.fieldExpr(0);
                             }
                         }
                     }
-                    this.state = 1173;
+                    this.state = 1172;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 117, this._ctx);
                 }
-                this.state = 1175;
+                this.state = 1174;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 1174;
+                        this.state = 1173;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -6280,30 +6321,30 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1177;
+                this.state = 1176;
                 this.fieldName();
-                this.state = 1184;
+                this.state = 1183;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 120, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1179;
+                                this.state = 1178;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 1178;
+                                        this.state = 1177;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 1181;
+                                this.state = 1180;
                                 this.fieldName();
                             }
                         }
                     }
-                    this.state = 1186;
+                    this.state = 1185;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 120, this._ctx);
                 }
@@ -6333,39 +6374,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1187;
+                this.state = 1186;
                 this.collectionMember();
-                this.state = 1194;
+                this.state = 1193;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 122, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1189;
+                                this.state = 1188;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 1188;
+                                        this.state = 1187;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 1191;
+                                this.state = 1190;
                                 this.collectionMember();
                             }
                         }
                     }
-                    this.state = 1196;
+                    this.state = 1195;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 122, this._ctx);
                 }
-                this.state = 1198;
+                this.state = 1197;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 1197;
+                        this.state = 1196;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -6394,25 +6435,25 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1203;
+                this.state = 1202;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.BQ_STRING || _la === MalloyParser.IDENTIFIER) {
                     {
-                        this.state = 1200;
+                        this.state = 1199;
                         this.fieldPath();
-                        this.state = 1201;
+                        this.state = 1200;
                         this.match(MalloyParser.DOT);
                     }
                 }
-                this.state = 1205;
+                this.state = 1204;
                 this.match(MalloyParser.STAR);
-                this.state = 1207;
+                this.state = 1206;
                 this._errHandler.sync(this);
                 switch (this.interpreter.adaptivePredict(this._input, 125, this._ctx)) {
                     case 1:
                         {
-                            this.state = 1206;
+                            this.state = 1205;
                             this.starQualified();
                         }
                         break;
@@ -6442,29 +6483,29 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1209;
+                this.state = 1208;
                 this.match(MalloyParser.OCURLY);
-                this.state = 1213;
+                this.state = 1212;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 do {
                     {
-                        this.state = 1213;
+                        this.state = 1212;
                         this._errHandler.sync(this);
                         switch (this._input.LA(1)) {
                             case MalloyParser.EXCEPT:
                                 {
                                     {
-                                        this.state = 1210;
+                                        this.state = 1209;
                                         this.match(MalloyParser.EXCEPT);
-                                        this.state = 1211;
+                                        this.state = 1210;
                                         this.fieldNameList();
                                     }
                                 }
                                 break;
                             case MalloyParser.COMMA:
                                 {
-                                    this.state = 1212;
+                                    this.state = 1211;
                                     this.match(MalloyParser.COMMA);
                                 }
                                 break;
@@ -6472,11 +6513,11 @@ class MalloyParser extends Parser_1.Parser {
                                 throw new NoViableAltException_1.NoViableAltException(this);
                         }
                     }
-                    this.state = 1215;
+                    this.state = 1214;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 } while (_la === MalloyParser.EXCEPT || _la === MalloyParser.COMMA);
-                this.state = 1217;
+                this.state = 1216;
                 this.match(MalloyParser.CCURLY);
             }
         }
@@ -6503,16 +6544,16 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1219;
+                this.state = 1218;
                 this.tags();
-                this.state = 1220;
+                this.state = 1219;
                 this.fieldPath();
-                this.state = 1222;
+                this.state = 1221;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.DOT) {
                     {
-                        this.state = 1221;
+                        this.state = 1220;
                         this.refExpr();
                     }
                 }
@@ -6538,28 +6579,28 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new RefExprContext(this._ctx, this.state);
         this.enterRule(_localctx, 242, MalloyParser.RULE_refExpr);
         try {
-            this.state = 1231;
+            this.state = 1230;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 129, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 1224;
+                        this.state = 1223;
                         this.match(MalloyParser.DOT);
-                        this.state = 1225;
+                        this.state = 1224;
                         this.timeframe();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 1226;
+                        this.state = 1225;
                         this.match(MalloyParser.DOT);
-                        this.state = 1227;
+                        this.state = 1226;
                         this.aggregate();
-                        this.state = 1228;
+                        this.state = 1227;
                         this.match(MalloyParser.OPAREN);
-                        this.state = 1229;
+                        this.state = 1228;
                         this.match(MalloyParser.CPAREN);
                     }
                     break;
@@ -6585,27 +6626,27 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new CollectionMemberContext(this._ctx, this.state);
         this.enterRule(_localctx, 244, MalloyParser.RULE_collectionMember);
         try {
-            this.state = 1236;
+            this.state = 1235;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 130, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 1233;
+                        this.state = 1232;
                         this.taggedRef();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 1234;
+                        this.state = 1233;
                         this.collectionWildCard();
                     }
                     break;
                 case 3:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 1235;
+                        this.state = 1234;
                         this.fieldDef();
                     }
                     break;
@@ -6634,23 +6675,23 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1238;
+                this.state = 1237;
                 this.fieldName();
-                this.state = 1243;
+                this.state = 1242;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 131, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 1239;
+                                this.state = 1238;
                                 this.match(MalloyParser.DOT);
-                                this.state = 1240;
+                                this.state = 1239;
                                 this.fieldName();
                             }
                         }
                     }
-                    this.state = 1245;
+                    this.state = 1244;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 131, this._ctx);
                 }
@@ -6678,7 +6719,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1246;
+                this.state = 1245;
                 this.id();
             }
         }
@@ -6704,7 +6745,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1248;
+                this.state = 1247;
                 this.id();
             }
         }
@@ -6730,9 +6771,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1250;
+                this.state = 1249;
                 this.fieldExpr(0);
-                this.state = 1251;
+                this.state = 1250;
                 this.match(MalloyParser.EOF);
             }
         }
@@ -6758,7 +6799,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1253;
+                this.state = 1252;
                 this.id();
             }
         }
@@ -6784,7 +6825,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1255;
+                this.state = 1254;
                 this.id();
             }
         }
@@ -6810,7 +6851,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 1257;
+                this.state = 1256;
                 this.string();
             }
         }
@@ -6836,15 +6877,15 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
+                this.state = 1258;
+                this.match(MalloyParser.SEMI);
                 this.state = 1259;
                 this.match(MalloyParser.SEMI);
                 this.state = 1260;
-                this.match(MalloyParser.SEMI);
-                this.state = 1261;
                 this.match(MalloyParser.OBRACK);
-                this.state = 1262;
+                this.state = 1261;
                 this.string();
-                this.state = 1263;
+                this.state = 1262;
                 this.match(MalloyParser.CBRACK);
             }
         }
@@ -7303,7 +7344,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\x9D\u04F4\x04" +
+MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x9D\u04F3\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" +
@@ -7365,117 +7406,117 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\v;\x03;\x03;\x05;\u02B4\n;\x03;\x05;\u02B7\n;\x03;\x03;\x05;\u02BB\n" +
     ";\x05;\u02BD\n;\x03<\x03<\x03=\x03=\x05=\u02C3\n=\x03>\x03>\x03>\x07>" +
     "\u02C8\n>\f>\x0E>\u02CB\v>\x03>\x03>\x03?\x03?\x03?\x07?\u02D2\n?\f?\x0E" +
-    "?\u02D5\v?\x03?\x05?\u02D8\n?\x03@\x03@\x05@\u02DC\n@\x03A\x03A\x03A\x03" +
-    "B\x03B\x03C\x03C\x03C\x03C\x05C\u02E7\nC\x03D\x03D\x03D\x07D\u02EC\nD" +
-    "\fD\x0ED\u02EF\vD\x03D\x05D\u02F2\nD\x03E\x03E\x03E\x03F\x03F\x03F\x03" +
-    "G\x03G\x05G\u02FC\nG\x03G\x07G\u02FF\nG\fG\x0EG\u0302\vG\x03G\x05G\u0305" +
-    "\nG\x03H\x03H\x03I\x07I\u030A\nI\fI\x0EI\u030D\vI\x03I\x03I\x03I\x03I" +
-    "\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03" +
-    "J\x03J\x03J\x03J\x03J\x05J\u0325\nJ\x03K\x03K\x03L\x03L\x03L\x03L\x03" +
-    "M\x03M\x05M\u032F\nM\x03M\x07M\u0332\nM\fM\x0EM\u0335\vM\x03M\x05M\u0338" +
-    "\nM\x03N\x03N\x05N\u033C\nN\x03O\x03O\x03O\x03O\x03P\x03P\x05P\u0344\n" +
-    "P\x03P\x07P\u0347\nP\fP\x0EP\u034A\vP\x03P\x05P\u034D\nP\x03Q\x03Q\x03" +
-    "Q\x03Q\x05Q\u0353\nQ\x03Q\x03Q\x03Q\x03Q\x03Q\x05Q\u035A\nQ\x03R\x03R" +
-    "\x03R\x03R\x03S\x03S\x03S\x03S\x03T\x03T\x03T\x03T\x03U\x03U\x03U\x03" +
-    "U\x07U\u036C\nU\fU\x0EU\u036F\vU\x03U\x05U\u0372\nU\x03V\x03V\x03V\x03" +
-    "W\x03W\x05W\u0379\nW\x03W\x07W\u037C\nW\fW\x0EW\u037F\vW\x03W\x05W\u0382" +
-    "\nW\x03X\x03X\x05X\u0386\nX\x03X\x05X\u0389\nX\x03Y\x03Y\x03Y\x03Z\x03" +
-    "Z\x03Z\x03Z\x05Z\u0392\nZ\x03[\x03[\x03[\x05[\u0397\n[\x03\\\x03\\\x03" +
-    "\\\x05\\\u039C\n\\\x03\\\x05\\\u039F\n\\\x03]\x03]\x05]\u03A3\n]\x03]" +
-    "\x07]\u03A6\n]\f]\x0E]\u03A9\v]\x03^\x03^\x03^\x03^\x05^\u03AF\n^\x03" +
-    "_\x03_\x03_\x03`\x03`\x03`\x03a\x03a\x03b\x03b\x03c\x03c\x03d\x03d\x03" +
-    "e\x03e\x03f\x03f\x05f\u03C3\nf\x03g\x03g\x03h\x03h\x03i\x03i\x03i\x03" +
-    "i\x03i\x03i\x03i\x05i\u03D0\ni\x03j\x03j\x03j\x03j\x03j\x03j\x03j\x05" +
-    "j\u03D9\nj\x03k\x03k\x03l\x03l\x03m\x03m\x03n\x03n\x03o\x03o\x03p\x03" +
-    "p\x05p\u03E7\np\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03" +
-    "q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x05q\u03FF\n" +
-    "q\x03q\x03q\x03q\x03q\x05q\u0405\nq\x03q\x03q\x03q\x03q\x03q\x03q\x03" +
-    "q\x05q\u040E\nq\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03" +
-    "q\x05q\u041B\nq\x03q\x03q\x03q\x03q\x03q\x05q\u0422\nq\x05q\u0424\nq\x03" +
-    "q\x05q\u0427\nq\x03q\x03q\x05q\u042B\nq\x03q\x03q\x03q\x03q\x03q\x03q" +
-    "\x03q\x03q\x07q\u0435\nq\fq\x0Eq\u0438\vq\x03q\x03q\x05q\u043C\nq\x03" +
+    "?\u02D5\v?\x03?\x05?\u02D8\n?\x03@\x03@\x05@\u02DC\n@\x03@\x03@\x05@\u02E0" +
+    "\n@\x03A\x03A\x03A\x03B\x03B\x03C\x03C\x03C\x03C\x05C\u02EB\nC\x03D\x03" +
+    "D\x03D\x07D\u02F0\nD\fD\x0ED\u02F3\vD\x03D\x05D\u02F6\nD\x03E\x03E\x03" +
+    "E\x03F\x03F\x03F\x03G\x03G\x05G\u0300\nG\x03G\x07G\u0303\nG\fG\x0EG\u0306" +
+    "\vG\x03G\x05G\u0309\nG\x03H\x03H\x03I\x07I\u030E\nI\fI\x0EI\u0311\vI\x03" +
+    "I\x03I\x03I\x03I\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x03" +
+    "J\x03J\x03J\x03J\x03J\x03J\x03J\x03J\x05J\u0329\nJ\x03K\x03K\x03L\x03" +
+    "L\x03L\x03L\x03M\x03M\x05M\u0333\nM\x03M\x07M\u0336\nM\fM\x0EM\u0339\v" +
+    "M\x03M\x05M\u033C\nM\x03N\x03N\x05N\u0340\nN\x03O\x03O\x03O\x03O\x03P" +
+    "\x03P\x05P\u0348\nP\x03P\x07P\u034B\nP\fP\x0EP\u034E\vP\x03P\x05P\u0351" +
+    "\nP\x03Q\x03Q\x03Q\x03Q\x05Q\u0357\nQ\x03Q\x03Q\x03R\x03R\x03R\x03R\x03" +
+    "S\x03S\x03S\x03S\x03T\x03T\x03T\x03T\x03U\x03U\x03U\x03U\x07U\u036B\n" +
+    "U\fU\x0EU\u036E\vU\x03U\x05U\u0371\nU\x03V\x03V\x03V\x03W\x03W\x05W\u0378" +
+    "\nW\x03W\x07W\u037B\nW\fW\x0EW\u037E\vW\x03W\x05W\u0381\nW\x03X\x03X\x05" +
+    "X\u0385\nX\x03X\x05X\u0388\nX\x03Y\x03Y\x03Y\x03Z\x03Z\x03Z\x03Z\x05Z" +
+    "\u0391\nZ\x03[\x03[\x03[\x05[\u0396\n[\x03\\\x03\\\x03\\\x05\\\u039B\n" +
+    "\\\x03\\\x05\\\u039E\n\\\x03]\x03]\x05]\u03A2\n]\x03]\x07]\u03A5\n]\f" +
+    "]\x0E]\u03A8\v]\x03^\x03^\x03^\x03^\x05^\u03AE\n^\x03_\x03_\x03_\x03`" +
+    "\x03`\x03`\x03a\x03a\x03b\x03b\x03c\x03c\x03d\x03d\x03e\x03e\x03f\x03" +
+    "f\x05f\u03C2\nf\x03g\x03g\x03h\x03h\x03i\x03i\x03i\x03i\x03i\x03i\x03" +
+    "i\x05i\u03CF\ni\x03j\x03j\x03j\x03j\x03j\x03j\x03j\x05j\u03D8\nj\x03k" +
+    "\x03k\x03l\x03l\x03m\x03m\x03n\x03n\x03o\x03o\x03p\x03p\x05p\u03E6\np" +
+    "\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03" +
+    "q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x05q\u03FE\nq\x03q\x03q\x03" +
+    "q\x03q\x05q\u0404\nq\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x05q\u040D\nq" +
+    "\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x05q\u041A\nq" +
+    "\x03q\x03q\x03q\x03q\x03q\x05q\u0421\nq\x05q\u0423\nq\x03q\x05q\u0426" +
+    "\nq\x03q\x03q\x05q\u042A\nq\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x07" +
+    "q\u0434\nq\fq\x0Eq\u0437\vq\x03q\x03q\x05q\u043B\nq\x03q\x03q\x03q\x03" +
     "q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03" +
     "q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03" +
     "q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03q\x03" +
-    "q\x03q\x03q\x03q\x03q\x03q\x03q\x07q\u046F\nq\fq\x0Eq\u0472\vq\x03r\x03" +
-    "r\x05r\u0476\nr\x03r\x03r\x03r\x03r\x05r\u047C\nr\x03r\x05r\u047F\nr\x03" +
-    "s\x06s\u0482\ns\rs\x0Es\u0483\x03s\x03s\x05s\u0488\ns\x03t\x03t\x05t\u048C" +
-    "\nt\x03t\x03t\x03t\x03u\x03u\x03u\x07u\u0494\nu\fu\x0Eu\u0497\vu\x03u" +
-    "\x05u\u049A\nu\x03v\x03v\x05v\u049E\nv\x03v\x07v\u04A1\nv\fv\x0Ev\u04A4" +
-    "\vv\x03w\x03w\x05w\u04A8\nw\x03w\x07w\u04AB\nw\fw\x0Ew\u04AE\vw\x03w\x05" +
-    "w\u04B1\nw\x03x\x03x\x03x\x05x\u04B6\nx\x03x\x03x\x05x\u04BA\nx\x03y\x03" +
-    "y\x03y\x03y\x06y\u04C0\ny\ry\x0Ey\u04C1\x03y\x03y\x03z\x03z\x03z\x05z" +
-    "\u04C9\nz\x03{\x03{\x03{\x03{\x03{\x03{\x03{\x05{\u04D2\n{\x03|\x03|\x03" +
-    "|\x05|\u04D7\n|\x03}\x03}\x03}\x07}\u04DC\n}\f}\x0E}\u04DF\v}\x03~\x03" +
-    "~\x03\x7F\x03\x7F\x03\x80\x03\x80\x03\x80\x03\x81\x03\x81\x03\x82\x03" +
-    "\x82\x03\x83\x03\x83\x03\x84\x03\x84\x03\x84\x03\x84\x03\x84\x03\x84\x03" +
-    "\x84\x02\x02\x05df\xE0\x85\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\x02F\x02H\x02J\x02L\x02N\x02P\x02R\x02T\x02V\x02" +
-    "X\x02Z\x02\\\x02^\x02`\x02b\x02d\x02f\x02h\x02j\x02l\x02n\x02p\x02r\x02" +
-    "t\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\xFC\x02\xFE\x02\u0100\x02\u0102\x02\u0104\x02" +
-    "\u0106\x02\x02\x14\x04\x02qq\x99\x99\x04\x02\x03\x03\n\n\x04\x02\x19\x19" +
-    "\"\"\x06\x0288??CCPP\x04\x02\'\'11\x04\x02\x18\x18\x1D\x1D\x06\x0277[" +
-    "[\x92\x92\x94\x94\x06\x02((..DETT\x07\x02))//KKRRYY\x04\x02x}\x85\x86" +
-    "\x03\x02de\x03\x02\x93\x94\x04\x0277[[\x04\x02ff\x91\x91\t\x0200==FGO" +
-    "OQQ]]``\x04\x02$$55\x05\x02\x80\x80\x82\x82\x87\x87\x03\x02~\x7F\x02\u0542" +
-    "\x02\u010C\x03\x02\x02\x02\x04\u0119\x03\x02\x02\x02\x06\u011B\x03\x02" +
-    "\x02\x02\b\u0124\x03\x02\x02\x02\n\u0126\x03\x02\x02\x02\f\u012C\x03\x02" +
-    "\x02\x02\x0E\u012F\x03\x02\x02\x02\x10\u0133\x03\x02\x02\x02\x12\u0137" +
-    "\x03\x02\x02\x02\x14\u013C\x03\x02\x02\x02\x16\u0148\x03\x02\x02\x02\x18" +
-    "\u014A\x03\x02\x02\x02\x1A\u0153\x03\x02\x02\x02\x1C\u0157\x03\x02\x02" +
-    "\x02\x1E\u015D\x03\x02\x02\x02 \u0169\x03\x02\x02\x02\"\u016E\x03\x02" +
-    "\x02\x02$\u0171\x03\x02\x02\x02&\u0176\x03\x02\x02\x02(\u017B\x03\x02" +
-    "\x02\x02*\u017F\x03\x02\x02\x02,\u018E\x03\x02\x02\x02.\u0193\x03\x02" +
-    "\x02\x020\u0195\x03\x02\x02\x022\u0197\x03\x02\x02\x024\u01AD\x03\x02" +
-    "\x02\x026\u01AF\x03\x02\x02\x028\u01BB\x03\x02\x02\x02:\u01BD\x03\x02" +
-    "\x02\x02<\u01C2\x03\x02\x02\x02>\u01C4\x03\x02\x02\x02@\u01D1\x03\x02" +
-    "\x02\x02B\u01D6\x03\x02\x02\x02D\u01D8\x03\x02\x02\x02F\u01DA\x03\x02" +
-    "\x02\x02H\u01E6\x03\x02\x02\x02J\u01FE\x03\x02\x02\x02L\u0200\x03\x02" +
-    "\x02\x02N\u0204\x03\x02\x02\x02P\u0208\x03\x02\x02\x02R\u0215\x03\x02" +
-    "\x02\x02T\u0219\x03\x02\x02\x02V\u0226\x03\x02\x02\x02X\u022B\x03\x02" +
-    "\x02\x02Z\u022D\x03\x02\x02\x02\\\u022F\x03\x02\x02\x02^\u023E\x03\x02" +
-    "\x02\x02`\u0240\x03\x02\x02\x02b\u0246\x03\x02\x02\x02d\u0250\x03\x02" +
-    "\x02\x02f\u0267\x03\x02\x02\x02h\u0276\x03\x02\x02\x02j\u027B\x03\x02" +
-    "\x02\x02l\u027D\x03\x02\x02\x02n\u0287\x03\x02\x02\x02p\u0294\x03\x02" +
-    "\x02\x02r\u0299\x03\x02\x02\x02t\u02BC\x03\x02\x02\x02v\u02BE\x03\x02" +
-    "\x02\x02x\u02C2\x03\x02\x02\x02z\u02C4\x03\x02\x02\x02|\u02CE\x03\x02" +
-    "\x02\x02~\u02D9\x03\x02\x02\x02\x80\u02DD\x03\x02\x02\x02\x82\u02E0\x03" +
-    "\x02\x02\x02\x84\u02E6\x03\x02\x02\x02\x86\u02E8\x03\x02\x02\x02\x88\u02F3" +
-    "\x03\x02\x02\x02\x8A\u02F6\x03\x02\x02\x02\x8C\u02F9\x03\x02\x02\x02\x8E" +
-    "\u0306\x03\x02\x02\x02\x90\u030B\x03\x02\x02\x02\x92\u0324\x03\x02\x02" +
-    "\x02\x94\u0326\x03\x02\x02\x02\x96\u0328\x03\x02\x02\x02\x98\u032C\x03" +
-    "\x02\x02\x02\x9A\u033B\x03\x02\x02\x02\x9C\u033D\x03\x02\x02\x02\x9E\u0341" +
-    "\x03\x02\x02\x02\xA0\u0359\x03\x02\x02\x02\xA2\u035B\x03\x02\x02\x02\xA4" +
-    "\u035F\x03\x02\x02\x02\xA6\u0363\x03\x02\x02\x02\xA8\u0367\x03\x02\x02" +
-    "\x02\xAA\u0373\x03\x02\x02\x02\xAC\u0376\x03\x02\x02\x02\xAE\u0385\x03" +
-    "\x02\x02\x02\xB0\u038A\x03\x02\x02\x02\xB2\u0391\x03\x02\x02\x02\xB4\u0393" +
-    "\x03\x02\x02\x02\xB6\u039E\x03\x02\x02\x02\xB8\u03A0\x03\x02\x02\x02\xBA" +
-    "\u03AA\x03\x02\x02\x02\xBC\u03B0\x03\x02\x02\x02\xBE\u03B3\x03\x02\x02" +
-    "\x02\xC0\u03B6\x03\x02\x02\x02\xC2\u03B8\x03\x02\x02\x02\xC4\u03BA\x03" +
-    "\x02\x02\x02\xC6\u03BC\x03\x02\x02\x02\xC8\u03BE\x03\x02\x02\x02\xCA\u03C2" +
-    "\x03\x02\x02\x02\xCC\u03C4\x03\x02\x02\x02\xCE\u03C6\x03\x02\x02\x02\xD0" +
-    "\u03CF\x03\x02\x02\x02\xD2\u03D8\x03\x02\x02\x02\xD4\u03DA\x03\x02\x02" +
-    "\x02\xD6\u03DC\x03\x02\x02\x02\xD8\u03DE\x03\x02\x02\x02\xDA\u03E0\x03" +
-    "\x02\x02\x02\xDC\u03E2\x03\x02\x02\x02\xDE\u03E6\x03\x02\x02\x02\xE0\u043B" +
-    "\x03\x02\x02\x02\xE2\u047E\x03\x02\x02\x02\xE4\u0481\x03\x02\x02\x02\xE6" +
-    "\u0489\x03\x02\x02\x02\xE8\u0490\x03\x02\x02\x02\xEA\u049B\x03\x02\x02" +
-    "\x02\xEC\u04A5\x03\x02\x02\x02\xEE\u04B5\x03\x02\x02\x02\xF0\u04BB\x03" +
-    "\x02\x02\x02\xF2\u04C5\x03\x02\x02\x02\xF4\u04D1\x03\x02\x02\x02\xF6\u04D6" +
-    "\x03\x02\x02\x02\xF8\u04D8\x03\x02\x02\x02\xFA\u04E0\x03\x02\x02\x02\xFC" +
-    "\u04E2\x03\x02\x02\x02\xFE\u04E4\x03\x02\x02\x02\u0100\u04E7\x03\x02\x02" +
-    "\x02\u0102\u04E9\x03\x02\x02\x02\u0104\u04EB\x03\x02\x02\x02\u0106\u04ED" +
-    "\x03\x02\x02\x02\u0108\u010B\x05\x04\x03\x02\u0109\u010B\x07\x84\x02\x02" +
-    "\u010A\u0108\x03\x02\x02\x02\u010A\u0109\x03\x02\x02\x02\u010B\u010E\x03" +
-    "\x02\x02\x02\u010C\u010A\x03\x02\x02\x02\u010C\u010D\x03\x02\x02\x02\u010D" +
+    "q\x03q\x03q\x03q\x07q\u046E\nq\fq\x0Eq\u0471\vq\x03r\x03r\x05r\u0475\n" +
+    "r\x03r\x03r\x03r\x03r\x05r\u047B\nr\x03r\x05r\u047E\nr\x03s\x06s\u0481" +
+    "\ns\rs\x0Es\u0482\x03s\x03s\x05s\u0487\ns\x03t\x03t\x05t\u048B\nt\x03" +
+    "t\x03t\x03t\x03u\x03u\x03u\x07u\u0493\nu\fu\x0Eu\u0496\vu\x03u\x05u\u0499" +
+    "\nu\x03v\x03v\x05v\u049D\nv\x03v\x07v\u04A0\nv\fv\x0Ev\u04A3\vv\x03w\x03" +
+    "w\x05w\u04A7\nw\x03w\x07w\u04AA\nw\fw\x0Ew\u04AD\vw\x03w\x05w\u04B0\n" +
+    "w\x03x\x03x\x03x\x05x\u04B5\nx\x03x\x03x\x05x\u04B9\nx\x03y\x03y\x03y" +
+    "\x03y\x06y\u04BF\ny\ry\x0Ey\u04C0\x03y\x03y\x03z\x03z\x03z\x05z\u04C8" +
+    "\nz\x03{\x03{\x03{\x03{\x03{\x03{\x03{\x05{\u04D1\n{\x03|\x03|\x03|\x05" +
+    "|\u04D6\n|\x03}\x03}\x03}\x07}\u04DB\n}\f}\x0E}\u04DE\v}\x03~\x03~\x03" +
+    "\x7F\x03\x7F\x03\x80\x03\x80\x03\x80\x03\x81\x03\x81\x03\x82\x03\x82\x03" +
+    "\x83\x03\x83\x03\x84\x03\x84\x03\x84\x03\x84\x03\x84\x03\x84\x03\x84\x02" +
+    "\x02\x05df\xE0\x85\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\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\x02" +
+    "x\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\xFC\x02\xFE\x02\u0100\x02\u0102\x02\u0104\x02\u0106\x02\x02" +
+    "\x14\x04\x02qq\x99\x99\x04\x02\x03\x03\n\n\x04\x02\x19\x19\"\"\x06\x02" +
+    "88??CCPP\x04\x02\'\'11\x04\x02\x18\x18\x1D\x1D\x06\x0277[[\x92\x92\x94" +
+    "\x94\x06\x02((..DETT\x07\x02))//KKRRYY\x04\x02x}\x85\x86\x03\x02de\x03" +
+    "\x02\x93\x94\x04\x0277[[\x04\x02ff\x91\x91\t\x0200==FGOOQQ]]``\x04\x02" +
+    "$$55\x05\x02\x80\x80\x82\x82\x87\x87\x03\x02~\x7F\x02\u0542\x02\u010C" +
+    "\x03\x02\x02\x02\x04\u0119\x03\x02\x02\x02\x06\u011B\x03\x02\x02\x02\b" +
+    "\u0124\x03\x02\x02\x02\n\u0126\x03\x02\x02\x02\f\u012C\x03\x02\x02\x02" +
+    "\x0E\u012F\x03\x02\x02\x02\x10\u0133\x03\x02\x02\x02\x12\u0137\x03\x02" +
+    "\x02\x02\x14\u013C\x03\x02\x02\x02\x16\u0148\x03\x02\x02\x02\x18\u014A" +
+    "\x03\x02\x02\x02\x1A\u0153\x03\x02\x02\x02\x1C\u0157\x03\x02\x02\x02\x1E" +
+    "\u015D\x03\x02\x02\x02 \u0169\x03\x02\x02\x02\"\u016E\x03\x02\x02\x02" +
+    "$\u0171\x03\x02\x02\x02&\u0176\x03\x02\x02\x02(\u017B\x03\x02\x02\x02" +
+    "*\u017F\x03\x02\x02\x02,\u018E\x03\x02\x02\x02.\u0193\x03\x02\x02\x02" +
+    "0\u0195\x03\x02\x02\x022\u0197\x03\x02\x02\x024\u01AD\x03\x02\x02\x02" +
+    "6\u01AF\x03\x02\x02\x028\u01BB\x03\x02\x02\x02:\u01BD\x03\x02\x02\x02" +
+    "<\u01C2\x03\x02\x02\x02>\u01C4\x03\x02\x02\x02@\u01D1\x03\x02\x02\x02" +
+    "B\u01D6\x03\x02\x02\x02D\u01D8\x03\x02\x02\x02F\u01DA\x03\x02\x02\x02" +
+    "H\u01E6\x03\x02\x02\x02J\u01FE\x03\x02\x02\x02L\u0200\x03\x02\x02\x02" +
+    "N\u0204\x03\x02\x02\x02P\u0208\x03\x02\x02\x02R\u0215\x03\x02\x02\x02" +
+    "T\u0219\x03\x02\x02\x02V\u0226\x03\x02\x02\x02X\u022B\x03\x02\x02\x02" +
+    "Z\u022D\x03\x02\x02\x02\\\u022F\x03\x02\x02\x02^\u023E\x03\x02\x02\x02" +
+    "`\u0240\x03\x02\x02\x02b\u0246\x03\x02\x02\x02d\u0250\x03\x02\x02\x02" +
+    "f\u0267\x03\x02\x02\x02h\u0276\x03\x02\x02\x02j\u027B\x03\x02\x02\x02" +
+    "l\u027D\x03\x02\x02\x02n\u0287\x03\x02\x02\x02p\u0294\x03\x02\x02\x02" +
+    "r\u0299\x03\x02\x02\x02t\u02BC\x03\x02\x02\x02v\u02BE\x03\x02\x02\x02" +
+    "x\u02C2\x03\x02\x02\x02z\u02C4\x03\x02\x02\x02|\u02CE\x03\x02\x02\x02" +
+    "~\u02DF\x03\x02\x02\x02\x80\u02E1\x03\x02\x02\x02\x82\u02E4\x03\x02\x02" +
+    "\x02\x84\u02EA\x03\x02\x02\x02\x86\u02EC\x03\x02\x02\x02\x88\u02F7\x03" +
+    "\x02\x02\x02\x8A\u02FA\x03\x02\x02\x02\x8C\u02FD\x03\x02\x02\x02\x8E\u030A" +
+    "\x03\x02\x02\x02\x90\u030F\x03\x02\x02\x02\x92\u0328\x03\x02\x02\x02\x94" +
+    "\u032A\x03\x02\x02\x02\x96\u032C\x03\x02\x02\x02\x98\u0330\x03\x02\x02" +
+    "\x02\x9A\u033F\x03\x02\x02\x02\x9C\u0341\x03\x02\x02\x02\x9E\u0345\x03" +
+    "\x02\x02\x02\xA0\u0352\x03\x02\x02\x02\xA2\u035A\x03\x02\x02\x02\xA4\u035E" +
+    "\x03\x02\x02\x02\xA6\u0362\x03\x02\x02\x02\xA8\u0366\x03\x02\x02\x02\xAA" +
+    "\u0372\x03\x02\x02\x02\xAC\u0375\x03\x02\x02\x02\xAE\u0384\x03\x02\x02" +
+    "\x02\xB0\u0389\x03\x02\x02\x02\xB2\u0390\x03\x02\x02\x02\xB4\u0392\x03" +
+    "\x02\x02\x02\xB6\u039D\x03\x02\x02\x02\xB8\u039F\x03\x02\x02\x02\xBA\u03A9" +
+    "\x03\x02\x02\x02\xBC\u03AF\x03\x02\x02\x02\xBE\u03B2\x03\x02\x02\x02\xC0" +
+    "\u03B5\x03\x02\x02\x02\xC2\u03B7\x03\x02\x02\x02\xC4\u03B9\x03\x02\x02" +
+    "\x02\xC6\u03BB\x03\x02\x02\x02\xC8\u03BD\x03\x02\x02\x02\xCA\u03C1\x03" +
+    "\x02\x02\x02\xCC\u03C3\x03\x02\x02\x02\xCE\u03C5\x03\x02\x02\x02\xD0\u03CE" +
+    "\x03\x02\x02\x02\xD2\u03D7\x03\x02\x02\x02\xD4\u03D9\x03\x02\x02\x02\xD6" +
+    "\u03DB\x03\x02\x02\x02\xD8\u03DD\x03\x02\x02\x02\xDA\u03DF\x03\x02\x02" +
+    "\x02\xDC\u03E1\x03\x02\x02\x02\xDE\u03E5\x03\x02\x02\x02\xE0\u043A\x03" +
+    "\x02\x02\x02\xE2\u047D\x03\x02\x02\x02\xE4\u0480\x03\x02\x02\x02\xE6\u0488" +
+    "\x03\x02\x02\x02\xE8\u048F\x03\x02\x02\x02\xEA\u049A\x03\x02\x02\x02\xEC" +
+    "\u04A4\x03\x02\x02\x02\xEE\u04B4\x03\x02\x02\x02\xF0\u04BA\x03\x02\x02" +
+    "\x02\xF2\u04C4\x03\x02\x02\x02\xF4\u04D0\x03\x02\x02\x02\xF6\u04D5\x03" +
+    "\x02\x02\x02\xF8\u04D7\x03\x02\x02\x02\xFA\u04DF\x03\x02\x02\x02\xFC\u04E1" +
+    "\x03\x02\x02\x02\xFE\u04E3\x03\x02\x02\x02\u0100\u04E6\x03\x02\x02\x02" +
+    "\u0102\u04E8\x03\x02\x02\x02\u0104\u04EA\x03\x02\x02\x02\u0106\u04EC\x03" +
+    "\x02\x02\x02\u0108\u010B\x05\x04\x03\x02\u0109\u010B\x07\x84\x02\x02\u010A" +
+    "\u0108\x03\x02\x02\x02\u010A\u0109\x03\x02\x02\x02\u010B\u010E\x03\x02" +
+    "\x02\x02\u010C\u010A\x03\x02\x02\x02\u010C\u010D\x03\x02\x02\x02\u010D" +
     "\u010F\x03\x02\x02\x02\u010E\u010C\x03\x02\x02\x02\u010F\u0110\x07\x02" +
     "\x02\x03\u0110\x03\x03\x02\x02\x02\u0111\u011A\x05\x06\x04\x02\u0112\u011A" +
     "\x05\x12\n\x02\u0113\u011A\x05\b\x05\x02\u0114\u011A\x05\x1C\x0F\x02\u0115" +
@@ -7541,401 +7582,401 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\x02\x02\x02\u019E\u019F\x03\x02\x02\x02\u019F\u01A0\x07m\x02\x02\u01A0" +
     "3\x03\x02\x02\x02\u01A1\u01A2\x07V\x02\x02\u01A2\u01A3\x07l\x02\x02\u01A3" +
     "\u01A4\x05\xD6l\x02\u01A4\u01A5\x07m\x02\x02\u01A5\u01AE\x03\x02\x02\x02" +
-    "\u01A6\u01A7\x056\x1C\x02\u01A7\u01A8\x07w";
-MalloyParser._serializedATNSegment1 = "\x02\x02\u01A8\u01A9\x07V\x02\x02\u01A9\u01AA\x07l\x02\x02\u01AA\u01AB" +
-    "\x05\xD4k\x02\u01AB\u01AC\x07m\x02\x02\u01AC\u01AE\x03\x02\x02\x02\u01AD" +
-    "\u01A1\x03\x02\x02\x02\u01AD\u01A6\x03\x02\x02\x02\u01AE5\x03\x02\x02" +
-    "\x02\u01AF\u01B0\x05\xD8m\x02\u01B07\x03\x02\x02\x02\u01B1\u01BC\x05:" +
-    "\x1E\x02\u01B2\u01B7\x07p\x02\x02\u01B3\u01B6\x05\x92J\x02\u01B4\u01B6" +
-    "\x07\x84\x02\x02\u01B5\u01B3\x03\x02\x02\x02\u01B5\u01B4\x03\x02\x02\x02" +
-    "\u01B6\u01B9\x03\x02\x02\x02\u01B7\u01B5\x03\x02\x02\x02\u01B7\u01B8\x03" +
-    "\x02\x02\x02\u01B8\u01BA\x03\x02\x02\x02\u01B9\u01B7\x03\x02\x02\x02\u01BA" +
-    "\u01BC\x07q\x02\x02\u01BB\u01B1\x03\x02\x02\x02\u01BB\u01B2\x03\x02\x02" +
-    "\x02\u01BC9\x03\x02\x02\x02\u01BD\u01BE\x07p\x02\x02\u01BE\u01BF\x07\x89" +
-    "\x02\x02\u01BF\u01C0\x05\xE0q\x02\u01C0\u01C1\x07q\x02\x02\u01C1;\x03" +
-    "\x02\x02\x02\u01C2\u01C3\x05\xD8m\x02\u01C3=\x03\x02\x02\x02\u01C4\u01CB" +
-    "\x05@!\x02\u01C5\u01C7\x07v\x02\x02\u01C6\u01C5\x03\x02\x02\x02\u01C6" +
-    "\u01C7\x03\x02\x02\x02\u01C7\u01C8\x03\x02\x02\x02\u01C8\u01CA\x05@!\x02" +
-    "\u01C9\u01C6\x03\x02\x02\x02\u01CA\u01CD\x03\x02\x02\x02\u01CB\u01C9\x03" +
-    "\x02\x02\x02\u01CB\u01CC\x03\x02\x02\x02\u01CC\u01CF\x03\x02\x02\x02\u01CD" +
-    "\u01CB\x03\x02\x02\x02\u01CE\u01D0\x07v\x02\x02\u01CF\u01CE\x03\x02\x02" +
-    "\x02\u01CF\u01D0\x03\x02\x02\x02\u01D0?\x03\x02\x02\x02\u01D1\u01D2\x05" +
-    "\f\x07\x02\u01D2\u01D3\x05D#\x02\u01D3\u01D4\x05\x0E\b\x02\u01D4\u01D5" +
-    "\x05B\"\x02\u01D5A\x03\x02\x02\x02\u01D6\u01D7\x05d3\x02\u01D7C\x03\x02" +
-    "\x02\x02\u01D8\u01D9\x05\xD8m\x02\u01D9E\x03\x02\x02\x02\u01DA\u01DB\x05" +
-    "\xD8m\x02\u01DBG\x03\x02\x02\x02\u01DC\u01E1\x07p\x02\x02\u01DD\u01E0" +
-    "\x05J&\x02\u01DE\u01E0\x07\x84\x02\x02\u01DF\u01DD\x03\x02\x02\x02\u01DF" +
-    "\u01DE\x03\x02\x02\x02\u01E0\u01E3\x03\x02\x02\x02\u01E1\u01DF\x03\x02" +
-    "\x02\x02\u01E1\u01E2\x03\x02\x02\x02\u01E2\u01E4\x03\x02\x02\x02\u01E3" +
-    "\u01E1\x03\x02\x02\x02\u01E4\u01E7\x07q\x02\x02\u01E5\u01E7\x05:\x1E\x02" +
-    "\u01E6\u01DC\x03\x02\x02\x02\u01E6\u01E5\x03\x02\x02\x02\u01E7I\x03\x02" +
-    "\x02\x02\u01E8\u01FF\x05N(\x02\u01E9\u01FF\x05L\'\x02\u01EA\u01FF\x05" +
-    "\\/\x02\u01EB\u01FF\x05^0\x02\u01EC\u01FF\x05\x88E\x02\u01ED\u01EE\x07" +
-    "\x17\x02\x02\u01EE\u01FF\x05\xFC\x7F\x02\u01EF\u01F0\x07\x1A\x02\x02\u01F0" +
-    "\u01FF\x05P)\x02\u01F1\u01F2\t\x03\x02\x02\u01F2\u01FF\x05\xEAv\x02\u01F3" +
-    "\u01F4\x05\f\x07\x02\u01F4\u01F5\t\x04\x02\x02\u01F5\u01F6\x05\x8CG\x02" +
-    "\u01F6\u01FF\x03\x02\x02\x02\u01F7\u01FF\x05\xBE`\x02\u01F8\u01FA\x07" +
-    "h\x02\x02\u01F9\u01F8\x03\x02\x02\x02\u01FA\u01FB\x03\x02\x02\x02\u01FB" +
-    "\u01F9\x03\x02\x02\x02\u01FB\u01FC\x03\x02\x02\x02\u01FC\u01FF\x03\x02" +
-    "\x02\x02\u01FD\u01FF\x05(\x15\x02\u01FE\u01E8\x03\x02\x02\x02\u01FE\u01E9" +
-    "\x03\x02\x02\x02\u01FE\u01EA\x03\x02\x02\x02\u01FE\u01EB\x03\x02\x02\x02" +
-    "\u01FE\u01EC\x03\x02\x02\x02\u01FE\u01ED\x03\x02\x02\x02\u01FE\u01EF\x03" +
-    "\x02\x02\x02\u01FE\u01F1\x03\x02\x02\x02\u01FE\u01F3\x03\x02\x02\x02\u01FE" +
-    "\u01F7\x03\x02\x02\x02\u01FE\u01F9\x03\x02\x02\x02\u01FE\u01FD\x03\x02" +
-    "\x02\x02\u01FFK\x03\x02\x02\x02\u0200\u0201\x05\f\x07\x02\u0201\u0202" +
-    "\x07\x13\x02\x02\u0202\u0203\x05T+\x02\u0203M\x03\x02\x02\x02\u0204\u0205" +
-    "\x05\f\x07\x02\u0205\u0206\x07\t\x02\x02\u0206\u0207\x05T+\x02\u0207O" +
-    "\x03\x02\x02\x02\u0208\u020F\x05R*\x02\u0209\u020B\x07v\x02\x02\u020A" +
-    "\u0209\x03\x02\x02\x02\u020A\u020B\x03\x02\x02\x02\u020B\u020C\x03\x02" +
-    "\x02\x02\u020C\u020E\x05R*\x02\u020D\u020A\x03\x02\x02\x02\u020E\u0211" +
-    "\x03\x02\x02\x02\u020F\u020D\x03\x02\x02\x02\u020F\u0210\x03\x02\x02\x02" +
-    "\u0210\u0213\x03\x02\x02\x02\u0211\u020F\x03\x02\x02\x02\u0212\u0214\x07" +
-    "v\x02\x02\u0213\u0212\x03\x02\x02\x02\u0213\u0214\x03\x02\x02\x02\u0214" +
-    "Q\x03\x02\x02\x02\u0215\u0216\x05\xFC\x7F\x02\u0216\u0217\x05\x0E\b\x02" +
-    "\u0217\u0218\x05\xFC\x7F\x02\u0218S\x03\x02\x02\x02\u0219\u0220\x05V," +
-    "\x02\u021A\u021C\x07v\x02\x02\u021B\u021A\x03\x02\x02\x02\u021B\u021C" +
-    "\x03\x02\x02\x02\u021C\u021D\x03\x02\x02\x02\u021D\u021F\x05V,\x02\u021E" +
-    "\u021B\x03\x02\x02\x02\u021F\u0222\x03\x02\x02\x02\u0220\u021E\x03\x02" +
-    "\x02\x02\u0220\u0221\x03\x02\x02\x02\u0221\u0224\x03\x02\x02\x02\u0222" +
-    "\u0220\x03\x02\x02\x02\u0223\u0225\x07v\x02\x02\u0224\u0223\x03\x02\x02" +
-    "\x02\u0224\u0225\x03\x02\x02\x02\u0225U\x03\x02\x02\x02\u0226\u0227\x05" +
-    "\f\x07\x02\u0227\u0228\x05X-\x02\u0228\u0229\x05\x0E\b\x02\u0229\u022A" +
-    "\x05\xE0q\x02\u022AW\x03\x02\x02\x02\u022B\u022C\x05\xD8m\x02\u022CY\x03" +
-    "\x02\x02\x02\u022D\u022E\x05\xD8m\x02\u022E[\x03\x02\x02\x02\u022F\u0230" +
-    "\x07\b\x02\x02\u0230\u0231\x05T+\x02\u0231]\x03\x02\x02\x02\u0232\u0233" +
-    "\x05\f\x07\x02\u0233\u0234\x07\x10\x02\x02\u0234\u0235\x05n8\x02\u0235" +
-    "\u023F\x03\x02\x02\x02\u0236\u0237\x05\f\x07\x02\u0237\u0238\x07\x11\x02" +
-    "\x02\u0238\u0239\x05n8\x02\u0239\u023F\x03\x02\x02\x02\u023A\u023B\x05" +
-    "\f\x07\x02\u023B\u023C\x07\x0F\x02\x02\u023C\u023D\x05n8\x02\u023D\u023F" +
-    "\x03\x02\x02\x02\u023E\u0232\x03\x02\x02\x02\u023E\u0236\x03\x02\x02\x02" +
-    "\u023E\u023A\x03\x02\x02\x02\u023F_\x03\x02\x02\x02\u0240\u0241\x07\v" +
-    "\x02\x02\u0241\u0242\x05l7\x02\u0242a\x03\x02\x02\x02\u0243\u0247\x05" +
-    "^0\x02\u0244\u0247\x05\x88E\x02\u0245\u0247\x05\\/\x02\u0246\u0243\x03" +
-    "\x02\x02\x02\u0246\u0244\x03\x02\x02\x02\u0246\u0245\x03\x02\x02\x02\u0247" +
-    "c\x03\x02\x02\x02\u0248\u0249\b3\x01\x02\u0249\u0251\x05\xD8m\x02\u024A" +
-    "\u024B\x07l\x02\x02\u024B\u024C\x05d3\x02\u024C\u024D\x07m\x02\x02\u024D" +
-    "\u0251\x03\x02\x02\x02\u024E\u0251\x054\x1B\x02\u024F\u0251\x052\x1A\x02" +
-    "\u0250\u0248\x03\x02\x02\x02\u0250\u024A\x03\x02\x02\x02\u0250\u024E\x03" +
-    "\x02\x02\x02\u0250\u024F\x03\x02\x02\x02\u0251\u025D\x03\x02\x02\x02\u0252" +
-    "\u0253\f\x07\x02\x02\u0253\u0254\x07~\x02\x02\u0254\u025C\x05f4\x02\u0255" +
-    "\u0256\f\x06\x02\x02\u0256\u0257\x07j\x02\x02\u0257\u025C\x05f4\x02\u0258" +
-    "\u0259\f\x05\x02\x02\u0259\u025A\x076\x02\x02\u025A\u025C\x05H%\x02\u025B" +
-    "\u0252\x03\x02\x02\x02\u025B\u0255\x03\x02\x02\x02\u025B\u0258\x03\x02" +
-    "\x02\x02\u025C\u025F\x03\x02\x02\x02\u025D\u025B\x03\x02\x02\x02\u025D" +
-    "\u025E\x03\x02\x02\x02\u025Ee\x03\x02\x02\x02\u025F\u025D\x03\x02\x02" +
-    "\x02\u0260\u0261\b4\x01\x02\u0261\u0268\x05\xF8}\x02\u0262\u0268\x058" +
-    "\x1D\x02\u0263\u0264\x07l\x02\x02\u0264\u0265\x05h5\x02\u0265\u0266\x07" +
-    "m\x02\x02\u0266\u0268\x03\x02\x02\x02\u0267\u0260\x03\x02\x02\x02\u0267" +
-    "\u0262\x03\x02\x02\x02\u0267\u0263\x03\x02\x02\x02\u0268\u026E\x03\x02" +
-    "\x02\x02\u0269\u026A\f\x03\x02\x02\u026A\u026B\x07~\x02\x02\u026B\u026D" +
-    "\x05f4\x04\u026C\u0269\x03\x02\x02\x02\u026D\u0270\x03\x02\x02\x02\u026E" +
-    "\u026C\x03\x02\x02\x02\u026E\u026F\x03\x02\x02\x02\u026Fg\x03\x02\x02" +
-    "\x02\u0270\u026E\x03\x02\x02\x02\u0271\u0277\x05f4\x02\u0272\u0273\x05" +
-    "f4\x02\u0273\u0274\x07j\x02\x02\u0274\u0275\x05h5\x02\u0275\u0277\x03" +
-    "\x02\x02\x02\u0276\u0271\x03\x02\x02\x02\u0276\u0272\x03\x02\x02\x02\u0277" +
-    "i\x03\x02\x02\x02\u0278\u027C\x05N(\x02\u0279\u027C\x05L\'\x02\u027A\u027C" +
-    "\x05^0\x02\u027B\u0278\x03\x02\x02\x02\u027B\u0279\x03\x02\x02\x02\u027B" +
-    "\u027A\x03\x02\x02\x02\u027Ck\x03\x02\x02\x02\u027D\u0282\x07p\x02\x02" +
-    "\u027E\u0281\x05j6\x02\u027F\u0281\x07\x84\x02\x02\u0280\u027E\x03\x02" +
-    "\x02\x02\u0280\u027F\x03\x02\x02\x02\u0281\u0284\x03\x02\x02\x02\u0282" +
-    "\u0280\x03\x02\x02\x02\u0282\u0283\x03\x02\x02\x02\u0283\u0285\x03\x02" +
-    "\x02\x02\u0284\u0282\x03\x02\x02\x02\u0285\u0286\x07q\x02\x02\u0286m\x03" +
-    "\x02\x02\x02\u0287\u028E\x05t;\x02\u0288\u028A\x07v\x02\x02\u0289\u0288" +
-    "\x03\x02\x02\x02\u0289\u028A\x03\x02\x02\x02\u028A\u028B\x03\x02\x02\x02" +
-    "\u028B\u028D\x05t;\x02\u028C\u0289\x03\x02\x02\x02\u028D\u0290\x03\x02" +
-    "\x02\x02\u028E\u028C\x03\x02\x02\x02\u028E\u028F\x03\x02\x02\x02\u028F" +
-    "\u0292\x03\x02\x02\x02\u0290\u028E\x03\x02\x02\x02\u0291\u0293\x07v\x02" +
-    "\x02\u0292\u0291\x03\x02\x02\x02\u0292\u0293\x03\x02\x02\x02\u0293o\x03" +
-    "\x02\x02\x02\u0294\u0295\x05\f\x07\x02\u0295\u0296\x07@\x02\x02\u0296" +
-    "\u0297\x05\f\x07\x02\u0297\u0298\x05d3\x02\u0298q\x03\x02\x02\x02\u0299" +
-    "\u029A\t\x05\x02\x02\u029As\x03\x02\x02\x02\u029B\u029D\x07h\x02\x02\u029C" +
-    "\u029B\x03\x02\x02\x02\u029D\u02A0\x03\x02\x02\x02\u029E\u029C\x03\x02" +
-    "\x02\x02\u029E\u029F\x03\x02\x02\x02\u029F\u02A1\x03\x02\x02\x02\u02A0" +
-    "\u029E\x03\x02\x02\x02\u02A1\u02A3\x05Z.\x02\u02A2\u02A4\x05p9\x02\u02A3" +
-    "\u02A2\x03\x02\x02\x02\u02A3\u02A4\x03\x02\x02\x02\u02A4\u02A6\x03\x02" +
-    "\x02\x02\u02A5\u02A7\x05r:\x02\u02A6\u02A5\x03\x02\x02\x02\u02A6\u02A7" +
-    "\x03\x02\x02\x02\u02A7\u02A8\x03\x02\x02\x02\u02A8\u02A9\x07_\x02\x02" +
-    "\u02A9\u02AA\x05\xE0q\x02\u02AA\u02BD\x03\x02\x02\x02\u02AB\u02AD\x07" +
-    "h\x02\x02\u02AC\u02AB\x03\x02\x02\x02\u02AD\u02B0\x03\x02\x02\x02\u02AE" +
-    "\u02AC\x03\x02\x02\x02\u02AE\u02AF\x03\x02\x02\x02\u02AF\u02B1\x03\x02" +
-    "\x02\x02\u02B0\u02AE\x03\x02\x02\x02\u02B1\u02B3\x05Z.\x02\u02B2\u02B4" +
-    "\x05p9\x02\u02B3\u02B2\x03\x02\x02\x02\u02B3\u02B4\x03\x02\x02\x02\u02B4" +
-    "\u02BA\x03\x02\x02\x02\u02B5\u02B7\x05r:\x02\u02B6\u02B5\x03\x02\x02\x02" +
-    "\u02B6\u02B7\x03\x02\x02\x02\u02B7\u02B8\x03\x02\x02\x02\u02B8\u02B9\x07" +
-    "L\x02\x02\u02B9\u02BB\x05v<\x02\u02BA\u02B6\x03\x02\x02\x02\u02BA\u02BB" +
-    "\x03\x02\x02\x02\u02BB\u02BD\x03\x02\x02\x02\u02BC\u029E\x03\x02\x02\x02" +
-    "\u02BC\u02AE\x03\x02\x02\x02\u02BDu\x03\x02\x02\x02\u02BE\u02BF\x05\xE0" +
-    "q\x02\u02BFw\x03\x02\x02\x02\u02C0\u02C3\x05\x88E\x02\u02C1\u02C3\x05" +
-    "\x8AF\x02\u02C2\u02C0\x03\x02\x02\x02\u02C2\u02C1\x03\x02\x02\x02\u02C3" +
-    "y\x03\x02\x02\x02\u02C4\u02C9\x07p\x02\x02\u02C5\u02C8\x05\x84C\x02\u02C6" +
-    "\u02C8\x07\x84\x02\x02\u02C7\u02C5\x03\x02\x02\x02\u02C7\u02C6\x03\x02" +
-    "\x02\x02\u02C8\u02CB\x03\x02\x02\x02\u02C9\u02C7\x03\x02\x02\x02\u02C9" +
-    "\u02CA\x03\x02\x02\x02\u02CA\u02CC\x03\x02\x02\x02\u02CB\u02C9\x03\x02" +
-    "\x02\x02\u02CC\u02CD\x07q\x02\x02\u02CD{\x03\x02\x02\x02\u02CE\u02D3\x05" +
-    "~@\x02\u02CF\u02D0\x07v\x02\x02\u02D0\u02D2\x05~@\x02\u02D1\u02CF\x03" +
-    "\x02\x02\x02\u02D2\u02D5\x03\x02\x02\x02\u02D3\u02D1\x03\x02\x02\x02\u02D3" +
-    "\u02D4\x03\x02\x02\x02\u02D4\u02D7\x03\x02\x02\x02\u02D5\u02D3\x03\x02" +
-    "\x02\x02\u02D6\u02D8\x07v\x02\x02\u02D7\u02D6\x03\x02\x02\x02\u02D7\u02D8" +
-    "\x03\x02\x02\x02\u02D8}\x03\x02\x02\x02\u02D9\u02DB\x05\xE0q\x02\u02DA" +
-    "\u02DC\t\x06\x02\x02\u02DB\u02DA\x03\x02\x02\x02\u02DB\u02DC\x03\x02\x02" +
-    "\x02\u02DC\x7F\x03\x02\x02\x02\u02DD\u02DE\x07\x15\x02\x02\u02DE\u02DF" +
-    "\x05|?\x02\u02DF\x81\x03\x02\x02\x02\u02E0\u02E1\x05\xB0Y\x02\u02E1\x83" +
-    "\x03\x02\x02\x02\u02E2\u02E7\x05\x88E\x02\u02E3\u02E7\x05\xA8U\x02\u02E4" +
-    "\u02E7\x05\x80A\x02\u02E5\u02E7\x05\x82B\x02\u02E6\u02E2\x03\x02\x02\x02" +
-    "\u02E6\u02E3\x03\x02\x02\x02\u02E6\u02E4\x03\x02\x02\x02\u02E6\u02E5\x03" +
-    "\x02\x02\x02\u02E7\x85\x03\x02\x02\x02\u02E8\u02ED\x05\xE0q\x02\u02E9" +
-    "\u02EA\x07v\x02\x02\u02EA\u02EC\x05\xE0q\x02\u02EB\u02E9\x03\x02\x02\x02" +
-    "\u02EC\u02EF\x03\x02\x02\x02\u02ED\u02EB\x03\x02\x02\x02\u02ED\u02EE\x03" +
-    "\x02\x02\x02\u02EE\u02F1\x03\x02\x02\x02\u02EF\u02ED\x03\x02\x02\x02\u02F0" +
-    "\u02F2\x07v\x02\x02\u02F1\u02F0\x03\x02\x02\x02\u02F1\u02F2\x03\x02\x02" +
-    "\x02\u02F2\x87\x03\x02\x02\x02\u02F3\u02F4\x07!\x02\x02\u02F4\u02F5\x05" +
-    "\x86D\x02\u02F5\x89\x03\x02\x02\x02\u02F6\u02F7\x07\r\x02\x02\u02F7\u02F8" +
-    "\x05\x86D\x02\u02F8\x8B\x03\x02\x02\x02\u02F9\u0300\x05\x90I\x02\u02FA" +
-    "\u02FC\x07v\x02\x02\u02FB\u02FA\x03\x02\x02\x02\u02FB\u02FC\x03\x02\x02" +
-    "\x02\u02FC\u02FD\x03\x02\x02\x02\u02FD\u02FF\x05\x90I\x02\u02FE\u02FB" +
-    "\x03\x02\x02\x02\u02FF\u0302\x03\x02\x02\x02\u0300\u02FE\x03\x02\x02\x02" +
-    "\u0300\u0301\x03\x02\x02\x02\u0301\u0304\x03\x02\x02\x02\u0302\u0300\x03" +
-    "\x02\x02\x02\u0303\u0305\x07v\x02\x02\u0304\u0303\x03\x02\x02\x02\u0304" +
-    "\u0305\x03\x02\x02\x02\u0305\x8D\x03\x02\x02\x02\u0306\u0307\x05\xD8m" +
-    "\x02\u0307\x8F\x03\x02\x02\x02\u0308\u030A\x07h\x02\x02\u0309\u0308\x03" +
-    "\x02\x02\x02\u030A\u030D\x03\x02\x02\x02\u030B\u0309\x03\x02\x02\x02\u030B" +
-    "\u030C\x03\x02\x02\x02\u030C\u030E\x03\x02\x02\x02\u030D\u030B\x03\x02" +
-    "\x02\x02\u030E\u030F\x05\x8EH\x02\u030F\u0310\x05\x0E\b\x02\u0310\u0311" +
-    "\x05h5\x02\u0311\x91\x03\x02\x02\x02\u0312\u0325\x05\x96L\x02\u0313\u0325" +
-    "\x05\\/\x02\u0314\u0325\x05\x94K\x02\u0315\u0325\x05`1\x02\u0316\u0325" +
-    "\x05\xA6T\x02\u0317\u0325\x05\xBA^\x02\u0318\u0325\x05\xA2R\x02\u0319" +
-    "\u0325\x05\xA4S\x02\u031A\u0325\x05\xB4[\x02\u031B\u0325\x05\xB0Y\x02" +
-    "\u031C\u0325\x05\xAAV\x02\u031D\u0325\x05\x88E\x02\u031E\u0325\x05\x8A" +
-    "F\x02\u031F\u0325\x05\x9CO\x02\u0320\u0325\x05\xBC_\x02\u0321\u0325\x05" +
-    "\xBE`\x02\u0322\u0325\x05\xC0a\x02\u0323\u0325\x05(\x15\x02\u0324\u0312" +
-    "\x03\x02\x02\x02\u0324\u0313\x03\x02\x02\x02\u0324\u0314\x03\x02\x02\x02" +
-    "\u0324\u0315\x03\x02\x02\x02\u0324\u0316\x03\x02\x02\x02\u0324\u0317\x03" +
-    "\x02\x02\x02\u0324\u0318\x03\x02\x02\x02\u0324\u0319\x03\x02\x02\x02\u0324" +
-    "\u031A\x03\x02\x02\x02\u0324\u031B\x03\x02\x02\x02\u0324\u031C\x03\x02" +
-    "\x02\x02\u0324\u031D\x03\x02\x02\x02\u0324\u031E\x03\x02\x02\x02\u0324" +
-    "\u031F\x03\x02\x02\x02\u0324\u0320\x03\x02\x02\x02\u0324\u0321\x03\x02" +
-    "\x02\x02\u0324\u0322\x03\x02\x02\x02\u0324\u0323\x03\x02\x02\x02\u0325" +
-    "\x93\x03\x02\x02\x02\u0326\u0327\x05^0\x02\u0327\x95\x03\x02\x02\x02\u0328" +
-    "\u0329\x05\f\x07\x02\u0329\u032A\x07\f\x02\x02\u032A\u032B\x05\x98M\x02" +
-    "\u032B\x97\x03\x02\x02\x02\u032C\u0333\x05\x9AN\x02\u032D\u032F\x07v\x02" +
-    "\x02\u032E\u032D\x03\x02\x02\x02\u032E\u032F\x03\x02\x02\x02\u032F\u0330" +
-    "\x03\x02\x02\x02\u0330\u0332\x05\x9AN\x02\u0331\u032E\x03\x02\x02\x02" +
-    "\u0332\u0335\x03\x02\x02\x02\u0333\u0331\x03\x02\x02\x02\u0333\u0334\x03" +
-    "\x02\x02\x02\u0334\u0337\x03\x02\x02\x02\u0335\u0333\x03\x02\x02\x02\u0336" +
-    "\u0338\x07v\x02\x02\u0337\u0336\x03\x02\x02\x02\u0337\u0338\x03\x02\x02" +
-    "\x02\u0338\x99\x03\x02\x02\x02\u0339\u033C\x05\xF2z\x02\u033A\u033C\x05" +
-    "V,\x02\u033B\u0339\x03\x02\x02\x02\u033B\u033A\x03\x02\x02\x02\u033C\x9B" +
-    "\x03\x02\x02\x02\u033D\u033E\x05\f\x07\x02\u033E\u033F\x07\x14\x02\x02" +
-    "\u033F\u0340\x05\x9EP\x02\u0340\x9D\x03\x02\x02\x02\u0341\u0348\x05\xA0" +
-    "Q\x02\u0342\u0344\x07v\x02\x02\u0343\u0342\x03\x02\x02\x02\u0343\u0344" +
-    "\x03\x02\x02\x02\u0344\u0345\x03\x02\x02\x02\u0345\u0347\x05\xA0Q\x02" +
-    "\u0346\u0343\x03\x02\x02\x02\u0347\u034A\x03\x02\x02\x02\u0348\u0346\x03" +
-    "\x02\x02\x02\u0348\u0349\x03\x02\x02\x02\u0349\u034C\x03\x02\x02\x02\u034A" +
-    "\u0348\x03\x02\x02\x02\u034B\u034D\x07v\x02\x02\u034C\u034B\x03\x02\x02" +
-    "\x02\u034C\u034D\x03\x02\x02\x02\u034D\x9F\x03\x02\x02\x02\u034E\u034F" +
-    "\x05\f\x07\x02\u034F\u0352\x05\xF8}\x02\u0350\u0351\x07~\x02\x02\u0351" +
-    "\u0353\x05h5\x02\u0352\u0350\x03\x02\x02\x02\u0352\u0353\x03\x02\x02\x02" +
-    "\u0353\u035A\x03\x02\x02\x02\u0354\u0355\x05\f\x07\x02\u0355\u0356\x05" +
-    "<\x1F\x02\u0356\u0357\x05\x0E\b\x02\u0357\u0358\x05h5\x02\u0358\u035A" +
-    "\x03\x02\x02\x02\u0359\u034E\x03\x02\x02\x02\u0359\u0354\x03\x02\x02\x02" +
-    "\u035A\xA1\x03\x02\x02\x02\u035B\u035C\x05\f\x07\x02\u035C\u035D\x07\x04" +
-    "\x02\x02\u035D\u035E\x05\x98M\x02\u035E\xA3\x03\x02\x02\x02\u035F\u0360" +
-    "\x05\f\x07\x02\u0360\u0361\x07\x05\x02\x02\u0361\u0362\x05\x98M\x02\u0362" +
-    "\xA5\x03\x02\x02\x02\u0363\u0364\x05\f\x07\x02\u0364\u0365\t\x07\x02\x02" +
-    "\u0365\u0366\x05\xECw\x02\u0366\xA7\x03\x02\x02\x02\u0367\u0368\x07\x16" +
-    "\x02\x02\u0368\u036D\x05\xD8m\x02\u0369\u036A\x07v\x02\x02\u036A\u036C" +
-    "\x05\xD8m\x02\u036B\u0369\x03\x02\x02\x02\u036C\u036F\x03\x02\x02\x02" +
-    "\u036D\u036B\x03\x02\x02\x02\u036D\u036E\x03\x02\x02\x02\u036E\u0371\x03" +
-    "\x02\x02\x02\u036F\u036D\x03\x02\x02\x02\u0370\u0372\x07v\x02\x02\u0371" +
-    "\u0370\x03\x02\x02\x02\u0371\u0372\x03\x02\x02\x02\u0372\xA9\x03\x02\x02" +
-    "\x02\u0373\u0374\x07\x15\x02\x02\u0374\u0375\x05\xACW\x02\u0375\xAB\x03" +
-    "\x02\x02\x02\u0376\u037D\x05\xAEX\x02\u0377\u0379\x07v\x02\x02\u0378\u0377" +
-    "\x03\x02\x02\x02\u0378\u0379\x03\x02\x02\x02\u0379\u037A\x03\x02\x02\x02" +
-    "\u037A\u037C\x05\xAEX\x02\u037B\u0378\x03\x02\x02\x02\u037C\u037F\x03" +
-    "\x02\x02\x02\u037D\u037B\x03\x02\x02\x02\u037D\u037E\x03\x02\x02\x02\u037E" +
-    "\u0381\x03\x02\x02\x02\u037F\u037D\x03\x02\x02\x02\u0380\u0382\x07v\x02" +
-    "\x02\u0381\u0380\x03\x02\x02\x02\u0381\u0382\x03\x02\x02\x02\u0382\xAD" +
-    "\x03\x02\x02\x02\u0383\u0386\x07\x94\x02\x02\u0384\u0386\x05\xFC\x7F\x02" +
-    "\u0385\u0383\x03\x02\x02\x02\u0385\u0384\x03\x02\x02\x02\u0386\u0388\x03" +
-    "\x02\x02\x02\u0387\u0389\t\x06\x02\x02\u0388\u0387\x03\x02\x02\x02\u0388" +
-    "\u0389\x03\x02\x02\x02\u0389\xAF\x03\x02\x02\x02\u038A\u038B\x07\x12\x02" +
-    "\x02\u038B\u038C\x07\x94\x02\x02\u038C\xB1\x03\x02\x02\x02\u038D\u038E" +
-    "\x07*\x02\x02\u038E\u0392\x05\xFC\x7F\x02\u038F\u0390\x07*\x02\x02\u0390" +
-    "\u0392\x05\xE0q\x02\u0391\u038D\x03\x02\x02\x02\u0391\u038F\x03\x02\x02" +
-    "\x02\u0392\xB3\x03\x02\x02\x02\u0393\u0394\x07 \x02\x02\u0394\u0396\x07" +
-    "\x94\x02\x02\u0395\u0397\x05\xB2Z\x02\u0396\u0395\x03\x02\x02\x02\u0396" +
-    "\u0397\x03\x02\x02\x02\u0397\xB5\x03\x02\x02\x02\u0398\u039B\x05\xF8}" +
-    "\x02\u0399\u039A\x07w\x02\x02\u039A\u039C\x07\x80\x02\x02\u039B\u0399" +
-    "\x03\x02\x02\x02\u039B\u039C\x03\x02\x02\x02\u039C\u039F\x03\x02\x02\x02" +
-    "\u039D\u039F\x07\x80\x02\x02\u039E\u0398\x03\x02\x02\x02\u039E\u039D\x03" +
-    "\x02\x02\x02\u039F\xB7\x03\x02\x02\x02\u03A0\u03A7\x05\xB6\\\x02\u03A1" +
-    "\u03A3\x07v\x02\x02\u03A2\u03A1\x03\x02\x02\x02\u03A2\u03A3\x03\x02\x02" +
-    "\x02\u03A3\u03A4\x03\x02\x02\x02\u03A4\u03A6\x05\xB6\\\x02\u03A5\u03A2" +
-    "\x03\x02\x02\x02\u03A6\u03A9\x03\x02\x02\x02\u03A7\u03A5\x03\x02\x02\x02" +
-    "\u03A7\u03A8\x03\x02\x02\x02\u03A8\xB9\x03\x02\x02\x02\u03A9\u03A7\x03" +
-    "\x02\x02\x02\u03AA\u03AB\x07\x0E\x02\x02\u03AB\u03AE\x05\xB8]\x02\u03AC" +
-    "\u03AD\x07*\x02\x02\u03AD\u03AF\x05\xFC\x7F\x02\u03AE\u03AC\x03\x02\x02" +
-    "\x02\u03AE\u03AF\x03\x02\x02\x02\u03AF\xBB\x03\x02\x02\x02\u03B0\u03B1" +
-    "\x07\x1C\x02\x02\u03B1\u03B2\x05\xC2b\x02\u03B2\xBD\x03\x02\x02\x02\u03B3" +
-    "\u03B4\x07#\x02\x02\u03B4\u03B5\x05\xCAf\x02\u03B5\xBF\x03\x02\x02\x02" +
-    "\u03B6\u03B7\x07h\x02\x02\u03B7\xC1\x03\x02\x02\x02\u03B8\u03B9\t\b\x02" +
-    "\x02\u03B9\xC3\x03\x02\x02\x02\u03BA\u03BB\t\t\x02\x02\u03BB\xC5\x03\x02" +
-    "\x02\x02\u03BC\u03BD\t\n\x02\x02\u03BD\xC7\x03\x02\x02\x02\u03BE\u03BF" +
-    "\t\v\x02\x02\u03BF\xC9\x03\x02\x02\x02\u03C0\u03C3\x05\xCCg\x02\u03C1" +
-    "\u03C3\x05\x18\r\x02\u03C2\u03C0\x03\x02\x02\x02\u03C2\u03C1\x03\x02\x02" +
-    "\x02\u03C3\xCB\x03\x02\x02\x02\u03C4\u03C5\t\f\x02\x02\u03C5\xCD\x03\x02" +
-    "\x02\x02\u03C6\u03C7\t\r\x02\x02\u03C7\xCF\x03\x02\x02\x02\u03C8\u03D0" +
-    "\x05\xCAf\x02\u03C9\u03D0\x05\xCEh\x02\u03CA\u03D0\x05\xD2j\x02\u03CB" +
-    "\u03D0\x07J\x02\x02\u03CC\u03D0\t\x0E\x02\x02\u03CD\u03D0\x07c\x02\x02" +
-    "\u03CE\u03D0\x07I\x02\x02\u03CF\u03C8\x03\x02\x02\x02\u03CF\u03C9\x03" +
-    "\x02\x02\x02\u03CF\u03CA\x03\x02\x02\x02\u03CF\u03CB\x03\x02\x02\x02\u03CF" +
-    "\u03CC\x03\x02\x02\x02\u03CF\u03CD\x03\x02\x02\x02\u03CF\u03CE\x03\x02" +
-    "\x02\x02\u03D0\xD1\x03\x02\x02\x02\u03D1\u03D9\x07\x8A\x02\x02\u03D2\u03D9" +
-    "\x07\x8B\x02\x02\u03D3\u03D9\x07\x8C\x02\x02\u03D4\u03D9\x07\x8F\x02\x02" +
-    "\u03D5\u03D9\x07\x8E\x02\x02\u03D6\u03D9\x07\x8D\x02\x02\u03D7\u03D9\x07" +
-    "\x90\x02\x02\u03D8\u03D1\x03\x02\x02\x02\u03D8\u03D2\x03\x02\x02\x02\u03D8" +
-    "\u03D3\x03\x02\x02\x02\u03D8\u03D4\x03\x02\x02\x02\u03D8\u03D5\x03\x02" +
-    "\x02\x02\u03D8\u03D6\x03\x02\x02\x02\u03D8\u03D7\x03\x02\x02\x02\u03D9" +
-    "\xD3\x03\x02\x02\x02\u03DA\u03DB\x05\xCAf\x02\u03DB\xD5\x03\x02\x02\x02" +
-    "\u03DC\u03DD\x05\xCAf\x02\u03DD\xD7\x03\x02\x02\x02\u03DE\u03DF\t\x0F" +
-    "\x02\x02\u03DF\xD9\x03\x02\x02\x02\u03E0\u03E1\t\x10\x02\x02\u03E1\xDB" +
-    "\x03\x02\x02\x02\u03E2\u03E3\t\x11\x02\x02\u03E3\xDD\x03\x02\x02\x02\u03E4" +
-    "\u03E7\x05\xC6d\x02\u03E5\u03E7\x05\xCAf\x02\u03E6\u03E4\x03\x02\x02\x02" +
-    "\u03E6\u03E5\x03\x02\x02\x02\u03E7\xDF\x03\x02\x02\x02\u03E8\u03E9\bq" +
-    "\x01\x02\u03E9\u043C\x05\xF8}\x02\u03EA\u043C\x05\xD0i\x02\u03EB\u03EC" +
-    "\x07\x7F\x02\x02\u03EC\u043C\x05\xE0q\x18\u03ED\u03EE\x07H\x02\x02\u03EE" +
-    "\u043C\x05\xE0q\x0F\u03EF\u03F0\x07,\x02\x02\u03F0\u03F1\x07l\x02\x02" +
-    "\u03F1\u03F2\x05\xE0q\x02\u03F2\u03F3\x07&\x02\x02\u03F3\u03F4\x05\xDE" +
-    "p\x02\u03F4\u03F5\x07m\x02\x02\u03F5\u043C\x03\x02\x02\x02\u03F6\u03F7" +
-    "\x07.\x02\x02\u03F7\u03F8\x07l\x02\x02\u03F8\u03F9\x072\x02\x02\u03F9" +
-    "\u03FA\x05\xE0q\x02\u03FA\u03FB\x07m\x02\x02\u03FB\u043C\x03\x02\x02\x02" +
-    "\u03FC\u03FD\x07S\x02\x02\u03FD\u03FF\x07w\x02\x02\u03FE\u03FC\x03\x02" +
-    "\x02\x02\u03FE\u03FF\x03\x02\x02\x02\u03FF\u0400\x03\x02\x02\x02\u0400" +
-    "\u0401\x05\xC4c\x02\u0401\u0404\x07l\x02\x02\u0402\u0405\x05\xE0q\x02" +
-    "\u0403\u0405\x07\x80\x02\x02\u0404\u0402\x03\x02\x02\x02\u0404\u0403\x03" +
-    "\x02\x02\x02\u0404\u0405\x03\x02\x02\x02\u0405\u0406\x03\x02\x02\x02\u0406" +
-    "\u0407\x07m\x02\x02\u0407\u043C\x03\x02\x02\x02\u0408\u0409\x05\xF8}\x02" +
-    "\u0409\u040A\x07w\x02\x02\u040A\u040B\x05\xC4c\x02\u040B\u040D\x07l\x02" +
-    "\x02\u040C\u040E\x05\xE0q\x02\u040D\u040C\x03\x02\x02\x02\u040D\u040E" +
-    "\x03\x02\x02\x02\u040E\u040F\x03\x02\x02\x02\u040F\u0410\x07m\x02\x02" +
-    "\u0410\u043C\x03\x02\x02\x02\u0411\u0412\x07l\x02\x02\u0412\u0413\x05" +
-    "\xE2r\x02\u0413\u0414\x07m\x02\x02\u0414\u043C\x03\x02\x02\x02\u0415\u0416" +
-    "\x05\xF8}\x02\u0416\u0417\x07w\x02\x02\u0417\u0418\x05\xD8m\x02\u0418" +
-    "\u041A\x07l\x02\x02\u0419\u041B\x05\xE8u\x02\u041A\u0419\x03\x02\x02\x02" +
-    "\u041A\u041B\x03\x02\x02\x02\u041B\u041C\x03\x02\x02\x02\u041C\u041D\x07" +
-    "m\x02\x02\u041D\u043C\x03\x02\x02\x02\u041E\u0423\x05\xD8m\x02\u041F\u0421" +
-    "\x07t\x02\x02\u0420\u0422\x05\xC6d\x02\u0421\u0420\x03\x02\x02\x02\u0421" +
-    "\u0422\x03\x02\x02\x02\u0422\u0424\x03\x02\x02\x02\u0423\u041F\x03\x02" +
-    "\x02\x02\u0423\u0424\x03\x02\x02\x02\u0424\u0427\x03\x02\x02\x02\u0425" +
-    "\u0427\x05\xDAn\x02\u0426\u041E\x03\x02\x02\x02\u0426\u0425\x03\x02\x02" +
-    "\x02\u0427\u0428\x03\x02\x02\x02\u0428\u042A\x07l\x02\x02\u0429\u042B" +
-    "\x05\xE8u\x02\u042A\u0429\x03\x02\x02\x02\u042A\u042B\x03\x02\x02\x02" +
-    "\u042B\u042C\x03\x02\x02\x02\u042C\u042D\x07m\x02\x02\u042D\u043C\x03" +
-    "\x02\x02\x02\u042E\u043C\x05\xE4s\x02\u042F\u0430\x05\xDCo\x02\u0430\u0431" +
-    "\x07l\x02\x02\u0431\u0436\x05\xE0q\x02\u0432\u0433\x07v\x02\x02\u0433" +
-    "\u0435\x05\xFC\x7F\x02\u0434\u0432\x03\x02\x02\x02\u0435\u0438\x03\x02" +
-    "\x02\x02\u0436\u0434\x03\x02\x02\x02\u0436\u0437\x03\x02\x02\x02\u0437" +
-    "\u0439\x03\x02\x02\x02\u0438\u0436\x03\x02\x02\x02\u0439\u043A\x07m\x02" +
-    "\x02\u043A\u043C\x03\x02\x02\x02\u043B\u03E8\x03\x02\x02\x02\u043B\u03EA" +
-    "\x03\x02\x02\x02\u043B\u03EB\x03\x02\x02\x02\u043B\u03ED\x03\x02\x02\x02" +
-    "\u043B\u03EF\x03\x02\x02\x02\u043B\u03F6\x03\x02\x02\x02\u043B\u03FE\x03" +
-    "\x02\x02\x02\u043B\u0408\x03\x02\x02\x02\u043B\u0411\x03\x02\x02\x02\u043B" +
-    "\u0415\x03\x02\x02\x02\u043B\u0426\x03\x02\x02\x02\u043B\u042E\x03\x02" +
-    "\x02\x02\u043B\u042F\x03\x02\x02\x02\u043C\u0470\x03\x02\x02\x02\u043D" +
-    "\u043E\f\x17\x02\x02\u043E\u043F\t\x12\x02\x02\u043F\u046F\x05\xE0q\x18" +
-    "\u0440\u0441\f\x16\x02\x02\u0441\u0442\t\x13\x02\x02\u0442\u046F\x05\xE0" +
-    "q\x17\u0443\u0444\f\x15\x02\x02\u0444\u0445\x07Z\x02\x02\u0445\u046F\x05" +
-    "\xE0q\x16\u0446\u0447\f\x11\x02\x02\u0447\u0448\x05\xC8e\x02\u0448\u0449" +
-    "\x05\xE0q\x12\u0449\u046F\x03\x02\x02\x02\u044A\u044B\f\x0E\x02\x02\u044B" +
-    "\u044C\x07%\x02\x02\u044C\u046F\x05\xE0q\x0F\u044D\u044E\f\r\x02\x02\u044E" +
-    "\u044F\x07M\x02\x02\u044F\u046F\x05\xE0q\x0E\u0450\u0451\f\f\x02\x02\u0451" +
-    "\u0452\x07\x88\x02\x02\u0452\u046F\x05\xE0q\r\u0453\u0454\f\x1E\x02\x02" +
-    "\u0454\u046F\x05z>\x02";
-MalloyParser._serializedATNSegment2 = "\u0455\u0456\f\x1C\x02\x02\u0456\u046F\x05\xDAn\x02\u0457\u0458\f\x1B" +
-    "\x02\x02\u0458\u0459\x07w\x02\x02\u0459\u046F\x05\xDAn\x02\u045A\u045B" +
-    "\f\x1A\x02\x02\u045B\u045C\x07r\x02\x02\u045C\u046F\x05\xDEp\x02\u045D" +
-    "\u045E\f\x19\x02\x02\u045E\u045F\x07s\x02\x02\u045F\u046F\x05\xDEp\x02" +
-    "\u0460\u0461\f\x14\x02\x02\u0461\u0462\x079\x02\x02\u0462\u0463\x05\xE0" +
-    "q\x02\u0463\u0464\x05\xDAn\x02\u0464\u046F\x03\x02\x02\x02\u0465\u0466" +
-    "\f\x13\x02\x02\u0466\u0467\x07i\x02\x02\u0467\u046F\x05\xE2r\x02\u0468" +
-    "\u0469\f\x12\x02\x02\u0469\u046A\x07\x83\x02\x02\u046A\u046F\x05\xE2r" +
-    "\x02\u046B\u046C\f\x10\x02\x02\u046C\u046D\x07\x89\x02\x02\u046D\u046F" +
-    "\x05\xE2r\x02\u046E\u043D\x03\x02\x02\x02\u046E\u0440\x03\x02\x02\x02" +
-    "\u046E\u0443\x03\x02\x02\x02\u046E\u0446\x03\x02\x02\x02\u046E\u044A\x03" +
-    "\x02\x02\x02\u046E\u044D\x03\x02\x02\x02\u046E\u0450\x03\x02\x02\x02\u046E" +
-    "\u0453\x03\x02\x02\x02\u046E\u0455\x03\x02\x02\x02\u046E\u0457\x03\x02" +
-    "\x02\x02\u046E\u045A\x03\x02\x02\x02\u046E\u045D\x03\x02\x02\x02\u046E" +
-    "\u0460\x03\x02\x02\x02\u046E\u0465\x03\x02\x02\x02\u046E\u0468\x03\x02" +
-    "\x02\x02\u046E\u046B\x03\x02\x02\x02\u046F\u0472\x03\x02\x02\x02\u0470" +
-    "\u046E\x03\x02\x02\x02\u0470\u0471\x03\x02\x02\x02\u0471\xE1\x03\x02\x02" +
-    "\x02\u0472\u0470\x03\x02\x02\x02\u0473\u0475\x07l\x02\x02\u0474\u0476" +
-    "\x05\xC8e\x02\u0475\u0474\x03\x02\x02\x02\u0475\u0476\x03\x02\x02\x02" +
-    "\u0476\u0477\x03\x02\x02\x02\u0477\u0478\x05\xE0q\x02\u0478\u0479\x07" +
-    "m\x02\x02\u0479\u047F\x03\x02\x02\x02\u047A\u047C\x05\xC8e\x02\u047B\u047A" +
-    "\x03\x02\x02\x02\u047B\u047C\x03\x02\x02\x02\u047C\u047D\x03\x02\x02\x02" +
-    "\u047D\u047F\x05\xE0q\x02\u047E\u0473\x03\x02\x02\x02\u047E\u047B\x03" +
-    "\x02\x02\x02\u047F\xE3\x03\x02\x02\x02\u0480\u0482\x05\xE6t\x02\u0481" +
-    "\u0480\x03\x02\x02\x02\u0482\u0483\x03\x02\x02\x02\u0483\u0481\x03\x02" +
-    "\x02\x02\u0483\u0484\x03\x02\x02\x02\u0484\u0487\x03\x02\x02\x02\u0485" +
-    "\u0486\x073\x02\x02\u0486\u0488\x05\xE0q\x02\u0487\u0485\x03\x02\x02\x02" +
-    "\u0487\u0488\x03\x02\x02\x02\u0488\xE5\x03\x02\x02\x02\u0489\u048B\x07" +
-    "N\x02\x02\u048A\u048C\x05\xE0q\x02\u048B\u048A\x03\x02\x02\x02\u048B\u048C" +
-    "\x03\x02\x02\x02\u048C\u048D\x03\x02\x02\x02\u048D\u048E\x07^\x02\x02" +
-    "\u048E\u048F\x05\xE2r\x02\u048F\xE7\x03\x02\x02\x02\u0490\u0495\x05\xE0" +
-    "q\x02\u0491\u0492\x07v\x02\x02\u0492\u0494\x05\xE0q\x02\u0493\u0491\x03" +
-    "\x02\x02\x02\u0494\u0497\x03\x02\x02\x02\u0495\u0493\x03\x02\x02\x02\u0495" +
-    "\u0496\x03\x02\x02\x02\u0496\u0499\x03\x02\x02\x02\u0497\u0495\x03\x02" +
-    "\x02\x02\u0498\u049A\x07v\x02\x02\u0499\u0498\x03\x02\x02\x02\u0499\u049A" +
-    "\x03\x02\x02\x02\u049A\xE9\x03\x02\x02\x02\u049B\u04A2\x05\xFC\x7F\x02" +
-    "\u049C\u049E\x07v\x02\x02\u049D\u049C\x03\x02\x02\x02\u049D\u049E\x03" +
-    "\x02\x02\x02\u049E\u049F\x03\x02\x02\x02\u049F\u04A1\x05\xFC\x7F\x02\u04A0" +
-    "\u049D\x03\x02\x02\x02\u04A1\u04A4\x03\x02\x02\x02\u04A2\u04A0\x03\x02" +
-    "\x02\x02\u04A2\u04A3\x03\x02\x02\x02\u04A3\xEB\x03\x02\x02\x02\u04A4\u04A2" +
-    "\x03\x02\x02\x02\u04A5\u04AC\x05\xF6|\x02\u04A6\u04A8\x07v\x02\x02\u04A7" +
-    "\u04A6\x03\x02\x02\x02\u04A7\u04A8\x03\x02\x02\x02\u04A8\u04A9\x03\x02" +
-    "\x02\x02\u04A9\u04AB\x05\xF6|\x02\u04AA\u04A7\x03\x02\x02\x02\u04AB\u04AE" +
-    "\x03\x02\x02\x02\u04AC\u04AA\x03\x02\x02\x02\u04AC\u04AD\x03\x02\x02\x02" +
-    "\u04AD\u04B0\x03\x02\x02\x02\u04AE\u04AC\x03\x02\x02\x02\u04AF\u04B1\x07" +
-    "v\x02\x02\u04B0\u04AF\x03\x02\x02\x02\u04B0\u04B1\x03\x02\x02\x02\u04B1" +
-    "\xED\x03\x02\x02\x02\u04B2\u04B3\x05\xF8}\x02\u04B3\u04B4\x07w\x02\x02" +
-    "\u04B4\u04B6\x03\x02\x02\x02\u04B5\u04B2\x03\x02\x02\x02\u04B5\u04B6\x03" +
-    "\x02\x02\x02\u04B6\u04B7\x03\x02\x02\x02\u04B7\u04B9\x07\x80\x02\x02\u04B8" +
-    "\u04BA\x05\xF0y\x02\u04B9\u04B8\x03\x02\x02\x02\u04B9\u04BA\x03\x02\x02" +
-    "\x02\u04BA\xEF\x03\x02\x02\x02\u04BB\u04BF\x07p\x02\x02\u04BC\u04BD\x07" +
-    "\n\x02\x02\u04BD\u04C0\x05\xEAv\x02\u04BE\u04C0\x07v\x02\x02\u04BF\u04BC" +
-    "\x03\x02\x02\x02\u04BF\u04BE\x03\x02\x02\x02\u04C0\u04C1\x03\x02\x02\x02" +
-    "\u04C1\u04BF\x03\x02\x02\x02\u04C1\u04C2\x03\x02\x02\x02\u04C2\u04C3\x03" +
-    "\x02\x02\x02\u04C3\u04C4\x07q\x02\x02\u04C4\xF1\x03\x02\x02\x02\u04C5" +
-    "\u04C6\x05\f\x07\x02\u04C6\u04C8\x05\xF8}\x02\u04C7\u04C9\x05\xF4{\x02" +
-    "\u04C8\u04C7\x03\x02\x02\x02\u04C8\u04C9\x03\x02\x02\x02\u04C9\xF3\x03" +
-    "\x02\x02\x02\u04CA\u04CB\x07w\x02\x02\u04CB\u04D2\x05\xDAn\x02\u04CC\u04CD" +
-    "\x07w\x02\x02\u04CD\u04CE\x05\xC4c\x02\u04CE\u04CF\x07l\x02\x02\u04CF" +
-    "\u04D0\x07m\x02\x02\u04D0\u04D2\x03\x02\x02\x02\u04D1\u04CA\x03\x02\x02" +
-    "\x02\u04D1\u04CC\x03\x02\x02\x02\u04D2\xF5\x03\x02\x02\x02\u04D3\u04D7" +
-    "\x05\xF2z\x02\u04D4\u04D7\x05\xEEx\x02\u04D5\u04D7\x05V,\x02\u04D6\u04D3" +
-    "\x03\x02\x02\x02\u04D6\u04D4\x03\x02\x02\x02\u04D6\u04D5\x03\x02\x02\x02" +
-    "\u04D7\xF7\x03\x02\x02\x02\u04D8\u04DD\x05\xFC\x7F\x02\u04D9\u04DA\x07" +
-    "w\x02\x02\u04DA\u04DC\x05\xFC\x7F\x02\u04DB\u04D9\x03\x02\x02\x02\u04DC" +
-    "\u04DF\x03\x02\x02\x02\u04DD\u04DB\x03\x02\x02\x02\u04DD\u04DE\x03\x02" +
-    "\x02\x02\u04DE\xF9\x03\x02\x02\x02\u04DF\u04DD\x03\x02\x02\x02\u04E0\u04E1" +
-    "\x05\xD8m\x02\u04E1\xFB\x03\x02\x02\x02\u04E2\u04E3\x05\xD8m\x02\u04E3" +
-    "\xFD\x03\x02\x02\x02\u04E4\u04E5\x05\xE0q\x02\u04E5\u04E6\x07\x02\x02" +
-    "\x03\u04E6\xFF\x03\x02\x02\x02\u04E7\u04E8\x05\xD8m\x02\u04E8\u0101\x03" +
-    "\x02\x02\x02\u04E9\u04EA\x05\xD8m\x02\u04EA\u0103\x03\x02\x02\x02\u04EB" +
-    "\u04EC\x05\xCAf\x02\u04EC\u0105\x03\x02\x02\x02\u04ED\u04EE\x07\x84\x02" +
-    "\x02\u04EE\u04EF\x07\x84\x02\x02\u04EF\u04F0\x07n\x02\x02\u04F0\u04F1" +
-    "\x05\xCAf\x02\u04F1\u04F2\x07o\x02\x02\u04F2\u0107\x03\x02\x02\x02\x86" +
-    "\u010A\u010C\u0119\u0124\u012C\u0140\u0148\u014E\u0159\u0163\u016C\u0173" +
-    "\u0178\u017D\u0183\u0188\u018C\u019D\u01AD\u01B5\u01B7\u01BB\u01C6\u01CB" +
-    "\u01CF\u01DF\u01E1\u01E6\u01FB\u01FE\u020A\u020F\u0213\u021B\u0220\u0224" +
-    "\u023E\u0246\u0250\u025B\u025D\u0267\u026E\u0276\u027B\u0280\u0282\u0289" +
-    "\u028E\u0292\u029E\u02A3\u02A6\u02AE\u02B3\u02B6\u02BA\u02BC\u02C2\u02C7" +
-    "\u02C9\u02D3\u02D7\u02DB\u02E6\u02ED\u02F1\u02FB\u0300\u0304\u030B\u0324" +
-    "\u032E\u0333\u0337\u033B\u0343\u0348\u034C\u0352\u0359\u036D\u0371\u0378" +
-    "\u037D\u0381\u0385\u0388\u0391\u0396\u039B\u039E\u03A2\u03A7\u03AE\u03C2" +
-    "\u03CF\u03D8\u03E6\u03FE\u0404\u040D\u041A\u0421\u0423\u0426\u042A\u0436" +
-    "\u043B\u046E\u0470\u0475\u047B\u047E\u0483\u0487\u048B\u0495\u0499\u049D" +
-    "\u04A2\u04A7\u04AC\u04B0\u04B5\u04B9\u04BF\u04C1\u04C8\u04D1\u04D6\u04DD";
+    "\u01A6\u01A7\x056\x1C\x02\u01A7\u01A8\x07w\x02\x02";
+MalloyParser._serializedATNSegment1 = "\u01A8\u01A9\x07V\x02\x02\u01A9\u01AA\x07l\x02\x02\u01AA\u01AB\x05\xD4" +
+    "k\x02\u01AB\u01AC\x07m\x02\x02\u01AC\u01AE\x03\x02\x02\x02\u01AD\u01A1" +
+    "\x03\x02\x02\x02\u01AD\u01A6\x03\x02\x02\x02\u01AE5\x03\x02\x02\x02\u01AF" +
+    "\u01B0\x05\xD8m\x02\u01B07\x03\x02\x02\x02\u01B1\u01BC\x05:\x1E\x02\u01B2" +
+    "\u01B7\x07p\x02\x02\u01B3\u01B6\x05\x92J\x02\u01B4\u01B6\x07\x84\x02\x02" +
+    "\u01B5\u01B3\x03\x02\x02\x02\u01B5\u01B4\x03\x02\x02\x02\u01B6\u01B9\x03" +
+    "\x02\x02\x02\u01B7\u01B5\x03\x02\x02\x02\u01B7\u01B8\x03\x02\x02\x02\u01B8" +
+    "\u01BA\x03\x02\x02\x02\u01B9\u01B7\x03\x02\x02\x02\u01BA\u01BC\x07q\x02" +
+    "\x02\u01BB\u01B1\x03\x02\x02\x02\u01BB\u01B2\x03\x02\x02\x02\u01BC9\x03" +
+    "\x02\x02\x02\u01BD\u01BE\x07p\x02\x02\u01BE\u01BF\x07\x89\x02\x02\u01BF" +
+    "\u01C0\x05\xE0q\x02\u01C0\u01C1\x07q\x02\x02\u01C1;\x03\x02\x02\x02\u01C2" +
+    "\u01C3\x05\xD8m\x02\u01C3=\x03\x02\x02\x02\u01C4\u01CB\x05@!\x02\u01C5" +
+    "\u01C7\x07v\x02\x02\u01C6\u01C5\x03\x02\x02\x02\u01C6\u01C7\x03\x02\x02" +
+    "\x02\u01C7\u01C8\x03\x02\x02\x02\u01C8\u01CA\x05@!\x02\u01C9\u01C6\x03" +
+    "\x02\x02\x02\u01CA\u01CD\x03\x02\x02\x02\u01CB\u01C9\x03\x02\x02\x02\u01CB" +
+    "\u01CC\x03\x02\x02\x02\u01CC\u01CF\x03\x02\x02\x02\u01CD\u01CB\x03\x02" +
+    "\x02\x02\u01CE\u01D0\x07v\x02\x02\u01CF\u01CE\x03\x02\x02\x02\u01CF\u01D0" +
+    "\x03\x02\x02\x02\u01D0?\x03\x02\x02\x02\u01D1\u01D2\x05\f\x07\x02\u01D2" +
+    "\u01D3\x05D#\x02\u01D3\u01D4\x05\x0E\b\x02\u01D4\u01D5\x05B\"\x02\u01D5" +
+    "A\x03\x02\x02\x02\u01D6\u01D7\x05d3\x02\u01D7C\x03\x02\x02\x02\u01D8\u01D9" +
+    "\x05\xD8m\x02\u01D9E\x03\x02\x02\x02\u01DA\u01DB\x05\xD8m\x02\u01DBG\x03" +
+    "\x02\x02\x02\u01DC\u01E1\x07p\x02\x02\u01DD\u01E0\x05J&\x02\u01DE\u01E0" +
+    "\x07\x84\x02\x02\u01DF\u01DD\x03\x02\x02\x02\u01DF\u01DE\x03\x02\x02\x02" +
+    "\u01E0\u01E3\x03\x02\x02\x02\u01E1\u01DF\x03\x02\x02\x02\u01E1\u01E2\x03" +
+    "\x02\x02\x02\u01E2\u01E4\x03\x02\x02\x02\u01E3\u01E1\x03\x02\x02\x02\u01E4" +
+    "\u01E7\x07q\x02\x02\u01E5\u01E7\x05:\x1E\x02\u01E6\u01DC\x03\x02\x02\x02" +
+    "\u01E6\u01E5\x03\x02\x02\x02\u01E7I\x03\x02\x02\x02\u01E8\u01FF\x05N(" +
+    "\x02\u01E9\u01FF\x05L\'\x02\u01EA\u01FF\x05\\/\x02\u01EB\u01FF\x05^0\x02" +
+    "\u01EC\u01FF\x05\x88E\x02\u01ED\u01EE\x07\x17\x02\x02\u01EE\u01FF\x05" +
+    "\xFC\x7F\x02\u01EF\u01F0\x07\x1A\x02\x02\u01F0\u01FF\x05P)\x02\u01F1\u01F2" +
+    "\t\x03\x02\x02\u01F2\u01FF\x05\xEAv\x02\u01F3\u01F4\x05\f\x07\x02\u01F4" +
+    "\u01F5\t\x04\x02\x02\u01F5\u01F6\x05\x8CG\x02\u01F6\u01FF\x03\x02\x02" +
+    "\x02\u01F7\u01FF\x05\xBE`\x02\u01F8\u01FA\x07h\x02\x02\u01F9\u01F8\x03" +
+    "\x02\x02\x02\u01FA\u01FB\x03\x02\x02\x02\u01FB\u01F9\x03\x02\x02\x02\u01FB" +
+    "\u01FC\x03\x02\x02\x02\u01FC\u01FF\x03\x02\x02\x02\u01FD\u01FF\x05(\x15" +
+    "\x02\u01FE\u01E8\x03\x02\x02\x02\u01FE\u01E9\x03\x02\x02\x02\u01FE\u01EA" +
+    "\x03\x02\x02\x02\u01FE\u01EB\x03\x02\x02\x02\u01FE\u01EC\x03\x02\x02\x02" +
+    "\u01FE\u01ED\x03\x02\x02\x02\u01FE\u01EF\x03\x02\x02\x02\u01FE\u01F1\x03" +
+    "\x02\x02\x02\u01FE\u01F3\x03\x02\x02\x02\u01FE\u01F7\x03\x02\x02\x02\u01FE" +
+    "\u01F9\x03\x02\x02\x02\u01FE\u01FD\x03\x02\x02\x02\u01FFK\x03\x02\x02" +
+    "\x02\u0200\u0201\x05\f\x07\x02\u0201\u0202\x07\x13\x02\x02\u0202\u0203" +
+    "\x05T+\x02\u0203M\x03\x02\x02\x02\u0204\u0205\x05\f\x07\x02\u0205\u0206" +
+    "\x07\t\x02\x02\u0206\u0207\x05T+\x02\u0207O\x03\x02\x02\x02\u0208\u020F" +
+    "\x05R*\x02\u0209\u020B\x07v\x02\x02\u020A\u0209\x03\x02\x02\x02\u020A" +
+    "\u020B\x03\x02\x02\x02\u020B\u020C\x03\x02\x02\x02\u020C\u020E\x05R*\x02" +
+    "\u020D\u020A\x03\x02\x02\x02\u020E\u0211\x03\x02\x02\x02\u020F\u020D\x03" +
+    "\x02\x02\x02\u020F\u0210\x03\x02\x02\x02\u0210\u0213\x03\x02\x02\x02\u0211" +
+    "\u020F\x03\x02\x02\x02\u0212\u0214\x07v\x02\x02\u0213\u0212\x03\x02\x02" +
+    "\x02\u0213\u0214\x03\x02\x02\x02\u0214Q\x03\x02\x02\x02\u0215\u0216\x05" +
+    "\xFC\x7F\x02\u0216\u0217\x05\x0E\b\x02\u0217\u0218\x05\xFC\x7F\x02\u0218" +
+    "S\x03\x02\x02\x02\u0219\u0220\x05V,\x02\u021A\u021C\x07v\x02\x02\u021B" +
+    "\u021A\x03\x02\x02\x02\u021B\u021C\x03\x02\x02\x02\u021C\u021D\x03\x02" +
+    "\x02\x02\u021D\u021F\x05V,\x02\u021E\u021B\x03\x02\x02\x02\u021F\u0222" +
+    "\x03\x02\x02\x02\u0220\u021E\x03\x02\x02\x02\u0220\u0221\x03\x02\x02\x02" +
+    "\u0221\u0224\x03\x02\x02\x02\u0222\u0220\x03\x02\x02\x02\u0223\u0225\x07" +
+    "v\x02\x02\u0224\u0223\x03\x02\x02\x02\u0224\u0225\x03\x02\x02\x02\u0225" +
+    "U\x03\x02\x02\x02\u0226\u0227\x05\f\x07\x02\u0227\u0228\x05X-\x02\u0228" +
+    "\u0229\x05\x0E\b\x02\u0229\u022A\x05\xE0q\x02\u022AW\x03\x02\x02\x02\u022B" +
+    "\u022C\x05\xD8m\x02\u022CY\x03\x02\x02\x02\u022D\u022E\x05\xD8m\x02\u022E" +
+    "[\x03\x02\x02\x02\u022F\u0230\x07\b\x02\x02\u0230\u0231\x05T+\x02\u0231" +
+    "]\x03\x02\x02\x02\u0232\u0233\x05\f\x07\x02\u0233\u0234\x07\x10\x02\x02" +
+    "\u0234\u0235\x05n8\x02\u0235\u023F\x03\x02\x02\x02\u0236\u0237\x05\f\x07" +
+    "\x02\u0237\u0238\x07\x11\x02\x02\u0238\u0239\x05n8\x02\u0239\u023F\x03" +
+    "\x02\x02\x02\u023A\u023B\x05\f\x07\x02\u023B\u023C\x07\x0F\x02\x02\u023C" +
+    "\u023D\x05n8\x02\u023D\u023F\x03\x02\x02\x02\u023E\u0232\x03\x02\x02\x02" +
+    "\u023E\u0236\x03\x02\x02\x02\u023E\u023A\x03\x02\x02\x02\u023F_\x03\x02" +
+    "\x02\x02\u0240\u0241\x07\v\x02\x02\u0241\u0242\x05l7\x02\u0242a\x03\x02" +
+    "\x02\x02\u0243\u0247\x05^0\x02\u0244\u0247\x05\x88E\x02\u0245\u0247\x05" +
+    "\\/\x02\u0246\u0243\x03\x02\x02\x02\u0246\u0244\x03\x02\x02\x02\u0246" +
+    "\u0245\x03\x02\x02\x02\u0247c\x03\x02\x02\x02\u0248\u0249\b3\x01\x02\u0249" +
+    "\u0251\x05\xD8m\x02\u024A\u024B\x07l\x02\x02\u024B\u024C\x05d3\x02\u024C" +
+    "\u024D\x07m\x02\x02\u024D\u0251\x03\x02\x02\x02\u024E\u0251\x054\x1B\x02" +
+    "\u024F\u0251\x052\x1A\x02\u0250\u0248\x03\x02\x02\x02\u0250\u024A\x03" +
+    "\x02\x02\x02\u0250\u024E\x03\x02\x02\x02\u0250\u024F\x03\x02\x02\x02\u0251" +
+    "\u025D\x03\x02\x02\x02\u0252\u0253\f\x07\x02\x02\u0253\u0254\x07~\x02" +
+    "\x02\u0254\u025C\x05f4\x02\u0255\u0256\f\x06\x02\x02\u0256\u0257\x07j" +
+    "\x02\x02\u0257\u025C\x05f4\x02\u0258\u0259\f\x05\x02\x02\u0259\u025A\x07" +
+    "6\x02\x02\u025A\u025C\x05H%\x02\u025B\u0252\x03\x02\x02\x02\u025B\u0255" +
+    "\x03\x02\x02\x02\u025B\u0258\x03\x02\x02\x02\u025C\u025F\x03\x02\x02\x02" +
+    "\u025D\u025B\x03\x02\x02\x02\u025D\u025E\x03\x02\x02\x02\u025Ee\x03\x02" +
+    "\x02\x02\u025F\u025D\x03\x02\x02\x02\u0260\u0261\b4\x01\x02\u0261\u0268" +
+    "\x05\xF8}\x02\u0262\u0268\x058\x1D\x02\u0263\u0264\x07l\x02\x02\u0264" +
+    "\u0265\x05h5\x02\u0265\u0266\x07m\x02\x02\u0266\u0268\x03\x02\x02\x02" +
+    "\u0267\u0260\x03\x02\x02\x02\u0267\u0262\x03\x02\x02\x02\u0267\u0263\x03" +
+    "\x02\x02\x02\u0268\u026E\x03\x02\x02\x02\u0269\u026A\f\x03\x02\x02\u026A" +
+    "\u026B\x07~\x02\x02\u026B\u026D\x05f4\x04\u026C\u0269\x03\x02\x02\x02" +
+    "\u026D\u0270\x03\x02\x02\x02\u026E\u026C\x03\x02\x02\x02\u026E\u026F\x03" +
+    "\x02\x02\x02\u026Fg\x03\x02\x02\x02\u0270\u026E\x03\x02\x02\x02\u0271" +
+    "\u0277\x05f4\x02\u0272\u0273\x05f4\x02\u0273\u0274\x07j\x02\x02\u0274" +
+    "\u0275\x05h5\x02\u0275\u0277\x03\x02\x02\x02\u0276\u0271\x03\x02\x02\x02" +
+    "\u0276\u0272\x03\x02\x02\x02\u0277i\x03\x02\x02\x02\u0278\u027C\x05N(" +
+    "\x02\u0279\u027C\x05L\'\x02\u027A\u027C\x05^0\x02\u027B\u0278\x03\x02" +
+    "\x02\x02\u027B\u0279\x03\x02\x02\x02\u027B\u027A\x03\x02\x02\x02\u027C" +
+    "k\x03\x02\x02\x02\u027D\u0282\x07p\x02\x02\u027E\u0281\x05j6\x02\u027F" +
+    "\u0281\x07\x84\x02\x02\u0280\u027E\x03\x02\x02\x02\u0280\u027F\x03\x02" +
+    "\x02\x02\u0281\u0284\x03\x02\x02\x02\u0282\u0280\x03\x02\x02\x02\u0282" +
+    "\u0283\x03\x02\x02\x02\u0283\u0285\x03\x02\x02\x02\u0284\u0282\x03\x02" +
+    "\x02\x02\u0285\u0286\x07q\x02\x02\u0286m\x03\x02\x02\x02\u0287\u028E\x05" +
+    "t;\x02\u0288\u028A\x07v\x02\x02\u0289\u0288\x03\x02\x02\x02\u0289\u028A" +
+    "\x03\x02\x02\x02\u028A\u028B\x03\x02\x02\x02\u028B\u028D\x05t;\x02\u028C" +
+    "\u0289\x03\x02\x02\x02\u028D\u0290\x03\x02\x02\x02\u028E\u028C\x03\x02" +
+    "\x02\x02\u028E\u028F\x03\x02\x02\x02\u028F\u0292\x03\x02\x02\x02\u0290" +
+    "\u028E\x03\x02\x02\x02\u0291\u0293\x07v\x02\x02\u0292\u0291\x03\x02\x02" +
+    "\x02\u0292\u0293\x03\x02\x02\x02\u0293o\x03\x02\x02\x02\u0294\u0295\x05" +
+    "\f\x07\x02\u0295\u0296\x07@\x02\x02\u0296\u0297\x05\f\x07\x02\u0297\u0298" +
+    "\x05d3\x02\u0298q\x03\x02\x02\x02\u0299\u029A\t\x05\x02\x02\u029As\x03" +
+    "\x02\x02\x02\u029B\u029D\x07h\x02\x02\u029C\u029B\x03\x02\x02\x02\u029D" +
+    "\u02A0\x03\x02\x02\x02\u029E\u029C\x03\x02\x02\x02\u029E\u029F\x03\x02" +
+    "\x02\x02\u029F\u02A1\x03\x02\x02\x02\u02A0\u029E\x03\x02\x02\x02\u02A1" +
+    "\u02A3\x05Z.\x02\u02A2\u02A4\x05p9\x02\u02A3\u02A2\x03\x02\x02\x02\u02A3" +
+    "\u02A4\x03\x02\x02\x02\u02A4\u02A6\x03\x02\x02\x02\u02A5\u02A7\x05r:\x02" +
+    "\u02A6\u02A5\x03\x02\x02\x02\u02A6\u02A7\x03\x02\x02\x02\u02A7\u02A8\x03" +
+    "\x02\x02\x02\u02A8\u02A9\x07_\x02\x02\u02A9\u02AA\x05\xE0q\x02\u02AA\u02BD" +
+    "\x03\x02\x02\x02\u02AB\u02AD\x07h\x02\x02\u02AC\u02AB\x03\x02\x02\x02" +
+    "\u02AD\u02B0\x03\x02\x02\x02\u02AE\u02AC\x03\x02\x02\x02\u02AE\u02AF\x03" +
+    "\x02\x02\x02\u02AF\u02B1\x03\x02\x02\x02\u02B0\u02AE\x03\x02\x02\x02\u02B1" +
+    "\u02B3\x05Z.\x02\u02B2\u02B4\x05p9\x02\u02B3\u02B2\x03\x02\x02\x02\u02B3" +
+    "\u02B4\x03\x02\x02\x02\u02B4\u02BA\x03\x02\x02\x02\u02B5\u02B7\x05r:\x02" +
+    "\u02B6\u02B5\x03\x02\x02\x02\u02B6\u02B7\x03\x02\x02\x02\u02B7\u02B8\x03" +
+    "\x02\x02\x02\u02B8\u02B9\x07L\x02\x02\u02B9\u02BB\x05v<\x02\u02BA\u02B6" +
+    "\x03\x02\x02\x02\u02BA\u02BB\x03\x02\x02\x02\u02BB\u02BD\x03\x02\x02\x02" +
+    "\u02BC\u029E\x03\x02\x02\x02\u02BC\u02AE\x03\x02\x02\x02\u02BDu\x03\x02" +
+    "\x02\x02\u02BE\u02BF\x05\xE0q\x02\u02BFw\x03\x02\x02\x02\u02C0\u02C3\x05" +
+    "\x88E\x02\u02C1\u02C3\x05\x8AF\x02\u02C2\u02C0\x03\x02\x02\x02\u02C2\u02C1" +
+    "\x03\x02\x02\x02\u02C3y\x03\x02\x02\x02\u02C4\u02C9\x07p\x02\x02\u02C5" +
+    "\u02C8\x05\x84C\x02\u02C6\u02C8\x07\x84\x02\x02\u02C7\u02C5\x03\x02\x02" +
+    "\x02\u02C7\u02C6\x03\x02\x02\x02\u02C8\u02CB\x03\x02\x02\x02\u02C9\u02C7" +
+    "\x03\x02\x02\x02\u02C9\u02CA\x03\x02\x02\x02\u02CA\u02CC\x03\x02\x02\x02" +
+    "\u02CB\u02C9\x03\x02\x02\x02\u02CC\u02CD\x07q\x02\x02\u02CD{\x03\x02\x02" +
+    "\x02\u02CE\u02D3\x05~@\x02\u02CF\u02D0\x07v\x02\x02\u02D0\u02D2\x05~@" +
+    "\x02\u02D1\u02CF\x03\x02\x02\x02\u02D2\u02D5\x03\x02\x02\x02\u02D3\u02D1" +
+    "\x03\x02\x02\x02\u02D3\u02D4\x03\x02\x02\x02\u02D4\u02D7\x03\x02\x02\x02" +
+    "\u02D5\u02D3\x03\x02\x02\x02\u02D6\u02D8\x07v\x02\x02\u02D7\u02D6\x03" +
+    "\x02\x02\x02\u02D7\u02D8\x03\x02\x02\x02\u02D8}\x03\x02\x02\x02\u02D9" +
+    "\u02DB\x05\xE0q\x02\u02DA\u02DC\t\x06\x02\x02\u02DB\u02DA\x03\x02\x02" +
+    "\x02\u02DB\u02DC\x03\x02\x02\x02\u02DC\u02E0\x03\x02\x02\x02\u02DD\u02E0" +
+    "\x07\'\x02\x02\u02DE\u02E0\x071\x02\x02\u02DF\u02D9\x03\x02\x02\x02\u02DF" +
+    "\u02DD\x03\x02\x02\x02\u02DF\u02DE\x03\x02\x02\x02\u02E0\x7F\x03\x02\x02" +
+    "\x02\u02E1\u02E2\x07\x15\x02\x02\u02E2\u02E3\x05|?\x02\u02E3\x81\x03\x02" +
+    "\x02\x02\u02E4\u02E5\x05\xB0Y\x02\u02E5\x83\x03\x02\x02\x02\u02E6\u02EB" +
+    "\x05\x88E\x02\u02E7\u02EB\x05\xA8U\x02\u02E8\u02EB\x05\x80A\x02\u02E9" +
+    "\u02EB\x05\x82B\x02\u02EA\u02E6\x03\x02\x02\x02\u02EA\u02E7\x03\x02\x02" +
+    "\x02\u02EA\u02E8\x03\x02\x02\x02\u02EA\u02E9\x03\x02\x02\x02\u02EB\x85" +
+    "\x03\x02\x02\x02\u02EC\u02F1\x05\xE0q\x02\u02ED\u02EE\x07v\x02\x02\u02EE" +
+    "\u02F0\x05\xE0q\x02\u02EF\u02ED\x03\x02\x02\x02\u02F0\u02F3\x03\x02\x02" +
+    "\x02\u02F1\u02EF\x03\x02\x02\x02\u02F1\u02F2\x03\x02\x02\x02\u02F2\u02F5" +
+    "\x03\x02\x02\x02\u02F3\u02F1\x03\x02\x02\x02\u02F4\u02F6\x07v\x02\x02" +
+    "\u02F5\u02F4\x03\x02\x02\x02\u02F5\u02F6\x03\x02\x02\x02\u02F6\x87\x03" +
+    "\x02\x02\x02\u02F7\u02F8\x07!\x02\x02\u02F8\u02F9\x05\x86D\x02\u02F9\x89" +
+    "\x03\x02\x02\x02\u02FA\u02FB\x07\r\x02\x02\u02FB\u02FC\x05\x86D\x02\u02FC" +
+    "\x8B\x03\x02\x02\x02\u02FD\u0304\x05\x90I\x02\u02FE\u0300\x07v\x02\x02" +
+    "\u02FF\u02FE\x03\x02\x02\x02\u02FF\u0300\x03\x02\x02\x02\u0300\u0301\x03" +
+    "\x02\x02\x02\u0301\u0303\x05\x90I\x02\u0302\u02FF\x03\x02\x02\x02\u0303" +
+    "\u0306\x03\x02\x02\x02\u0304\u0302\x03\x02\x02\x02\u0304\u0305\x03\x02" +
+    "\x02\x02\u0305\u0308\x03\x02\x02\x02\u0306\u0304\x03\x02\x02\x02\u0307" +
+    "\u0309\x07v\x02\x02\u0308\u0307\x03\x02\x02\x02\u0308\u0309\x03\x02\x02" +
+    "\x02\u0309\x8D\x03\x02\x02\x02\u030A\u030B\x05\xD8m\x02\u030B\x8F\x03" +
+    "\x02\x02\x02\u030C\u030E\x07h\x02\x02\u030D\u030C\x03\x02\x02\x02\u030E" +
+    "\u0311\x03\x02\x02\x02\u030F\u030D\x03\x02\x02\x02\u030F\u0310\x03\x02" +
+    "\x02\x02\u0310\u0312\x03\x02\x02\x02\u0311\u030F\x03\x02\x02\x02\u0312" +
+    "\u0313\x05\x8EH\x02\u0313\u0314\x05\x0E\b\x02\u0314\u0315\x05h5\x02\u0315" +
+    "\x91\x03\x02\x02\x02\u0316\u0329\x05\x96L\x02\u0317\u0329\x05\\/\x02\u0318" +
+    "\u0329\x05\x94K\x02\u0319\u0329\x05`1\x02\u031A\u0329\x05\xA6T\x02\u031B" +
+    "\u0329\x05\xBA^\x02\u031C\u0329\x05\xA2R\x02\u031D\u0329\x05\xA4S\x02" +
+    "\u031E\u0329\x05\xB4[\x02\u031F\u0329\x05\xB0Y\x02\u0320\u0329\x05\xAA" +
+    "V\x02\u0321\u0329\x05\x88E\x02\u0322\u0329\x05\x8AF\x02\u0323\u0329\x05" +
+    "\x9CO\x02\u0324\u0329\x05\xBC_\x02\u0325\u0329\x05\xBE`\x02\u0326\u0329" +
+    "\x05\xC0a\x02\u0327\u0329\x05(\x15\x02\u0328\u0316\x03\x02\x02\x02\u0328" +
+    "\u0317\x03\x02\x02\x02\u0328\u0318\x03\x02\x02\x02\u0328\u0319\x03\x02" +
+    "\x02\x02\u0328\u031A\x03\x02\x02\x02\u0328\u031B\x03\x02\x02\x02\u0328" +
+    "\u031C\x03\x02\x02\x02\u0328\u031D\x03\x02\x02\x02\u0328\u031E\x03\x02" +
+    "\x02\x02\u0328\u031F\x03\x02\x02\x02\u0328\u0320\x03\x02\x02\x02\u0328" +
+    "\u0321\x03\x02\x02\x02\u0328\u0322\x03\x02\x02\x02\u0328\u0323\x03\x02" +
+    "\x02\x02\u0328\u0324\x03\x02\x02\x02\u0328\u0325\x03\x02\x02\x02\u0328" +
+    "\u0326\x03\x02\x02\x02\u0328\u0327\x03\x02\x02\x02\u0329\x93\x03\x02\x02" +
+    "\x02\u032A\u032B\x05^0\x02\u032B\x95\x03\x02\x02\x02\u032C\u032D\x05\f" +
+    "\x07\x02\u032D\u032E\x07\f\x02\x02\u032E\u032F\x05\x98M\x02\u032F\x97" +
+    "\x03\x02\x02\x02\u0330\u0337\x05\x9AN\x02\u0331\u0333\x07v\x02\x02\u0332" +
+    "\u0331\x03\x02\x02\x02\u0332\u0333\x03\x02\x02\x02\u0333\u0334\x03\x02" +
+    "\x02\x02\u0334\u0336\x05\x9AN\x02\u0335\u0332\x03\x02\x02\x02\u0336\u0339" +
+    "\x03\x02\x02\x02\u0337\u0335\x03\x02\x02\x02\u0337\u0338\x03\x02\x02\x02" +
+    "\u0338\u033B\x03\x02\x02\x02\u0339\u0337\x03\x02\x02\x02\u033A\u033C\x07" +
+    "v\x02\x02\u033B\u033A\x03\x02\x02\x02\u033B\u033C\x03\x02\x02\x02\u033C" +
+    "\x99\x03\x02\x02\x02\u033D\u0340\x05\xF2z\x02\u033E\u0340\x05V,\x02\u033F" +
+    "\u033D\x03\x02\x02\x02\u033F\u033E\x03\x02\x02\x02\u0340\x9B\x03\x02\x02" +
+    "\x02\u0341\u0342\x05\f\x07\x02\u0342\u0343\x07\x14\x02\x02\u0343\u0344" +
+    "\x05\x9EP\x02\u0344\x9D\x03\x02\x02\x02\u0345\u034C\x05\xA0Q\x02\u0346" +
+    "\u0348\x07v\x02\x02\u0347\u0346\x03\x02\x02\x02\u0347\u0348\x03\x02\x02" +
+    "\x02\u0348\u0349\x03\x02\x02\x02\u0349\u034B\x05\xA0Q\x02\u034A\u0347" +
+    "\x03\x02\x02\x02\u034B\u034E\x03\x02\x02\x02\u034C\u034A\x03\x02\x02\x02" +
+    "\u034C\u034D\x03\x02\x02\x02\u034D\u0350\x03\x02\x02\x02\u034E\u034C\x03" +
+    "\x02\x02\x02\u034F\u0351\x07v\x02\x02\u0350\u034F\x03\x02\x02\x02\u0350" +
+    "\u0351\x03\x02\x02\x02\u0351\x9F\x03\x02\x02\x02\u0352\u0356\x05\f\x07" +
+    "\x02\u0353\u0354\x05<\x1F\x02\u0354\u0355\x05\x0E\b\x02\u0355\u0357\x03" +
+    "\x02\x02\x02\u0356\u0353\x03\x02\x02\x02\u0356\u0357\x03\x02\x02\x02\u0357" +
+    "\u0358\x03\x02\x02\x02\u0358\u0359\x05h5\x02\u0359\xA1\x03\x02\x02\x02" +
+    "\u035A\u035B\x05\f\x07\x02\u035B\u035C\x07\x04\x02\x02\u035C\u035D\x05" +
+    "\x98M\x02\u035D\xA3\x03\x02\x02\x02\u035E\u035F\x05\f\x07\x02\u035F\u0360" +
+    "\x07\x05\x02\x02\u0360\u0361\x05\x98M\x02\u0361\xA5\x03\x02\x02\x02\u0362" +
+    "\u0363\x05\f\x07\x02\u0363\u0364\t\x07\x02\x02\u0364\u0365\x05\xECw\x02" +
+    "\u0365\xA7\x03\x02\x02\x02\u0366\u0367\x07\x16\x02\x02\u0367\u036C\x05" +
+    "\xD8m\x02\u0368\u0369\x07v\x02\x02\u0369\u036B\x05\xD8m\x02\u036A\u0368" +
+    "\x03\x02\x02\x02\u036B\u036E\x03\x02\x02\x02\u036C\u036A\x03\x02\x02\x02" +
+    "\u036C\u036D\x03\x02\x02\x02\u036D\u0370\x03\x02\x02\x02\u036E\u036C\x03" +
+    "\x02\x02\x02\u036F\u0371\x07v\x02\x02\u0370\u036F\x03\x02\x02\x02\u0370" +
+    "\u0371\x03\x02\x02\x02\u0371\xA9\x03\x02\x02\x02\u0372\u0373\x07\x15\x02" +
+    "\x02\u0373\u0374\x05\xACW\x02\u0374\xAB\x03\x02\x02\x02\u0375\u037C\x05" +
+    "\xAEX\x02\u0376\u0378\x07v\x02\x02\u0377\u0376\x03\x02\x02\x02\u0377\u0378" +
+    "\x03\x02\x02\x02\u0378\u0379\x03\x02\x02\x02\u0379\u037B\x05\xAEX\x02" +
+    "\u037A\u0377\x03\x02\x02\x02\u037B\u037E\x03\x02\x02\x02\u037C\u037A\x03" +
+    "\x02\x02\x02\u037C\u037D\x03\x02\x02\x02\u037D\u0380\x03\x02\x02\x02\u037E" +
+    "\u037C\x03\x02\x02\x02\u037F\u0381\x07v\x02\x02\u0380\u037F\x03\x02\x02" +
+    "\x02\u0380\u0381\x03\x02\x02\x02\u0381\xAD\x03\x02\x02\x02\u0382\u0385" +
+    "\x07\x94\x02\x02\u0383\u0385\x05\xFC\x7F\x02\u0384\u0382\x03\x02\x02\x02" +
+    "\u0384\u0383\x03\x02\x02\x02\u0385\u0387\x03\x02\x02\x02\u0386\u0388\t" +
+    "\x06\x02\x02\u0387\u0386\x03\x02\x02\x02\u0387\u0388\x03\x02\x02\x02\u0388" +
+    "\xAF\x03\x02\x02\x02\u0389\u038A\x07\x12\x02\x02\u038A\u038B\x07\x94\x02" +
+    "\x02\u038B\xB1\x03\x02\x02\x02\u038C\u038D\x07*\x02\x02\u038D\u0391\x05" +
+    "\xFC\x7F\x02\u038E\u038F\x07*\x02\x02\u038F\u0391\x05\xE0q\x02\u0390\u038C" +
+    "\x03\x02\x02\x02\u0390\u038E\x03\x02\x02\x02\u0391\xB3\x03\x02\x02\x02" +
+    "\u0392\u0393\x07 \x02\x02\u0393\u0395\x07\x94\x02\x02\u0394\u0396\x05" +
+    "\xB2Z\x02\u0395\u0394\x03\x02\x02\x02\u0395\u0396\x03\x02\x02\x02\u0396" +
+    "\xB5\x03\x02\x02\x02\u0397\u039A\x05\xF8}\x02\u0398\u0399\x07w\x02\x02" +
+    "\u0399\u039B\x07\x80\x02\x02\u039A\u0398\x03\x02\x02\x02\u039A\u039B\x03" +
+    "\x02\x02\x02\u039B\u039E\x03\x02\x02\x02\u039C\u039E\x07\x80\x02\x02\u039D" +
+    "\u0397\x03\x02\x02\x02\u039D\u039C\x03\x02\x02\x02\u039E\xB7\x03\x02\x02" +
+    "\x02\u039F\u03A6\x05\xB6\\\x02\u03A0\u03A2\x07v\x02\x02\u03A1\u03A0\x03" +
+    "\x02\x02\x02\u03A1\u03A2\x03\x02\x02\x02\u03A2\u03A3\x03\x02\x02\x02\u03A3" +
+    "\u03A5\x05\xB6\\\x02\u03A4\u03A1\x03\x02\x02\x02\u03A5\u03A8\x03\x02\x02" +
+    "\x02\u03A6\u03A4\x03\x02\x02\x02\u03A6\u03A7\x03\x02\x02\x02\u03A7\xB9" +
+    "\x03\x02\x02\x02\u03A8\u03A6\x03\x02\x02\x02\u03A9\u03AA\x07\x0E\x02\x02" +
+    "\u03AA\u03AD\x05\xB8]\x02\u03AB\u03AC\x07*\x02\x02\u03AC\u03AE\x05\xFC" +
+    "\x7F\x02\u03AD\u03AB\x03\x02\x02\x02\u03AD\u03AE\x03\x02\x02\x02\u03AE" +
+    "\xBB\x03\x02\x02\x02\u03AF\u03B0\x07\x1C\x02\x02\u03B0\u03B1\x05\xC2b" +
+    "\x02\u03B1\xBD\x03\x02\x02\x02\u03B2\u03B3\x07#\x02\x02\u03B3\u03B4\x05" +
+    "\xCAf\x02\u03B4\xBF\x03\x02\x02\x02\u03B5\u03B6\x07h\x02\x02\u03B6\xC1" +
+    "\x03\x02\x02\x02\u03B7\u03B8\t\b\x02\x02\u03B8\xC3\x03\x02\x02\x02\u03B9" +
+    "\u03BA\t\t\x02\x02\u03BA\xC5\x03\x02\x02\x02\u03BB\u03BC\t\n\x02\x02\u03BC" +
+    "\xC7\x03\x02\x02\x02\u03BD\u03BE\t\v\x02\x02\u03BE\xC9\x03\x02\x02\x02" +
+    "\u03BF\u03C2\x05\xCCg\x02\u03C0\u03C2\x05\x18\r\x02\u03C1\u03BF\x03\x02" +
+    "\x02\x02\u03C1\u03C0\x03\x02\x02\x02\u03C2\xCB\x03\x02\x02\x02\u03C3\u03C4" +
+    "\t\f\x02\x02\u03C4\xCD\x03\x02\x02\x02\u03C5\u03C6\t\r\x02\x02\u03C6\xCF" +
+    "\x03\x02\x02\x02\u03C7\u03CF\x05\xCAf\x02\u03C8\u03CF\x05\xCEh\x02\u03C9" +
+    "\u03CF\x05\xD2j\x02\u03CA\u03CF\x07J\x02\x02\u03CB\u03CF\t\x0E\x02\x02" +
+    "\u03CC\u03CF\x07c\x02\x02\u03CD\u03CF\x07I\x02\x02\u03CE\u03C7\x03\x02" +
+    "\x02\x02\u03CE\u03C8\x03\x02\x02\x02\u03CE\u03C9\x03\x02\x02\x02\u03CE" +
+    "\u03CA\x03\x02\x02\x02\u03CE\u03CB\x03\x02\x02\x02\u03CE\u03CC\x03\x02" +
+    "\x02\x02\u03CE\u03CD\x03\x02\x02\x02\u03CF\xD1\x03\x02\x02\x02\u03D0\u03D8" +
+    "\x07\x8A\x02\x02\u03D1\u03D8\x07\x8B\x02\x02\u03D2\u03D8\x07\x8C\x02\x02" +
+    "\u03D3\u03D8\x07\x8F\x02\x02\u03D4\u03D8\x07\x8E\x02\x02\u03D5\u03D8\x07" +
+    "\x8D\x02\x02\u03D6\u03D8\x07\x90\x02\x02\u03D7\u03D0\x03\x02\x02\x02\u03D7" +
+    "\u03D1\x03\x02\x02\x02\u03D7\u03D2\x03\x02\x02\x02\u03D7\u03D3\x03\x02" +
+    "\x02\x02\u03D7\u03D4\x03\x02\x02\x02\u03D7\u03D5\x03\x02\x02\x02\u03D7" +
+    "\u03D6\x03\x02\x02\x02\u03D8\xD3\x03\x02\x02\x02\u03D9\u03DA\x05\xCAf" +
+    "\x02\u03DA\xD5\x03\x02\x02\x02\u03DB\u03DC\x05\xCAf\x02\u03DC\xD7\x03" +
+    "\x02\x02\x02\u03DD\u03DE\t\x0F\x02\x02\u03DE\xD9\x03\x02\x02\x02\u03DF" +
+    "\u03E0\t\x10\x02\x02\u03E0\xDB\x03\x02\x02\x02\u03E1\u03E2\t\x11\x02\x02" +
+    "\u03E2\xDD\x03\x02\x02\x02\u03E3\u03E6\x05\xC6d\x02\u03E4\u03E6\x05\xCA" +
+    "f\x02\u03E5\u03E3\x03\x02\x02\x02\u03E5\u03E4\x03\x02\x02\x02\u03E6\xDF" +
+    "\x03\x02\x02\x02\u03E7\u03E8\bq\x01\x02\u03E8\u043B\x05\xF8}\x02\u03E9" +
+    "\u043B\x05\xD0i\x02\u03EA\u03EB\x07\x7F\x02\x02\u03EB\u043B\x05\xE0q\x18" +
+    "\u03EC\u03ED\x07H\x02\x02\u03ED\u043B\x05\xE0q\x0F\u03EE\u03EF\x07,\x02" +
+    "\x02\u03EF\u03F0\x07l\x02\x02\u03F0\u03F1\x05\xE0q\x02\u03F1\u03F2\x07" +
+    "&\x02\x02\u03F2\u03F3\x05\xDEp\x02\u03F3\u03F4\x07m\x02\x02\u03F4\u043B" +
+    "\x03\x02\x02\x02\u03F5\u03F6\x07.\x02\x02\u03F6\u03F7\x07l\x02\x02\u03F7" +
+    "\u03F8\x072\x02\x02\u03F8\u03F9\x05\xE0q\x02\u03F9\u03FA\x07m\x02\x02" +
+    "\u03FA\u043B\x03\x02\x02\x02\u03FB\u03FC\x07S\x02\x02\u03FC\u03FE\x07" +
+    "w\x02\x02\u03FD\u03FB\x03\x02\x02\x02\u03FD\u03FE\x03\x02\x02\x02\u03FE" +
+    "\u03FF\x03\x02\x02\x02\u03FF\u0400\x05\xC4c\x02\u0400\u0403\x07l\x02\x02" +
+    "\u0401\u0404\x05\xE0q\x02\u0402\u0404\x07\x80\x02\x02\u0403\u0401\x03" +
+    "\x02\x02\x02\u0403\u0402\x03\x02\x02\x02\u0403\u0404\x03\x02\x02\x02\u0404" +
+    "\u0405\x03\x02\x02\x02\u0405\u0406\x07m\x02\x02\u0406\u043B\x03\x02\x02" +
+    "\x02\u0407\u0408\x05\xF8}\x02\u0408\u0409\x07w\x02\x02\u0409\u040A\x05" +
+    "\xC4c\x02\u040A\u040C\x07l\x02\x02\u040B\u040D\x05\xE0q\x02\u040C\u040B" +
+    "\x03\x02\x02\x02\u040C\u040D\x03\x02\x02\x02\u040D\u040E\x03\x02\x02\x02" +
+    "\u040E\u040F\x07m\x02\x02\u040F\u043B\x03\x02\x02\x02\u0410\u0411\x07" +
+    "l\x02\x02\u0411\u0412\x05\xE2r\x02\u0412\u0413\x07m\x02\x02\u0413\u043B" +
+    "\x03\x02\x02\x02\u0414\u0415\x05\xF8}\x02\u0415\u0416\x07w\x02\x02\u0416" +
+    "\u0417\x05\xD8m\x02\u0417\u0419\x07l\x02\x02\u0418\u041A\x05\xE8u\x02" +
+    "\u0419\u0418\x03\x02\x02\x02\u0419\u041A\x03\x02\x02\x02\u041A\u041B\x03" +
+    "\x02\x02\x02\u041B\u041C\x07m\x02\x02\u041C\u043B\x03\x02\x02\x02\u041D" +
+    "\u0422\x05\xD8m\x02\u041E\u0420\x07t\x02\x02\u041F\u0421\x05\xC6d\x02" +
+    "\u0420\u041F\x03\x02\x02\x02\u0420\u0421\x03\x02\x02\x02\u0421\u0423\x03" +
+    "\x02\x02\x02\u0422\u041E\x03\x02\x02\x02\u0422\u0423\x03\x02\x02\x02\u0423" +
+    "\u0426\x03\x02\x02\x02\u0424\u0426\x05\xDAn\x02\u0425\u041D\x03\x02\x02" +
+    "\x02\u0425\u0424\x03\x02\x02\x02\u0426\u0427\x03\x02\x02\x02\u0427\u0429" +
+    "\x07l\x02\x02\u0428\u042A\x05\xE8u\x02\u0429\u0428\x03\x02\x02\x02\u0429" +
+    "\u042A\x03\x02\x02\x02\u042A\u042B\x03\x02\x02\x02\u042B\u042C\x07m\x02" +
+    "\x02\u042C\u043B\x03\x02\x02\x02\u042D\u043B\x05\xE4s\x02\u042E\u042F" +
+    "\x05\xDCo\x02\u042F\u0430\x07l\x02\x02\u0430\u0435\x05\xE0q\x02\u0431" +
+    "\u0432\x07v\x02\x02\u0432\u0434\x05\xFC\x7F\x02\u0433\u0431\x03\x02\x02" +
+    "\x02\u0434\u0437\x03\x02\x02\x02\u0435\u0433\x03\x02\x02\x02\u0435\u0436" +
+    "\x03\x02\x02\x02\u0436\u0438\x03\x02\x02\x02\u0437\u0435\x03\x02\x02\x02" +
+    "\u0438\u0439\x07m\x02\x02\u0439\u043B\x03\x02\x02\x02\u043A\u03E7\x03" +
+    "\x02\x02\x02\u043A\u03E9\x03\x02\x02\x02\u043A\u03EA\x03\x02\x02\x02\u043A" +
+    "\u03EC\x03\x02\x02\x02\u043A\u03EE\x03\x02\x02\x02\u043A\u03F5\x03\x02" +
+    "\x02\x02\u043A\u03FD\x03\x02\x02\x02\u043A\u0407\x03\x02\x02\x02\u043A" +
+    "\u0410\x03\x02\x02\x02\u043A\u0414\x03\x02\x02\x02\u043A\u0425\x03\x02" +
+    "\x02\x02\u043A\u042D\x03\x02\x02\x02\u043A\u042E\x03\x02\x02\x02\u043B" +
+    "\u046F\x03\x02\x02\x02\u043C\u043D\f\x17\x02\x02\u043D\u043E\t\x12\x02" +
+    "\x02\u043E\u046E\x05\xE0q\x18\u043F\u0440\f\x16\x02\x02\u0440\u0441\t" +
+    "\x13\x02\x02\u0441\u046E\x05\xE0q\x17\u0442\u0443\f\x15\x02\x02\u0443" +
+    "\u0444\x07Z\x02\x02\u0444\u046E\x05\xE0q\x16\u0445\u0446\f\x11\x02\x02" +
+    "\u0446\u0447\x05\xC8e\x02\u0447\u0448\x05\xE0q\x12\u0448\u046E\x03\x02" +
+    "\x02\x02\u0449\u044A\f\x0E\x02\x02\u044A\u044B\x07%\x02\x02\u044B\u046E" +
+    "\x05\xE0q\x0F\u044C\u044D\f\r\x02\x02\u044D\u044E\x07M\x02\x02\u044E\u046E" +
+    "\x05\xE0q\x0E\u044F\u0450\f\f\x02\x02\u0450\u0451\x07\x88\x02\x02\u0451" +
+    "\u046E\x05\xE0q\r\u0452\u0453\f\x1E\x02\x02\u0453\u046E\x05z>\x02\u0454" +
+    "\u0455";
+MalloyParser._serializedATNSegment2 = "\f\x1C\x02\x02\u0455\u046E\x05\xDAn\x02\u0456\u0457\f\x1B\x02\x02\u0457" +
+    "\u0458\x07w\x02\x02\u0458\u046E\x05\xDAn\x02\u0459\u045A\f\x1A\x02\x02" +
+    "\u045A\u045B\x07r\x02\x02\u045B\u046E\x05\xDEp\x02\u045C\u045D\f\x19\x02" +
+    "\x02\u045D\u045E\x07s\x02\x02\u045E\u046E\x05\xDEp\x02\u045F\u0460\f\x14" +
+    "\x02\x02\u0460\u0461\x079\x02\x02\u0461\u0462\x05\xE0q\x02\u0462\u0463" +
+    "\x05\xDAn\x02\u0463\u046E\x03\x02\x02\x02\u0464\u0465\f\x13\x02\x02\u0465" +
+    "\u0466\x07i\x02\x02\u0466\u046E\x05\xE2r\x02\u0467\u0468\f\x12\x02\x02" +
+    "\u0468\u0469\x07\x83\x02\x02\u0469\u046E\x05\xE2r\x02\u046A\u046B\f\x10" +
+    "\x02\x02\u046B\u046C\x07\x89\x02\x02\u046C\u046E\x05\xE2r\x02\u046D\u043C" +
+    "\x03\x02\x02\x02\u046D\u043F\x03\x02\x02\x02\u046D\u0442\x03\x02\x02\x02" +
+    "\u046D\u0445\x03\x02\x02\x02\u046D\u0449\x03\x02\x02\x02\u046D\u044C\x03" +
+    "\x02\x02\x02\u046D\u044F\x03\x02\x02\x02\u046D\u0452\x03\x02\x02\x02\u046D" +
+    "\u0454\x03\x02\x02\x02\u046D\u0456\x03\x02\x02\x02\u046D\u0459\x03\x02" +
+    "\x02\x02\u046D\u045C\x03\x02\x02\x02\u046D\u045F\x03\x02\x02\x02\u046D" +
+    "\u0464\x03\x02\x02\x02\u046D\u0467\x03\x02\x02\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\xE1\x03\x02\x02\x02\u0471\u046F\x03\x02\x02" +
+    "\x02\u0472\u0474\x07l\x02\x02\u0473\u0475\x05\xC8e\x02\u0474\u0473\x03" +
+    "\x02\x02\x02\u0474\u0475\x03\x02\x02\x02\u0475\u0476\x03\x02\x02\x02\u0476" +
+    "\u0477\x05\xE0q\x02\u0477\u0478\x07m\x02\x02\u0478\u047E\x03\x02\x02\x02" +
+    "\u0479\u047B\x05\xC8e\x02\u047A\u0479\x03\x02\x02\x02\u047A\u047B\x03" +
+    "\x02\x02\x02\u047B\u047C\x03\x02\x02\x02\u047C\u047E\x05\xE0q\x02\u047D" +
+    "\u0472\x03\x02\x02\x02\u047D\u047A\x03\x02\x02\x02\u047E\xE3\x03\x02\x02" +
+    "\x02\u047F\u0481\x05\xE6t\x02\u0480\u047F\x03\x02\x02\x02\u0481\u0482" +
+    "\x03\x02\x02\x02\u0482\u0480\x03\x02\x02\x02\u0482\u0483\x03\x02\x02\x02" +
+    "\u0483\u0486\x03\x02\x02\x02\u0484\u0485\x073\x02\x02\u0485\u0487\x05" +
+    "\xE0q\x02\u0486\u0484\x03\x02\x02\x02\u0486\u0487\x03\x02\x02\x02\u0487" +
+    "\xE5\x03\x02\x02\x02\u0488\u048A\x07N\x02\x02\u0489\u048B\x05\xE0q\x02" +
+    "\u048A\u0489\x03\x02\x02\x02\u048A\u048B\x03\x02\x02\x02\u048B\u048C\x03" +
+    "\x02\x02\x02\u048C\u048D\x07^\x02\x02\u048D\u048E\x05\xE2r\x02\u048E\xE7" +
+    "\x03\x02\x02\x02\u048F\u0494\x05\xE0q\x02\u0490\u0491\x07v\x02\x02\u0491" +
+    "\u0493\x05\xE0q\x02\u0492\u0490\x03\x02\x02\x02\u0493\u0496\x03\x02\x02" +
+    "\x02\u0494\u0492\x03\x02\x02\x02\u0494\u0495\x03\x02\x02\x02\u0495\u0498" +
+    "\x03\x02\x02\x02\u0496\u0494\x03\x02\x02\x02\u0497\u0499\x07v\x02\x02" +
+    "\u0498\u0497\x03\x02\x02\x02\u0498\u0499\x03\x02\x02\x02\u0499\xE9\x03" +
+    "\x02\x02\x02\u049A\u04A1\x05\xFC\x7F\x02\u049B\u049D\x07v\x02\x02\u049C" +
+    "\u049B\x03\x02\x02\x02\u049C\u049D\x03\x02\x02\x02\u049D\u049E\x03\x02" +
+    "\x02\x02\u049E\u04A0\x05\xFC\x7F\x02\u049F\u049C\x03\x02\x02\x02\u04A0" +
+    "\u04A3\x03\x02\x02\x02\u04A1\u049F\x03\x02\x02\x02\u04A1\u04A2\x03\x02" +
+    "\x02\x02\u04A2\xEB\x03\x02\x02\x02\u04A3\u04A1\x03\x02\x02\x02\u04A4\u04AB" +
+    "\x05\xF6|\x02\u04A5\u04A7\x07v\x02\x02\u04A6\u04A5\x03\x02\x02\x02\u04A6" +
+    "\u04A7\x03\x02\x02\x02\u04A7\u04A8\x03\x02\x02\x02\u04A8\u04AA\x05\xF6" +
+    "|\x02\u04A9\u04A6\x03\x02\x02\x02\u04AA\u04AD\x03\x02\x02\x02\u04AB\u04A9" +
+    "\x03\x02\x02\x02\u04AB\u04AC\x03\x02\x02\x02\u04AC\u04AF\x03\x02\x02\x02" +
+    "\u04AD\u04AB\x03\x02\x02\x02\u04AE\u04B0\x07v\x02\x02\u04AF\u04AE\x03" +
+    "\x02\x02\x02\u04AF\u04B0\x03\x02\x02\x02\u04B0\xED\x03\x02\x02\x02\u04B1" +
+    "\u04B2\x05\xF8}\x02\u04B2\u04B3\x07w\x02\x02\u04B3\u04B5\x03\x02\x02\x02" +
+    "\u04B4\u04B1\x03\x02\x02\x02\u04B4\u04B5\x03\x02\x02\x02\u04B5\u04B6\x03" +
+    "\x02\x02\x02\u04B6\u04B8\x07\x80\x02\x02\u04B7\u04B9\x05\xF0y\x02\u04B8" +
+    "\u04B7\x03\x02\x02\x02\u04B8\u04B9\x03\x02\x02\x02\u04B9\xEF\x03\x02\x02" +
+    "\x02\u04BA\u04BE\x07p\x02\x02\u04BB\u04BC\x07\n\x02\x02\u04BC\u04BF\x05" +
+    "\xEAv\x02\u04BD\u04BF\x07v\x02\x02\u04BE\u04BB\x03\x02\x02\x02\u04BE\u04BD" +
+    "\x03\x02\x02\x02\u04BF\u04C0\x03\x02\x02\x02\u04C0\u04BE\x03\x02\x02\x02" +
+    "\u04C0\u04C1\x03\x02\x02\x02\u04C1\u04C2\x03\x02\x02\x02\u04C2\u04C3\x07" +
+    "q\x02\x02\u04C3\xF1\x03\x02\x02\x02\u04C4\u04C5\x05\f\x07\x02\u04C5\u04C7" +
+    "\x05\xF8}\x02\u04C6\u04C8\x05\xF4{\x02\u04C7\u04C6\x03\x02\x02\x02\u04C7" +
+    "\u04C8\x03\x02\x02\x02\u04C8\xF3\x03\x02\x02\x02\u04C9\u04CA\x07w\x02" +
+    "\x02\u04CA\u04D1\x05\xDAn\x02\u04CB\u04CC\x07w\x02\x02\u04CC\u04CD\x05" +
+    "\xC4c\x02\u04CD\u04CE\x07l\x02\x02\u04CE\u04CF\x07m\x02\x02\u04CF\u04D1" +
+    "\x03\x02\x02\x02\u04D0\u04C9\x03\x02\x02\x02\u04D0\u04CB\x03\x02\x02\x02" +
+    "\u04D1\xF5\x03\x02\x02\x02\u04D2\u04D6\x05\xF2z\x02\u04D3\u04D6\x05\xEE" +
+    "x\x02\u04D4\u04D6\x05V,\x02\u04D5\u04D2\x03\x02\x02\x02\u04D5\u04D3\x03" +
+    "\x02\x02\x02\u04D5\u04D4\x03\x02\x02\x02\u04D6\xF7\x03\x02\x02\x02\u04D7" +
+    "\u04DC\x05\xFC\x7F\x02\u04D8\u04D9\x07w\x02\x02\u04D9\u04DB\x05\xFC\x7F" +
+    "\x02\u04DA\u04D8\x03\x02\x02\x02\u04DB\u04DE\x03\x02\x02\x02\u04DC\u04DA" +
+    "\x03\x02\x02\x02\u04DC\u04DD\x03\x02\x02\x02\u04DD\xF9\x03\x02\x02\x02" +
+    "\u04DE\u04DC\x03\x02\x02\x02\u04DF\u04E0\x05\xD8m\x02\u04E0\xFB\x03\x02" +
+    "\x02\x02\u04E1\u04E2\x05\xD8m\x02\u04E2\xFD\x03\x02\x02\x02\u04E3\u04E4" +
+    "\x05\xE0q\x02\u04E4\u04E5\x07\x02\x02\x03\u04E5\xFF\x03\x02\x02\x02\u04E6" +
+    "\u04E7\x05\xD8m\x02\u04E7\u0101\x03\x02\x02\x02\u04E8\u04E9\x05\xD8m\x02" +
+    "\u04E9\u0103\x03\x02\x02\x02\u04EA\u04EB\x05\xCAf\x02\u04EB\u0105\x03" +
+    "\x02\x02\x02\u04EC\u04ED\x07\x84\x02\x02\u04ED\u04EE\x07\x84\x02\x02\u04EE" +
+    "\u04EF\x07n\x02\x02\u04EF\u04F0\x05\xCAf\x02\u04F0\u04F1\x07o\x02\x02" +
+    "\u04F1\u0107\x03\x02\x02\x02\x86\u010A\u010C\u0119\u0124\u012C\u0140\u0148" +
+    "\u014E\u0159\u0163\u016C\u0173\u0178\u017D\u0183\u0188\u018C\u019D\u01AD" +
+    "\u01B5\u01B7\u01BB\u01C6\u01CB\u01CF\u01DF\u01E1\u01E6\u01FB\u01FE\u020A" +
+    "\u020F\u0213\u021B\u0220\u0224\u023E\u0246\u0250\u025B\u025D\u0267\u026E" +
+    "\u0276\u027B\u0280\u0282\u0289\u028E\u0292\u029E\u02A3\u02A6\u02AE\u02B3" +
+    "\u02B6\u02BA\u02BC\u02C2\u02C7\u02C9\u02D3\u02D7\u02DB\u02DF\u02EA\u02F1" +
+    "\u02F5\u02FF\u0304\u0308\u030F\u0328\u0332\u0337\u033B\u033F\u0347\u034C" +
+    "\u0350\u0356\u036C\u0370\u0377\u037C\u0380\u0384\u0387\u0390\u0395\u039A" +
+    "\u039D\u03A1\u03A6\u03AD\u03C1\u03CE\u03D7\u03E5\u03FD\u0403\u040C\u0419" +
+    "\u0420\u0422\u0425\u0429\u0435\u043A\u046D\u046F\u0474\u047A\u047D\u0482" +
+    "\u0486\u048A\u0494\u0498\u049C\u04A1\u04A6\u04AB\u04AF\u04B4\u04B8\u04BE" +
+    "\u04C0\u04C7\u04D0\u04D5\u04DC";
 MalloyParser._serializedATN = Utils.join([
     MalloyParser._serializedATNSegment0,
     MalloyParser._serializedATNSegment1,
@@ -11271,7 +11312,7 @@ class AggregateOrderingContext extends ParserRuleContext_1.ParserRuleContext {
 exports.AggregateOrderingContext = AggregateOrderingContext;
 class AggregateOrderBySpecContext extends ParserRuleContext_1.ParserRuleContext {
     fieldExpr() {
-        return this.getRuleContext(0, FieldExprContext);
+        return this.tryGetRuleContext(0, FieldExprContext);
     }
     ASC() { return this.tryGetToken(MalloyParser.ASC, 0); }
     DESC() { return this.tryGetToken(MalloyParser.DESC, 0); }
@@ -11966,56 +12007,18 @@ class NestEntryContext extends ParserRuleContext_1.ParserRuleContext {
     }
 }
 exports.NestEntryContext = NestEntryContext;
-class NestExistingContext extends NestEntryContext {
+class NestDefContext extends NestEntryContext {
     tags() {
         return this.getRuleContext(0, TagsContext);
     }
-    fieldPath() {
-        return this.getRuleContext(0, FieldPathContext);
-    }
-    PLUS() { return this.tryGetToken(MalloyParser.PLUS, 0); }
     vExpr() {
-        return this.tryGetRuleContext(0, VExprContext);
-    }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
-    }
-    // @Override
-    enterRule(listener) {
-        if (listener.enterNestExisting) {
-            listener.enterNestExisting(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitNestExisting) {
-            listener.exitNestExisting(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitNestExisting) {
-            return visitor.visitNestExisting(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.NestExistingContext = NestExistingContext;
-class NestDefContext extends NestEntryContext {
-    tags() {
-        return this.getRuleContext(0, TagsContext);
+        return this.getRuleContext(0, VExprContext);
     }
     queryName() {
-        return this.getRuleContext(0, QueryNameContext);
+        return this.tryGetRuleContext(0, QueryNameContext);
     }
     isDefine() {
-        return this.getRuleContext(0, IsDefineContext);
-    }
-    vExpr() {
-        return this.getRuleContext(0, VExprContext);
+        return this.tryGetRuleContext(0, IsDefineContext);
     }
     constructor(ctx) {
         super(ctx.parent, ctx.invokingState);