@malloydata/malloy 0.0.2 → 0.0.4

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

@@ -1,5 +1,5 @@
 "use strict";
-// Generated from Malloy.g4 by ANTLR 4.9.0-SNAPSHOT
+// Generated from MalloyParser.g4 by ANTLR 4.9.0-SNAPSHOT
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -27,7 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExploreRenameDefContext = exports.RenameListContext = exports.DefExploreQueryContext = exports.DefExploreEditFieldContext = exports.DefExploreRenameContext = exports.DefExplorePrimaryKeyContext = exports.DefExploreWhereContext = exports.DefJoin_stubContext = exports.DefDeclare_stubContext = exports.DefExploreMeasureContext = exports.DefExploreDimensionContext = exports.ExploreStatementContext = exports.ExplorePropertiesContext = exports.ExploreNameContext = exports.ExploreNameDefContext = exports.SQLSourceContext = exports.QuerySourceContext = exports.TableSourceContext = exports.NamedSourceContext = exports.ExploreSourceContext = exports.ExploreContext = exports.ExploreDefinitionContext = exports.ExploreDefinitionListContext = exports.QueryNameContext = exports.ExploreQueryNameContext = exports.FilterShortcutContext = exports.QueryPropertiesContext = exports.ExploreTableContext = exports.PipeElementContext = exports.FirstSegmentContext = exports.PipelineFromNameContext = exports.ArrowQueryContext = exports.ExploreArrowQueryContext = exports.QueryContext = exports.RefineOperatorContext = exports.TopLevelQueryDefContext = exports.TopLevelQueryDefsContext = exports.ImportURLContext = exports.ImportStatementContext = exports.SqlStatementDefContext = exports.DefineSQLStatementContext = exports.TopLevelAnonQueryDefContext = exports.AnonymousQueryContext = exports.NamedQueries_stubContext = exports.DefineQueryContext = exports.ExploreKeywordContext = exports.DefineExploreStatementContext = exports.MalloyStatementContext = exports.MalloyDocumentContext = exports.MalloyParser = void 0;
 exports.SampleStatementContext = exports.IndexStatementContext = exports.IndexFieldsContext = exports.IndexElementContext = exports.TopStatementContext = exports.BySpecContext = exports.LimitStatementContext = exports.OrderBySpecContext = exports.OrderingContext = exports.OrderByStatementContext = exports.ProjectStatementContext = exports.AggregateStatementContext = exports.NestDefContext = exports.NestExistingContext = exports.NestEntryContext = exports.NestedQueryListContext = exports.NestStatementContext = exports.QueryFieldDefContext = exports.QueryFieldRefContext = exports.QueryFieldEntryContext = exports.DimensionDefContext = exports.QueryFieldListContext = exports.GroupByStatementContext = exports.QueryStatementContext = exports.ExploreQueryDefContext = exports.ExploreQueryNameDefContext = exports.SubQueryDefListContext = exports.HavingStatementContext = exports.WhereStatementContext = exports.FilterClauseListContext = exports.FilterByWhereContext = exports.FilterByShortcutContext = exports.FilteredByContext = exports.FilterStatementContext = exports.JoinExpressionContext = exports.JoinOnContext = exports.JoinWithContext = exports.JoinDefContext = exports.JoinListContext = exports.DefJoinCrossContext = exports.DefJoinManyContext = exports.DefJoinOneContext = exports.JoinStatementContext = exports.DeclareStatementContext = exports.MeasureDefContext = exports.JoinNameDefContext = exports.FieldNameDefContext = exports.FieldDefContext = exports.MeasureDefListContext = exports.DimensionDefListContext = void 0;
 exports.ExprNotPartialContext = exports.ExprPartialCompareContext = exports.PartialAllowedFieldExprContext = exports.ExprUngroupContext = exports.ExprPickContext = exports.ExprFuncContext = exports.ExprExprContext = exports.ExprAggregateContext = exports.ExprCountDisinctContext = exports.ExprCastContext = exports.ExprLogicalContext = exports.ExprNotContext = exports.ExprApplyContext = exports.ExprCompareContext = exports.ExprLogicalTreeContext = exports.ExprForRangeContext = exports.ExprRangeContext = exports.ExprAddSubContext = exports.ExprMulDivContext = exports.ExprSafeCastContext = exports.ExprTimeTruncContext = exports.ExprDurationContext = exports.ExprMinusContext = exports.ExprLiteralContext = exports.ExprFilterContext = exports.ExprFieldPathContext = exports.FieldExprContext = exports.UngroupContext = exports.TimeframeContext = exports.IdContext = exports.TableNameContext = exports.LiteralYearContext = exports.LiteralQuarterContext = exports.LiteralMonthContext = exports.LiteralWeekContext = exports.LiteralDayContext = exports.LiteralTimestampContext = exports.DateLiteralContext = exports.ExprNowContext = exports.ExprRegexContext = exports.ExprBoolContext = exports.ExprNULLContext = exports.ExprTimeContext = exports.ExprNumberContext = exports.ExprStringContext = exports.LiteralContext = exports.CompareOpContext = exports.MalloyTypeContext = exports.AggregateContext = exports.SampleSpecContext = void 0;
-exports.ConnectionNameContext = exports.SqlCommandNameDefContext = exports.SqlExploreNameRefContext = exports.SqlBlockContext = exports.JsonArrayContext = exports.JsonPropertyContext = exports.JsonObjectContext = exports.JsonValueContext = exports.JsonContext = exports.JustExprContext = exports.FieldNameContext = exports.JoinNameContext = exports.FieldPathContext = exports.NewMemberContext = exports.WildMemberContext = exports.NameMemberContext = exports.CollectionMemberContext = exports.FieldCollectionContext = exports.FieldNameListContext = exports.ArgumentListContext = exports.PickContext = exports.PickStatementContext = void 0;
+exports.ConnectionNameContext = exports.SqlCommandNameDefContext = exports.SqlExploreNameRefContext = exports.JsonArrayContext = exports.JsonPropertyContext = exports.JsonObjectContext = exports.JsonValueContext = exports.JsonContext = exports.JustExprContext = exports.FieldNameContext = exports.JoinNameContext = exports.FieldPathContext = exports.NewMemberContext = exports.WildMemberContext = exports.NameMemberContext = exports.CollectionMemberContext = exports.FieldCollectionContext = exports.FieldNameListContext = exports.ArgumentListContext = exports.PickContext = exports.PickStatementContext = void 0;
 const ATN_1 = require("antlr4ts/atn/ATN");
 const ATNDeserializer_1 = require("antlr4ts/atn/ATNDeserializer");
 const FailedPredicateException_1 = require("antlr4ts/FailedPredicateException");
@@ -51,7 +51,7 @@ class MalloyParser extends Parser_1.Parser {
     }
     // tslint:enable:no-trailing-whitespace
     // @Override
-    get grammarFileName() { return "Malloy.g4"; }
+    get grammarFileName() { return "MalloyParser.g4"; }
     // @Override
     get ruleNames() { return MalloyParser.ruleNames; }
     // @Override
@@ -67,12 +67,12 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 208;
+                this.state = 206;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.EXPLORE) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.SOURCE) | (1 << MalloyParser.SQL))) !== 0) || _la === MalloyParser.IMPORT || _la === MalloyParser.SEMI) {
                     {
-                        this.state = 206;
+                        this.state = 204;
                         this._errHandler.sync(this);
                         switch (this._input.LA(1)) {
                             case MalloyParser.EXPLORE:
@@ -81,13 +81,13 @@ class MalloyParser extends Parser_1.Parser {
                             case MalloyParser.SQL:
                             case MalloyParser.IMPORT:
                                 {
-                                    this.state = 204;
+                                    this.state = 202;
                                     this.malloyStatement();
                                 }
                                 break;
                             case MalloyParser.SEMI:
                                 {
-                                    this.state = 205;
+                                    this.state = 203;
                                     this.match(MalloyParser.SEMI);
                                 }
                                 break;
@@ -95,11 +95,11 @@ class MalloyParser extends Parser_1.Parser {
                                 throw new NoViableAltException_1.NoViableAltException(this);
                         }
                     }
-                    this.state = 210;
+                    this.state = 208;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
-                this.state = 211;
+                this.state = 209;
                 this.match(MalloyParser.EOF);
             }
         }
@@ -123,35 +123,35 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new MalloyStatementContext(this._ctx, this.state);
         this.enterRule(_localctx, 2, MalloyParser.RULE_malloyStatement);
         try {
-            this.state = 217;
+            this.state = 215;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.EXPLORE:
                 case MalloyParser.SOURCE:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 213;
+                        this.state = 211;
                         this.defineExploreStatement();
                     }
                     break;
                 case MalloyParser.SQL:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 214;
+                        this.state = 212;
                         this.defineSQLStatement();
                     }
                     break;
                 case MalloyParser.QUERY:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 215;
+                        this.state = 213;
                         this.defineQuery();
                     }
                     break;
                 case MalloyParser.IMPORT:
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 216;
+                        this.state = 214;
                         this.importStatement();
                     }
                     break;
@@ -181,9 +181,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 219;
+                this.state = 217;
                 this.exploreKeyword();
-                this.state = 220;
+                this.state = 218;
                 this.exploreDefinitionList();
             }
         }
@@ -210,7 +210,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 222;
+                this.state = 220;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.EXPLORE || _la === MalloyParser.SOURCE)) {
                     this._errHandler.recoverInline(this);
@@ -244,16 +244,16 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new DefineQueryContext(this._ctx, this.state);
         this.enterRule(_localctx, 8, MalloyParser.RULE_defineQuery);
         try {
-            this.state = 228;
+            this.state = 226;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 3, this._ctx)) {
                 case 1:
                     _localctx = new NamedQueries_stubContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 224;
+                        this.state = 222;
                         this.match(MalloyParser.QUERY);
-                        this.state = 225;
+                        this.state = 223;
                         this.topLevelQueryDefs();
                     }
                     break;
@@ -261,9 +261,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new AnonymousQueryContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 226;
+                        this.state = 224;
                         this.match(MalloyParser.QUERY);
-                        this.state = 227;
+                        this.state = 225;
                         this.topLevelAnonQueryDef();
                     }
                     break;
@@ -291,7 +291,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 230;
+                this.state = 228;
                 this.query();
             }
         }
@@ -317,9 +317,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 232;
+                this.state = 230;
                 this.match(MalloyParser.SQL);
-                this.state = 233;
+                this.state = 231;
                 this.sqlStatementDef();
             }
         }
@@ -346,27 +346,27 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 238;
+                this.state = 236;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.IDENTIFIER || _la === MalloyParser.OBJECT_NAME_LITERAL) {
                     {
-                        this.state = 235;
+                        this.state = 233;
                         this.sqlCommandNameDef();
-                        this.state = 236;
+                        this.state = 234;
                         this.match(MalloyParser.IS);
                     }
                 }
-                this.state = 240;
-                this.sqlBlock();
-                this.state = 243;
+                this.state = 238;
+                this.match(MalloyParser.SQL_STRING);
+                this.state = 241;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.ON) {
                     {
-                        this.state = 241;
+                        this.state = 239;
                         this.match(MalloyParser.ON);
-                        this.state = 242;
+                        this.state = 240;
                         this.connectionName();
                     }
                 }
@@ -394,9 +394,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 245;
+                this.state = 243;
                 this.match(MalloyParser.IMPORT);
-                this.state = 246;
+                this.state = 244;
                 this.importURL();
             }
         }
@@ -422,7 +422,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 248;
+                this.state = 246;
                 this.match(MalloyParser.JSON_STRING);
             }
         }
@@ -450,39 +450,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 250;
+                this.state = 248;
                 this.topLevelQueryDef();
-                this.state = 257;
+                this.state = 255;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 7, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 252;
+                                this.state = 250;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 251;
+                                        this.state = 249;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 254;
+                                this.state = 252;
                                 this.topLevelQueryDef();
                             }
                         }
                     }
-                    this.state = 259;
+                    this.state = 257;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 7, this._ctx);
                 }
-                this.state = 261;
+                this.state = 259;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 260;
+                        this.state = 258;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -510,11 +510,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 263;
+                this.state = 261;
                 this.queryName();
-                this.state = 264;
+                this.state = 262;
                 this.match(MalloyParser.IS);
-                this.state = 265;
+                this.state = 263;
                 this.query();
             }
         }
@@ -540,7 +540,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 267;
+                this.state = 265;
                 this.match(MalloyParser.PLUS);
             }
         }
@@ -565,7 +565,7 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 26, MalloyParser.RULE_query);
         let _la;
         try {
-            this.state = 287;
+            this.state = 285;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.FROM:
@@ -576,11 +576,11 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExploreArrowQueryContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 269;
+                        this.state = 267;
                         this.explore();
-                        this.state = 270;
+                        this.state = 268;
                         this.match(MalloyParser.ARROW);
-                        this.state = 271;
+                        this.state = 269;
                         this.pipelineFromName();
                     }
                     break;
@@ -588,39 +588,39 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ArrowQueryContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 273;
+                        this.state = 271;
                         this.match(MalloyParser.ARROW);
-                        this.state = 274;
+                        this.state = 272;
                         this.queryName();
-                        this.state = 279;
+                        this.state = 277;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.OCURLY || _la === MalloyParser.PLUS) {
                             {
-                                this.state = 276;
+                                this.state = 274;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.PLUS) {
                                     {
-                                        this.state = 275;
+                                        this.state = 273;
                                         this.refineOperator();
                                     }
                                 }
-                                this.state = 278;
+                                this.state = 276;
                                 this.queryProperties();
                             }
                         }
-                        this.state = 284;
+                        this.state = 282;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         while (_la === MalloyParser.ARROW) {
                             {
                                 {
-                                    this.state = 281;
+                                    this.state = 279;
                                     this.pipeElement();
                                 }
                             }
-                            this.state = 286;
+                            this.state = 284;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                         }
@@ -653,19 +653,19 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 289;
+                this.state = 287;
                 this.firstSegment();
-                this.state = 293;
+                this.state = 291;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 while (_la === MalloyParser.ARROW) {
                     {
                         {
-                            this.state = 290;
+                            this.state = 288;
                             this.pipeElement();
                         }
                     }
-                    this.state = 295;
+                    this.state = 293;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
@@ -692,13 +692,13 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 30, MalloyParser.RULE_firstSegment);
         let _la;
         try {
-            this.state = 304;
+            this.state = 302;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.OCURLY:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 296;
+                        this.state = 294;
                         this.queryProperties();
                     }
                     break;
@@ -706,23 +706,23 @@ class MalloyParser extends Parser_1.Parser {
                 case MalloyParser.OBJECT_NAME_LITERAL:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 297;
+                        this.state = 295;
                         this.exploreQueryName();
-                        this.state = 302;
+                        this.state = 300;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.OCURLY || _la === MalloyParser.PLUS) {
                             {
-                                this.state = 299;
+                                this.state = 297;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.PLUS) {
                                     {
-                                        this.state = 298;
+                                        this.state = 296;
                                         this.refineOperator();
                                     }
                                 }
-                                this.state = 301;
+                                this.state = 299;
                                 this.queryProperties();
                             }
                         }
@@ -754,9 +754,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 306;
+                this.state = 304;
                 this.match(MalloyParser.ARROW);
-                this.state = 307;
+                this.state = 305;
                 this.queryProperties();
             }
         }
@@ -782,13 +782,13 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 309;
+                this.state = 307;
                 this.match(MalloyParser.TABLE);
-                this.state = 310;
+                this.state = 308;
                 this.match(MalloyParser.OPAREN);
-                this.state = 311;
+                this.state = 309;
                 this.tableName();
-                this.state = 312;
+                this.state = 310;
                 this.match(MalloyParser.CPAREN);
             }
         }
@@ -813,27 +813,27 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 36, MalloyParser.RULE_queryProperties);
         let _la;
         try {
-            this.state = 324;
+            this.state = 322;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 19, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 314;
+                        this.state = 312;
                         this.filterShortcut();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 315;
+                        this.state = 313;
                         this.match(MalloyParser.OCURLY);
-                        this.state = 320;
+                        this.state = 318;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.DECLARE) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.HAVING) | (1 << MalloyParser.INDEX) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.LIMIT) | (1 << MalloyParser.NEST) | (1 << MalloyParser.ORDER_BY) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.SAMPLE) | (1 << MalloyParser.TOP) | (1 << MalloyParser.WHERE))) !== 0) || _la === MalloyParser.SEMI) {
                             {
-                                this.state = 318;
+                                this.state = 316;
                                 this._errHandler.sync(this);
                                 switch (this._input.LA(1)) {
                                     case MalloyParser.AGGREGATE:
@@ -852,13 +852,13 @@ class MalloyParser extends Parser_1.Parser {
                                     case MalloyParser.TOP:
                                     case MalloyParser.WHERE:
                                         {
-                                            this.state = 316;
+                                            this.state = 314;
                                             this.queryStatement();
                                         }
                                         break;
                                     case MalloyParser.SEMI:
                                         {
-                                            this.state = 317;
+                                            this.state = 315;
                                             this.match(MalloyParser.SEMI);
                                         }
                                         break;
@@ -866,11 +866,11 @@ class MalloyParser extends Parser_1.Parser {
                                         throw new NoViableAltException_1.NoViableAltException(this);
                                 }
                             }
-                            this.state = 322;
+                            this.state = 320;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                         }
-                        this.state = 323;
+                        this.state = 321;
                         this.match(MalloyParser.CCURLY);
                     }
                     break;
@@ -898,13 +898,13 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 326;
+                this.state = 324;
                 this.match(MalloyParser.OCURLY);
-                this.state = 327;
+                this.state = 325;
                 this.match(MalloyParser.QMARK);
-                this.state = 328;
+                this.state = 326;
                 this.fieldExpr(0);
-                this.state = 329;
+                this.state = 327;
                 this.match(MalloyParser.CCURLY);
             }
         }
@@ -930,7 +930,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 331;
+                this.state = 329;
                 this.id();
             }
         }
@@ -956,7 +956,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 333;
+                this.state = 331;
                 this.id();
             }
         }
@@ -984,39 +984,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 335;
+                this.state = 333;
                 this.exploreDefinition();
-                this.state = 342;
+                this.state = 340;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 337;
+                                this.state = 335;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 336;
+                                        this.state = 334;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 339;
+                                this.state = 337;
                                 this.exploreDefinition();
                             }
                         }
                     }
-                    this.state = 344;
+                    this.state = 342;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
                 }
-                this.state = 346;
+                this.state = 344;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 345;
+                        this.state = 343;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -1044,11 +1044,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 348;
+                this.state = 346;
                 this.exploreNameDef();
-                this.state = 349;
+                this.state = 347;
                 this.match(MalloyParser.IS);
-                this.state = 350;
+                this.state = 348;
                 this.explore();
             }
         }
@@ -1075,23 +1075,23 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 352;
+                this.state = 350;
                 this.exploreSource();
-                this.state = 357;
+                this.state = 355;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.OCURLY || _la === MalloyParser.PLUS) {
                     {
-                        this.state = 354;
+                        this.state = 352;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.PLUS) {
                             {
-                                this.state = 353;
+                                this.state = 351;
                                 this.refineOperator();
                             }
                         }
-                        this.state = 356;
+                        this.state = 354;
                         this.exploreProperties();
                     }
                 }
@@ -1117,7 +1117,7 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new ExploreSourceContext(this._ctx, this.state);
         this.enterRule(_localctx, 50, MalloyParser.RULE_exploreSource);
         try {
-            this.state = 371;
+            this.state = 369;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.IDENTIFIER:
@@ -1125,7 +1125,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new NamedSourceContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 359;
+                        this.state = 357;
                         this.exploreName();
                     }
                     break;
@@ -1133,7 +1133,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new TableSourceContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 360;
+                        this.state = 358;
                         this.exploreTable();
                     }
                     break;
@@ -1141,13 +1141,13 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new QuerySourceContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 361;
+                        this.state = 359;
                         this.match(MalloyParser.FROM);
-                        this.state = 362;
+                        this.state = 360;
                         this.match(MalloyParser.OPAREN);
-                        this.state = 363;
+                        this.state = 361;
                         this.query();
-                        this.state = 364;
+                        this.state = 362;
                         this.match(MalloyParser.CPAREN);
                     }
                     break;
@@ -1155,13 +1155,13 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new SQLSourceContext(_localctx);
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 366;
+                        this.state = 364;
                         this.match(MalloyParser.FROM_SQL);
-                        this.state = 367;
+                        this.state = 365;
                         this.match(MalloyParser.OPAREN);
-                        this.state = 368;
+                        this.state = 366;
                         this.sqlExploreNameRef();
-                        this.state = 369;
+                        this.state = 367;
                         this.match(MalloyParser.CPAREN);
                     }
                     break;
@@ -1191,7 +1191,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 373;
+                this.state = 371;
                 this.id();
             }
         }
@@ -1217,7 +1217,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 375;
+                this.state = 373;
                 this.id();
             }
         }
@@ -1242,20 +1242,20 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 56, MalloyParser.RULE_exploreProperties);
         let _la;
         try {
-            this.state = 387;
+            this.state = 385;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 28, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 377;
+                        this.state = 375;
                         this.match(MalloyParser.OCURLY);
-                        this.state = 382;
+                        this.state = 380;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.ACCEPT) | (1 << MalloyParser.DECLARE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.EXCEPT) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.PRIMARY_KEY) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RENAME) | (1 << MalloyParser.WHERE))) !== 0) || _la === MalloyParser.SEMI) {
                             {
-                                this.state = 380;
+                                this.state = 378;
                                 this._errHandler.sync(this);
                                 switch (this._input.LA(1)) {
                                     case MalloyParser.ACCEPT:
@@ -1271,13 +1271,13 @@ class MalloyParser extends Parser_1.Parser {
                                     case MalloyParser.RENAME:
                                     case MalloyParser.WHERE:
                                         {
-                                            this.state = 378;
+                                            this.state = 376;
                                             this.exploreStatement();
                                         }
                                         break;
                                     case MalloyParser.SEMI:
                                         {
-                                            this.state = 379;
+                                            this.state = 377;
                                             this.match(MalloyParser.SEMI);
                                         }
                                         break;
@@ -1285,18 +1285,18 @@ class MalloyParser extends Parser_1.Parser {
                                         throw new NoViableAltException_1.NoViableAltException(this);
                                 }
                             }
-                            this.state = 384;
+                            this.state = 382;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                         }
-                        this.state = 385;
+                        this.state = 383;
                         this.match(MalloyParser.CCURLY);
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 386;
+                        this.state = 384;
                         this.filterShortcut();
                     }
                     break;
@@ -1323,16 +1323,16 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 58, MalloyParser.RULE_exploreStatement);
         let _la;
         try {
-            this.state = 404;
+            this.state = 402;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.DIMENSION:
                     _localctx = new DefExploreDimensionContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 389;
+                        this.state = 387;
                         this.match(MalloyParser.DIMENSION);
-                        this.state = 390;
+                        this.state = 388;
                         this.dimensionDefList();
                     }
                     break;
@@ -1340,9 +1340,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefExploreMeasureContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 391;
+                        this.state = 389;
                         this.match(MalloyParser.MEASURE);
-                        this.state = 392;
+                        this.state = 390;
                         this.measureDefList();
                     }
                     break;
@@ -1350,7 +1350,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefDeclare_stubContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 393;
+                        this.state = 391;
                         this.declareStatement();
                     }
                     break;
@@ -1360,7 +1360,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefJoin_stubContext(_localctx);
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 394;
+                        this.state = 392;
                         this.joinStatement();
                     }
                     break;
@@ -1368,7 +1368,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefExploreWhereContext(_localctx);
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 395;
+                        this.state = 393;
                         this.whereStatement();
                     }
                     break;
@@ -1376,9 +1376,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefExplorePrimaryKeyContext(_localctx);
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 396;
+                        this.state = 394;
                         this.match(MalloyParser.PRIMARY_KEY);
-                        this.state = 397;
+                        this.state = 395;
                         this.fieldName();
                     }
                     break;
@@ -1386,9 +1386,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefExploreRenameContext(_localctx);
                     this.enterOuterAlt(_localctx, 7);
                     {
-                        this.state = 398;
+                        this.state = 396;
                         this.match(MalloyParser.RENAME);
-                        this.state = 399;
+                        this.state = 397;
                         this.renameList();
                     }
                     break;
@@ -1397,7 +1397,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefExploreEditFieldContext(_localctx);
                     this.enterOuterAlt(_localctx, 8);
                     {
-                        this.state = 400;
+                        this.state = 398;
                         _la = this._input.LA(1);
                         if (!(_la === MalloyParser.ACCEPT || _la === MalloyParser.EXCEPT)) {
                             this._errHandler.recoverInline(this);
@@ -1409,7 +1409,7 @@ class MalloyParser extends Parser_1.Parser {
                             this._errHandler.reportMatch(this);
                             this.consume();
                         }
-                        this.state = 401;
+                        this.state = 399;
                         this.fieldNameList();
                     }
                     break;
@@ -1417,9 +1417,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefExploreQueryContext(_localctx);
                     this.enterOuterAlt(_localctx, 9);
                     {
-                        this.state = 402;
+                        this.state = 400;
                         this.match(MalloyParser.QUERY);
-                        this.state = 403;
+                        this.state = 401;
                         this.subQueryDefList();
                     }
                     break;
@@ -1451,39 +1451,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 406;
+                this.state = 404;
                 this.exploreRenameDef();
-                this.state = 413;
+                this.state = 411;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 31, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 408;
+                                this.state = 406;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 407;
+                                        this.state = 405;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 410;
+                                this.state = 408;
                                 this.exploreRenameDef();
                             }
                         }
                     }
-                    this.state = 415;
+                    this.state = 413;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 31, this._ctx);
                 }
-                this.state = 417;
+                this.state = 415;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 416;
+                        this.state = 414;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -1511,11 +1511,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 419;
+                this.state = 417;
                 this.fieldName();
-                this.state = 420;
+                this.state = 418;
                 this.match(MalloyParser.IS);
-                this.state = 421;
+                this.state = 419;
                 this.fieldName();
             }
         }
@@ -1543,39 +1543,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 423;
+                this.state = 421;
                 this.dimensionDef();
-                this.state = 430;
+                this.state = 428;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 34, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 425;
+                                this.state = 423;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 424;
+                                        this.state = 422;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 427;
+                                this.state = 425;
                                 this.dimensionDef();
                             }
                         }
                     }
-                    this.state = 432;
+                    this.state = 430;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 34, this._ctx);
                 }
-                this.state = 434;
+                this.state = 432;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 433;
+                        this.state = 431;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -1605,39 +1605,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 436;
+                this.state = 434;
                 this.measureDef();
-                this.state = 443;
+                this.state = 441;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 37, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 438;
+                                this.state = 436;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 437;
+                                        this.state = 435;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 440;
+                                this.state = 438;
                                 this.measureDef();
                             }
                         }
                     }
-                    this.state = 445;
+                    this.state = 443;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 37, this._ctx);
                 }
-                this.state = 447;
+                this.state = 445;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 446;
+                        this.state = 444;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -1665,11 +1665,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 449;
+                this.state = 447;
                 this.fieldNameDef();
-                this.state = 450;
+                this.state = 448;
                 this.match(MalloyParser.IS);
-                this.state = 451;
+                this.state = 449;
                 this.fieldExpr(0);
             }
         }
@@ -1695,7 +1695,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 453;
+                this.state = 451;
                 this.id();
             }
         }
@@ -1721,7 +1721,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 455;
+                this.state = 453;
                 this.id();
             }
         }
@@ -1747,7 +1747,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 457;
+                this.state = 455;
                 this.fieldDef();
             }
         }
@@ -1775,41 +1775,41 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 459;
+                this.state = 457;
                 this.match(MalloyParser.DECLARE);
-                this.state = 460;
+                this.state = 458;
                 this.fieldDef();
-                this.state = 467;
+                this.state = 465;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 40, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 462;
+                                this.state = 460;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 461;
+                                        this.state = 459;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 464;
+                                this.state = 462;
                                 this.fieldDef();
                             }
                         }
                     }
-                    this.state = 469;
+                    this.state = 467;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 40, this._ctx);
                 }
-                this.state = 471;
+                this.state = 469;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 470;
+                        this.state = 468;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -1835,16 +1835,16 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new JoinStatementContext(this._ctx, this.state);
         this.enterRule(_localctx, 78, MalloyParser.RULE_joinStatement);
         try {
-            this.state = 479;
+            this.state = 477;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.JOIN_ONE:
                     _localctx = new DefJoinOneContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 473;
+                        this.state = 471;
                         this.match(MalloyParser.JOIN_ONE);
-                        this.state = 474;
+                        this.state = 472;
                         this.joinList();
                     }
                     break;
@@ -1852,9 +1852,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefJoinManyContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 475;
+                        this.state = 473;
                         this.match(MalloyParser.JOIN_MANY);
-                        this.state = 476;
+                        this.state = 474;
                         this.joinList();
                     }
                     break;
@@ -1862,9 +1862,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new DefJoinCrossContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 477;
+                        this.state = 475;
                         this.match(MalloyParser.JOIN_CROSS);
-                        this.state = 478;
+                        this.state = 476;
                         this.joinList();
                     }
                     break;
@@ -1896,39 +1896,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 481;
+                this.state = 479;
                 this.joinDef();
-                this.state = 488;
+                this.state = 486;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 44, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 483;
+                                this.state = 481;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 482;
+                                        this.state = 480;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 485;
+                                this.state = 483;
                                 this.joinDef();
                             }
                         }
                     }
-                    this.state = 490;
+                    this.state = 488;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 44, this._ctx);
                 }
-                this.state = 492;
+                this.state = 490;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 491;
+                        this.state = 489;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -1955,29 +1955,29 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 82, MalloyParser.RULE_joinDef);
         let _la;
         try {
-            this.state = 511;
+            this.state = 509;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 49, this._ctx)) {
                 case 1:
                     _localctx = new JoinWithContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 494;
+                        this.state = 492;
                         this.joinNameDef();
-                        this.state = 497;
+                        this.state = 495;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.IS) {
                             {
-                                this.state = 495;
+                                this.state = 493;
                                 this.match(MalloyParser.IS);
-                                this.state = 496;
+                                this.state = 494;
                                 this.explore();
                             }
                         }
-                        this.state = 499;
+                        this.state = 497;
                         this.match(MalloyParser.WITH);
-                        this.state = 500;
+                        this.state = 498;
                         this.fieldExpr(0);
                     }
                     break;
@@ -1985,27 +1985,27 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new JoinOnContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 502;
+                        this.state = 500;
                         this.joinNameDef();
-                        this.state = 505;
+                        this.state = 503;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.IS) {
                             {
-                                this.state = 503;
+                                this.state = 501;
                                 this.match(MalloyParser.IS);
-                                this.state = 504;
+                                this.state = 502;
                                 this.explore();
                             }
                         }
-                        this.state = 509;
+                        this.state = 507;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.ON) {
                             {
-                                this.state = 507;
+                                this.state = 505;
                                 this.match(MalloyParser.ON);
-                                this.state = 508;
+                                this.state = 506;
                                 this.joinExpression();
                             }
                         }
@@ -2035,7 +2035,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 513;
+                this.state = 511;
                 this.fieldExpr(0);
             }
         }
@@ -2059,20 +2059,20 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new FilterStatementContext(this._ctx, this.state);
         this.enterRule(_localctx, 86, MalloyParser.RULE_filterStatement);
         try {
-            this.state = 517;
+            this.state = 515;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.WHERE:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 515;
+                        this.state = 513;
                         this.whereStatement();
                     }
                     break;
                 case MalloyParser.HAVING:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 516;
+                        this.state = 514;
                         this.havingStatement();
                     }
                     break;
@@ -2100,16 +2100,16 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new FilteredByContext(this._ctx, this.state);
         this.enterRule(_localctx, 88, MalloyParser.RULE_filteredBy);
         try {
-            this.state = 522;
+            this.state = 520;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.QMARK:
                     _localctx = new FilterByShortcutContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 519;
+                        this.state = 517;
                         this.match(MalloyParser.QMARK);
-                        this.state = 520;
+                        this.state = 518;
                         this.fieldExpr(0);
                     }
                     break;
@@ -2117,7 +2117,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new FilterByWhereContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 521;
+                        this.state = 519;
                         this.whereStatement();
                     }
                     break;
@@ -2149,32 +2149,32 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 524;
+                this.state = 522;
                 this.fieldExpr(0);
-                this.state = 529;
+                this.state = 527;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 52, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 525;
+                                this.state = 523;
                                 this.match(MalloyParser.COMMA);
-                                this.state = 526;
+                                this.state = 524;
                                 this.fieldExpr(0);
                             }
                         }
                     }
-                    this.state = 531;
+                    this.state = 529;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 52, this._ctx);
                 }
-                this.state = 533;
+                this.state = 531;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 532;
+                        this.state = 530;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -2202,9 +2202,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 535;
+                this.state = 533;
                 this.match(MalloyParser.WHERE);
-                this.state = 536;
+                this.state = 534;
                 this.filterClauseList();
             }
         }
@@ -2230,9 +2230,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 538;
+                this.state = 536;
                 this.match(MalloyParser.HAVING);
-                this.state = 539;
+                this.state = 537;
                 this.filterClauseList();
             }
         }
@@ -2260,39 +2260,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 541;
+                this.state = 539;
                 this.exploreQueryDef();
-                this.state = 548;
+                this.state = 546;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 55, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 543;
+                                this.state = 541;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 542;
+                                        this.state = 540;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 545;
+                                this.state = 543;
                                 this.exploreQueryDef();
                             }
                         }
                     }
-                    this.state = 550;
+                    this.state = 548;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 55, this._ctx);
                 }
-                this.state = 552;
+                this.state = 550;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 551;
+                        this.state = 549;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -2320,7 +2320,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 554;
+                this.state = 552;
                 this.id();
             }
         }
@@ -2346,11 +2346,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 556;
+                this.state = 554;
                 this.exploreQueryNameDef();
-                this.state = 557;
+                this.state = 555;
                 this.match(MalloyParser.IS);
-                this.state = 558;
+                this.state = 556;
                 this.pipelineFromName();
             }
         }
@@ -2374,20 +2374,20 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new QueryStatementContext(this._ctx, this.state);
         this.enterRule(_localctx, 102, MalloyParser.RULE_queryStatement);
         try {
-            this.state = 573;
+            this.state = 571;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.GROUP_BY:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 560;
+                        this.state = 558;
                         this.groupByStatement();
                     }
                     break;
                 case MalloyParser.DECLARE:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 561;
+                        this.state = 559;
                         this.declareStatement();
                     }
                     break;
@@ -2396,77 +2396,77 @@ class MalloyParser extends Parser_1.Parser {
                 case MalloyParser.JOIN_MANY:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 562;
+                        this.state = 560;
                         this.joinStatement();
                     }
                     break;
                 case MalloyParser.PROJECT:
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 563;
+                        this.state = 561;
                         this.projectStatement();
                     }
                     break;
                 case MalloyParser.INDEX:
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 564;
+                        this.state = 562;
                         this.indexStatement();
                     }
                     break;
                 case MalloyParser.AGGREGATE:
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 565;
+                        this.state = 563;
                         this.aggregateStatement();
                     }
                     break;
                 case MalloyParser.TOP:
                     this.enterOuterAlt(_localctx, 7);
                     {
-                        this.state = 566;
+                        this.state = 564;
                         this.topStatement();
                     }
                     break;
                 case MalloyParser.LIMIT:
                     this.enterOuterAlt(_localctx, 8);
                     {
-                        this.state = 567;
+                        this.state = 565;
                         this.limitStatement();
                     }
                     break;
                 case MalloyParser.ORDER_BY:
                     this.enterOuterAlt(_localctx, 9);
                     {
-                        this.state = 568;
+                        this.state = 566;
                         this.orderByStatement();
                     }
                     break;
                 case MalloyParser.WHERE:
                     this.enterOuterAlt(_localctx, 10);
                     {
-                        this.state = 569;
+                        this.state = 567;
                         this.whereStatement();
                     }
                     break;
                 case MalloyParser.HAVING:
                     this.enterOuterAlt(_localctx, 11);
                     {
-                        this.state = 570;
+                        this.state = 568;
                         this.havingStatement();
                     }
                     break;
                 case MalloyParser.NEST:
                     this.enterOuterAlt(_localctx, 12);
                     {
-                        this.state = 571;
+                        this.state = 569;
                         this.nestStatement();
                     }
                     break;
                 case MalloyParser.SAMPLE:
                     this.enterOuterAlt(_localctx, 13);
                     {
-                        this.state = 572;
+                        this.state = 570;
                         this.sampleStatement();
                     }
                     break;
@@ -2496,9 +2496,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 575;
+                this.state = 573;
                 this.match(MalloyParser.GROUP_BY);
-                this.state = 576;
+                this.state = 574;
                 this.queryFieldList();
             }
         }
@@ -2526,39 +2526,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 578;
+                this.state = 576;
                 this.queryFieldEntry();
-                this.state = 585;
+                this.state = 583;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 59, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 580;
+                                this.state = 578;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 579;
+                                        this.state = 577;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 582;
+                                this.state = 580;
                                 this.queryFieldEntry();
                             }
                         }
                     }
-                    this.state = 587;
+                    this.state = 585;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 59, this._ctx);
                 }
-                this.state = 589;
+                this.state = 587;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 588;
+                        this.state = 586;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -2586,7 +2586,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 591;
+                this.state = 589;
                 this.fieldDef();
             }
         }
@@ -2610,14 +2610,14 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new QueryFieldEntryContext(this._ctx, this.state);
         this.enterRule(_localctx, 110, MalloyParser.RULE_queryFieldEntry);
         try {
-            this.state = 595;
+            this.state = 593;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 61, this._ctx)) {
                 case 1:
                     _localctx = new QueryFieldRefContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 593;
+                        this.state = 591;
                         this.fieldPath();
                     }
                     break;
@@ -2625,7 +2625,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new QueryFieldDefContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 594;
+                        this.state = 592;
                         this.dimensionDef();
                     }
                     break;
@@ -2653,9 +2653,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 597;
+                this.state = 595;
                 this.match(MalloyParser.NEST);
-                this.state = 598;
+                this.state = 596;
                 this.nestedQueryList();
             }
         }
@@ -2683,39 +2683,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 600;
+                this.state = 598;
                 this.nestEntry();
-                this.state = 607;
+                this.state = 605;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 63, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 602;
+                                this.state = 600;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 601;
+                                        this.state = 599;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 604;
+                                this.state = 602;
                                 this.nestEntry();
                             }
                         }
                     }
-                    this.state = 609;
+                    this.state = 607;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 63, this._ctx);
                 }
-                this.state = 611;
+                this.state = 609;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 610;
+                        this.state = 608;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -2742,30 +2742,30 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 116, MalloyParser.RULE_nestEntry);
         let _la;
         try {
-            this.state = 624;
+            this.state = 622;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 67, this._ctx)) {
                 case 1:
                     _localctx = new NestExistingContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 613;
+                        this.state = 611;
                         this.queryName();
-                        this.state = 618;
+                        this.state = 616;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.OCURLY || _la === MalloyParser.PLUS) {
                             {
-                                this.state = 615;
+                                this.state = 613;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.PLUS) {
                                     {
-                                        this.state = 614;
+                                        this.state = 612;
                                         this.refineOperator();
                                     }
                                 }
-                                this.state = 617;
+                                this.state = 615;
                                 this.queryProperties();
                             }
                         }
@@ -2775,11 +2775,11 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new NestDefContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 620;
+                        this.state = 618;
                         this.queryName();
-                        this.state = 621;
+                        this.state = 619;
                         this.match(MalloyParser.IS);
-                        this.state = 622;
+                        this.state = 620;
                         this.pipelineFromName();
                     }
                     break;
@@ -2807,9 +2807,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 626;
+                this.state = 624;
                 this.match(MalloyParser.AGGREGATE);
-                this.state = 627;
+                this.state = 625;
                 this.queryFieldList();
             }
         }
@@ -2835,9 +2835,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 629;
+                this.state = 627;
                 this.match(MalloyParser.PROJECT);
-                this.state = 630;
+                this.state = 628;
                 this.fieldCollection();
             }
         }
@@ -2863,9 +2863,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 632;
+                this.state = 630;
                 this.match(MalloyParser.ORDER_BY);
-                this.state = 633;
+                this.state = 631;
                 this.ordering();
             }
         }
@@ -2893,39 +2893,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 635;
+                this.state = 633;
                 this.orderBySpec();
-                this.state = 642;
+                this.state = 640;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 69, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 637;
+                                this.state = 635;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 636;
+                                        this.state = 634;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 639;
+                                this.state = 637;
                                 this.orderBySpec();
                             }
                         }
                     }
-                    this.state = 644;
+                    this.state = 642;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 69, this._ctx);
                 }
-                this.state = 646;
+                this.state = 644;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 645;
+                        this.state = 643;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -2954,31 +2954,31 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 650;
+                this.state = 648;
                 this._errHandler.sync(this);
                 switch (this._input.LA(1)) {
                     case MalloyParser.INTEGER_LITERAL:
                         {
-                            this.state = 648;
+                            this.state = 646;
                             this.match(MalloyParser.INTEGER_LITERAL);
                         }
                         break;
                     case MalloyParser.IDENTIFIER:
                     case MalloyParser.OBJECT_NAME_LITERAL:
                         {
-                            this.state = 649;
+                            this.state = 647;
                             this.fieldName();
                         }
                         break;
                     default:
                         throw new NoViableAltException_1.NoViableAltException(this);
                 }
-                this.state = 653;
+                this.state = 651;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.ASC || _la === MalloyParser.DESC) {
                     {
-                        this.state = 652;
+                        this.state = 650;
                         _la = this._input.LA(1);
                         if (!(_la === MalloyParser.ASC || _la === MalloyParser.DESC)) {
                             this._errHandler.recoverInline(this);
@@ -3016,9 +3016,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 655;
+                this.state = 653;
                 this.match(MalloyParser.LIMIT);
-                this.state = 656;
+                this.state = 654;
                 this.match(MalloyParser.INTEGER_LITERAL);
             }
         }
@@ -3042,24 +3042,24 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new BySpecContext(this._ctx, this.state);
         this.enterRule(_localctx, 130, MalloyParser.RULE_bySpec);
         try {
-            this.state = 662;
+            this.state = 660;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 73, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 658;
+                        this.state = 656;
                         this.match(MalloyParser.BY);
-                        this.state = 659;
+                        this.state = 657;
                         this.fieldName();
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 660;
+                        this.state = 658;
                         this.match(MalloyParser.BY);
-                        this.state = 661;
+                        this.state = 659;
                         this.fieldExpr(0);
                     }
                     break;
@@ -3088,16 +3088,16 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 664;
+                this.state = 662;
                 this.match(MalloyParser.TOP);
-                this.state = 665;
+                this.state = 663;
                 this.match(MalloyParser.INTEGER_LITERAL);
-                this.state = 667;
+                this.state = 665;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.BY) {
                     {
-                        this.state = 666;
+                        this.state = 664;
                         this.bySpec();
                     }
                 }
@@ -3124,23 +3124,23 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 134, MalloyParser.RULE_indexElement);
         let _la;
         try {
-            this.state = 675;
+            this.state = 673;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.IDENTIFIER:
                 case MalloyParser.OBJECT_NAME_LITERAL:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 669;
+                        this.state = 667;
                         this.fieldPath();
-                        this.state = 672;
+                        this.state = 670;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.DOT) {
                             {
-                                this.state = 670;
+                                this.state = 668;
                                 this.match(MalloyParser.DOT);
-                                this.state = 671;
+                                this.state = 669;
                                 this.match(MalloyParser.STAR);
                             }
                         }
@@ -3149,7 +3149,7 @@ class MalloyParser extends Parser_1.Parser {
                 case MalloyParser.STAR:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 674;
+                        this.state = 672;
                         this.match(MalloyParser.STAR);
                     }
                     break;
@@ -3180,28 +3180,28 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 677;
+                this.state = 675;
                 this.indexElement();
-                this.state = 684;
+                this.state = 682;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while (((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (MalloyParser.COMMA - 97)) | (1 << (MalloyParser.STAR - 97)) | (1 << (MalloyParser.IDENTIFIER - 97)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 97)))) !== 0)) {
+                while (((((_la - 98)) & ~0x1F) === 0 && ((1 << (_la - 98)) & ((1 << (MalloyParser.COMMA - 98)) | (1 << (MalloyParser.STAR - 98)) | (1 << (MalloyParser.IDENTIFIER - 98)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 98)))) !== 0)) {
                     {
                         {
-                            this.state = 679;
+                            this.state = 677;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             if (_la === MalloyParser.COMMA) {
                                 {
-                                    this.state = 678;
+                                    this.state = 676;
                                     this.match(MalloyParser.COMMA);
                                 }
                             }
-                            this.state = 681;
+                            this.state = 679;
                             this.indexElement();
                         }
                     }
-                    this.state = 686;
+                    this.state = 684;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
@@ -3230,18 +3230,18 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 687;
+                this.state = 685;
                 this.match(MalloyParser.INDEX);
-                this.state = 688;
+                this.state = 686;
                 this.indexFields();
-                this.state = 691;
+                this.state = 689;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.BY) {
                     {
-                        this.state = 689;
+                        this.state = 687;
                         this.match(MalloyParser.BY);
-                        this.state = 690;
+                        this.state = 688;
                         this.fieldName();
                     }
                 }
@@ -3269,9 +3269,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 693;
+                this.state = 691;
                 this.match(MalloyParser.SAMPLE);
-                this.state = 694;
+                this.state = 692;
                 this.sampleSpec();
             }
         }
@@ -3298,7 +3298,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 696;
+                this.state = 694;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.FALSE || _la === MalloyParser.TRUE || _la === MalloyParser.PERCENT_LITERAL || _la === MalloyParser.INTEGER_LITERAL)) {
                     this._errHandler.recoverInline(this);
@@ -3335,9 +3335,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 698;
+                this.state = 696;
                 _la = this._input.LA(1);
-                if (!(((((_la - 31)) & ~0x1F) === 0 && ((1 << (_la - 31)) & ((1 << (MalloyParser.AVG - 31)) | (1 << (MalloyParser.COUNT - 31)) | (1 << (MalloyParser.MAX - 31)) | (1 << (MalloyParser.MIN - 31)))) !== 0) || _la === MalloyParser.SUM)) {
+                if (!(((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)))) !== 0) || _la === MalloyParser.SUM)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -3372,9 +3372,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 700;
+                this.state = 698;
                 _la = this._input.LA(1);
-                if (!(((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.BOOLEAN - 32)) | (1 << (MalloyParser.DATE - 32)) | (1 << (MalloyParser.NUMBER - 32)))) !== 0) || _la === MalloyParser.STRING || _la === MalloyParser.TIMESTAMP)) {
+                if (!(((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (MalloyParser.BOOLEAN - 33)) | (1 << (MalloyParser.DATE - 33)) | (1 << (MalloyParser.NUMBER - 33)))) !== 0) || _la === MalloyParser.STRING || _la === MalloyParser.TIMESTAMP)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -3409,9 +3409,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 702;
+                this.state = 700;
                 _la = this._input.LA(1);
-                if (!(((((_la - 99)) & ~0x1F) === 0 && ((1 << (_la - 99)) & ((1 << (MalloyParser.LT - 99)) | (1 << (MalloyParser.GT - 99)) | (1 << (MalloyParser.EQ - 99)) | (1 << (MalloyParser.NE - 99)) | (1 << (MalloyParser.LTE - 99)) | (1 << (MalloyParser.GTE - 99)) | (1 << (MalloyParser.NOT_MATCH - 99)) | (1 << (MalloyParser.MATCH - 99)))) !== 0))) {
+                if (!(((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.LT - 100)) | (1 << (MalloyParser.GT - 100)) | (1 << (MalloyParser.EQ - 100)) | (1 << (MalloyParser.NE - 100)) | (1 << (MalloyParser.LTE - 100)) | (1 << (MalloyParser.GTE - 100)) | (1 << (MalloyParser.NOT_MATCH - 100)) | (1 << (MalloyParser.MATCH - 100)))) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -3444,14 +3444,14 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 150, MalloyParser.RULE_literal);
         let _la;
         try {
-            this.state = 711;
+            this.state = 709;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.STRING_LITERAL:
                     _localctx = new ExprStringContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 704;
+                        this.state = 702;
                         this.match(MalloyParser.STRING_LITERAL);
                     }
                     break;
@@ -3460,7 +3460,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprNumberContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 705;
+                        this.state = 703;
                         _la = this._input.LA(1);
                         if (!(_la === MalloyParser.INTEGER_LITERAL || _la === MalloyParser.NUMERIC_LITERAL)) {
                             this._errHandler.recoverInline(this);
@@ -3483,7 +3483,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprTimeContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 706;
+                        this.state = 704;
                         this.dateLiteral();
                     }
                     break;
@@ -3491,7 +3491,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprNULLContext(_localctx);
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 707;
+                        this.state = 705;
                         this.match(MalloyParser.NULL);
                     }
                     break;
@@ -3500,7 +3500,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprBoolContext(_localctx);
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 708;
+                        this.state = 706;
                         _la = this._input.LA(1);
                         if (!(_la === MalloyParser.FALSE || _la === MalloyParser.TRUE)) {
                             this._errHandler.recoverInline(this);
@@ -3518,7 +3518,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprRegexContext(_localctx);
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 709;
+                        this.state = 707;
                         this.match(MalloyParser.HACKY_REGEX);
                     }
                     break;
@@ -3526,7 +3526,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprNowContext(_localctx);
                     this.enterOuterAlt(_localctx, 7);
                     {
-                        this.state = 710;
+                        this.state = 708;
                         this.match(MalloyParser.NOW);
                     }
                     break;
@@ -3554,14 +3554,14 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new DateLiteralContext(this._ctx, this.state);
         this.enterRule(_localctx, 152, MalloyParser.RULE_dateLiteral);
         try {
-            this.state = 719;
+            this.state = 717;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.LITERAL_TIMESTAMP:
                     _localctx = new LiteralTimestampContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 713;
+                        this.state = 711;
                         this.match(MalloyParser.LITERAL_TIMESTAMP);
                     }
                     break;
@@ -3569,7 +3569,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralDayContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 714;
+                        this.state = 712;
                         this.match(MalloyParser.LITERAL_DAY);
                     }
                     break;
@@ -3577,7 +3577,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralWeekContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 715;
+                        this.state = 713;
                         this.match(MalloyParser.LITERAL_WEEK);
                     }
                     break;
@@ -3585,7 +3585,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralMonthContext(_localctx);
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 716;
+                        this.state = 714;
                         this.match(MalloyParser.LITERAL_MONTH);
                     }
                     break;
@@ -3593,7 +3593,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralQuarterContext(_localctx);
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 717;
+                        this.state = 715;
                         this.match(MalloyParser.LITERAL_QUARTER);
                     }
                     break;
@@ -3601,7 +3601,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new LiteralYearContext(_localctx);
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 718;
+                        this.state = 716;
                         this.match(MalloyParser.LITERAL_YEAR);
                     }
                     break;
@@ -3631,7 +3631,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 721;
+                this.state = 719;
                 this.match(MalloyParser.STRING_LITERAL);
             }
         }
@@ -3658,7 +3658,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 723;
+                this.state = 721;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.IDENTIFIER || _la === MalloyParser.OBJECT_NAME_LITERAL)) {
                     this._errHandler.recoverInline(this);
@@ -3695,9 +3695,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 725;
+                this.state = 723;
                 _la = this._input.LA(1);
-                if (!(((((_la - 39)) & ~0x1F) === 0 && ((1 << (_la - 39)) & ((1 << (MalloyParser.DAY - 39)) | (1 << (MalloyParser.HOUR - 39)) | (1 << (MalloyParser.MINUTE - 39)) | (1 << (MalloyParser.MONTH - 39)) | (1 << (MalloyParser.QUARTER - 39)) | (1 << (MalloyParser.SECOND - 39)))) !== 0) || _la === MalloyParser.WEEK || _la === MalloyParser.YEAR)) {
+                if (!(((((_la - 40)) & ~0x1F) === 0 && ((1 << (_la - 40)) & ((1 << (MalloyParser.DAY - 40)) | (1 << (MalloyParser.HOUR - 40)) | (1 << (MalloyParser.MINUTE - 40)) | (1 << (MalloyParser.MONTH - 40)) | (1 << (MalloyParser.QUARTER - 40)) | (1 << (MalloyParser.SECOND - 40)))) !== 0) || _la === MalloyParser.WEEK || _la === MalloyParser.YEAR)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -3732,7 +3732,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 727;
+                this.state = 725;
                 _la = this._input.LA(1);
                 if (!(_la === MalloyParser.ALL || _la === MalloyParser.EXCLUDE)) {
                     this._errHandler.recoverInline(this);
@@ -3777,7 +3777,7 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 789;
+                this.state = 787;
                 this._errHandler.sync(this);
                 switch (this.interpreter.adaptivePredict(this._input, 87, this._ctx)) {
                     case 1:
@@ -3785,7 +3785,7 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprFieldPathContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 730;
+                            this.state = 728;
                             this.fieldPath();
                         }
                         break;
@@ -3794,7 +3794,7 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprLiteralContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 731;
+                            this.state = 729;
                             this.literal();
                         }
                         break;
@@ -3803,9 +3803,9 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprMinusContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 732;
+                            this.state = 730;
                             this.match(MalloyParser.MINUS);
-                            this.state = 733;
+                            this.state = 731;
                             this.fieldExpr(20);
                         }
                         break;
@@ -3814,9 +3814,9 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprNotContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 734;
+                            this.state = 732;
                             this.match(MalloyParser.NOT);
-                            this.state = 735;
+                            this.state = 733;
                             this.fieldExpr(9);
                         }
                         break;
@@ -3825,17 +3825,17 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprCastContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 736;
+                            this.state = 734;
                             this.match(MalloyParser.CAST);
-                            this.state = 737;
+                            this.state = 735;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 738;
+                            this.state = 736;
                             this.fieldExpr(0);
-                            this.state = 739;
+                            this.state = 737;
                             this.match(MalloyParser.AS);
-                            this.state = 740;
+                            this.state = 738;
                             this.malloyType();
-                            this.state = 741;
+                            this.state = 739;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -3844,15 +3844,15 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprCountDisinctContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 743;
+                            this.state = 741;
                             this.match(MalloyParser.COUNT);
-                            this.state = 744;
+                            this.state = 742;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 745;
+                            this.state = 743;
                             this.match(MalloyParser.DISTINCT);
-                            this.state = 746;
+                            this.state = 744;
                             this.fieldExpr(0);
-                            this.state = 747;
+                            this.state = 745;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -3861,22 +3861,22 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprAggregateContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 752;
+                            this.state = 750;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             if (_la === MalloyParser.IDENTIFIER || _la === MalloyParser.OBJECT_NAME_LITERAL) {
                                 {
-                                    this.state = 749;
+                                    this.state = 747;
                                     this.fieldPath();
-                                    this.state = 750;
+                                    this.state = 748;
                                     this.match(MalloyParser.DOT);
                                 }
                             }
-                            this.state = 754;
+                            this.state = 752;
                             this.aggregate();
-                            this.state = 755;
+                            this.state = 753;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 758;
+                            this.state = 756;
                             this._errHandler.sync(this);
                             switch (this._input.LA(1)) {
                                 case MalloyParser.ALL:
@@ -3916,13 +3916,13 @@ class MalloyParser extends Parser_1.Parser {
                                 case MalloyParser.NUMERIC_LITERAL:
                                 case MalloyParser.OBJECT_NAME_LITERAL:
                                     {
-                                        this.state = 756;
+                                        this.state = 754;
                                         this.fieldExpr(0);
                                     }
                                     break;
                                 case MalloyParser.STAR:
                                     {
-                                        this.state = 757;
+                                        this.state = 755;
                                         this.match(MalloyParser.STAR);
                                     }
                                     break;
@@ -3931,7 +3931,7 @@ class MalloyParser extends Parser_1.Parser {
                                 default:
                                     break;
                             }
-                            this.state = 760;
+                            this.state = 758;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -3940,11 +3940,11 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprExprContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 762;
+                            this.state = 760;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 763;
+                            this.state = 761;
                             this.partialAllowedFieldExpr();
-                            this.state = 764;
+                            this.state = 762;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -3953,13 +3953,13 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprFuncContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 768;
+                            this.state = 766;
                             this._errHandler.sync(this);
                             switch (this._input.LA(1)) {
                                 case MalloyParser.IDENTIFIER:
                                 case MalloyParser.OBJECT_NAME_LITERAL:
                                     {
-                                        this.state = 766;
+                                        this.state = 764;
                                         this.id();
                                     }
                                     break;
@@ -3972,27 +3972,27 @@ class MalloyParser extends Parser_1.Parser {
                                 case MalloyParser.WEEK:
                                 case MalloyParser.YEAR:
                                     {
-                                        this.state = 767;
+                                        this.state = 765;
                                         this.timeframe();
                                     }
                                     break;
                                 default:
                                     throw new NoViableAltException_1.NoViableAltException(this);
                             }
-                            this.state = 770;
+                            this.state = 768;
                             this.match(MalloyParser.OPAREN);
                             {
-                                this.state = 772;
+                                this.state = 770;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                if (((((_la - 27)) & ~0x1F) === 0 && ((1 << (_la - 27)) & ((1 << (MalloyParser.ALL - 27)) | (1 << (MalloyParser.AVG - 27)) | (1 << (MalloyParser.CAST - 27)) | (1 << (MalloyParser.COUNT - 27)) | (1 << (MalloyParser.DAY - 27)) | (1 << (MalloyParser.EXCLUDE - 27)) | (1 << (MalloyParser.FALSE - 27)) | (1 << (MalloyParser.HOUR - 27)) | (1 << (MalloyParser.MAX - 27)) | (1 << (MalloyParser.MIN - 27)) | (1 << (MalloyParser.MINUTE - 27)) | (1 << (MalloyParser.MONTH - 27)))) !== 0) || ((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & ((1 << (MalloyParser.NOT - 59)) | (1 << (MalloyParser.NOW - 59)) | (1 << (MalloyParser.NULL - 59)) | (1 << (MalloyParser.PICK - 59)) | (1 << (MalloyParser.QUARTER - 59)) | (1 << (MalloyParser.SECOND - 59)) | (1 << (MalloyParser.SUM - 59)) | (1 << (MalloyParser.TRUE - 59)) | (1 << (MalloyParser.WEEK - 59)) | (1 << (MalloyParser.YEAR - 59)) | (1 << (MalloyParser.HACKY_REGEX - 59)) | (1 << (MalloyParser.STRING_LITERAL - 59)) | (1 << (MalloyParser.OPAREN - 59)))) !== 0) || ((((_la - 106)) & ~0x1F) === 0 && ((1 << (_la - 106)) & ((1 << (MalloyParser.MINUS - 106)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 106)) | (1 << (MalloyParser.LITERAL_DAY - 106)) | (1 << (MalloyParser.LITERAL_QUARTER - 106)) | (1 << (MalloyParser.LITERAL_MONTH - 106)) | (1 << (MalloyParser.LITERAL_WEEK - 106)) | (1 << (MalloyParser.LITERAL_YEAR - 106)) | (1 << (MalloyParser.IDENTIFIER - 106)) | (1 << (MalloyParser.INTEGER_LITERAL - 106)) | (1 << (MalloyParser.NUMERIC_LITERAL - 106)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 106)))) !== 0)) {
+                                if (((((_la - 28)) & ~0x1F) === 0 && ((1 << (_la - 28)) & ((1 << (MalloyParser.ALL - 28)) | (1 << (MalloyParser.AVG - 28)) | (1 << (MalloyParser.CAST - 28)) | (1 << (MalloyParser.COUNT - 28)) | (1 << (MalloyParser.DAY - 28)) | (1 << (MalloyParser.EXCLUDE - 28)) | (1 << (MalloyParser.FALSE - 28)) | (1 << (MalloyParser.HOUR - 28)) | (1 << (MalloyParser.MAX - 28)) | (1 << (MalloyParser.MIN - 28)) | (1 << (MalloyParser.MINUTE - 28)) | (1 << (MalloyParser.MONTH - 28)))) !== 0) || ((((_la - 60)) & ~0x1F) === 0 && ((1 << (_la - 60)) & ((1 << (MalloyParser.NOT - 60)) | (1 << (MalloyParser.NOW - 60)) | (1 << (MalloyParser.NULL - 60)) | (1 << (MalloyParser.PICK - 60)) | (1 << (MalloyParser.QUARTER - 60)) | (1 << (MalloyParser.SECOND - 60)) | (1 << (MalloyParser.SUM - 60)) | (1 << (MalloyParser.TRUE - 60)) | (1 << (MalloyParser.WEEK - 60)) | (1 << (MalloyParser.YEAR - 60)) | (1 << (MalloyParser.HACKY_REGEX - 60)) | (1 << (MalloyParser.STRING_LITERAL - 60)) | (1 << (MalloyParser.OPAREN - 60)))) !== 0) || ((((_la - 107)) & ~0x1F) === 0 && ((1 << (_la - 107)) & ((1 << (MalloyParser.MINUS - 107)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 107)) | (1 << (MalloyParser.LITERAL_DAY - 107)) | (1 << (MalloyParser.LITERAL_QUARTER - 107)) | (1 << (MalloyParser.LITERAL_MONTH - 107)) | (1 << (MalloyParser.LITERAL_WEEK - 107)) | (1 << (MalloyParser.LITERAL_YEAR - 107)) | (1 << (MalloyParser.IDENTIFIER - 107)) | (1 << (MalloyParser.INTEGER_LITERAL - 107)) | (1 << (MalloyParser.NUMERIC_LITERAL - 107)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 107)))) !== 0)) {
                                     {
-                                        this.state = 771;
+                                        this.state = 769;
                                         this.argumentList();
                                     }
                                 }
                             }
-                            this.state = 774;
+                            this.state = 772;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
@@ -4001,7 +4001,7 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprPickContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 776;
+                            this.state = 774;
                             this.pickStatement();
                         }
                         break;
@@ -4010,35 +4010,35 @@ class MalloyParser extends Parser_1.Parser {
                             _localctx = new ExprUngroupContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 777;
+                            this.state = 775;
                             this.ungroup();
-                            this.state = 778;
+                            this.state = 776;
                             this.match(MalloyParser.OPAREN);
-                            this.state = 779;
+                            this.state = 777;
                             this.fieldExpr(0);
-                            this.state = 784;
+                            this.state = 782;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             while (_la === MalloyParser.COMMA) {
                                 {
                                     {
-                                        this.state = 780;
+                                        this.state = 778;
                                         this.match(MalloyParser.COMMA);
-                                        this.state = 781;
+                                        this.state = 779;
                                         this.fieldName();
                                     }
                                 }
-                                this.state = 786;
+                                this.state = 784;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                             }
-                            this.state = 787;
+                            this.state = 785;
                             this.match(MalloyParser.CPAREN);
                         }
                         break;
                 }
                 this._ctx._stop = this._input.tryLT(-1);
-                this.state = 833;
+                this.state = 831;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 89, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
@@ -4048,18 +4048,18 @@ class MalloyParser extends Parser_1.Parser {
                         }
                         _prevctx = _localctx;
                         {
-                            this.state = 831;
+                            this.state = 829;
                             this._errHandler.sync(this);
                             switch (this.interpreter.adaptivePredict(this._input, 88, this._ctx)) {
                                 case 1:
                                     {
                                         _localctx = new ExprMulDivContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 791;
+                                        this.state = 789;
                                         if (!(this.precpred(this._ctx, 16))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
                                         }
-                                        this.state = 792;
+                                        this.state = 790;
                                         _la = this._input.LA(1);
                                         if (!(_la === MalloyParser.STAR || _la === MalloyParser.SLASH)) {
                                             this._errHandler.recoverInline(this);
@@ -4071,7 +4071,7 @@ class MalloyParser extends Parser_1.Parser {
                                             this._errHandler.reportMatch(this);
                                             this.consume();
                                         }
-                                        this.state = 793;
+                                        this.state = 791;
                                         this.fieldExpr(17);
                                     }
                                     break;
@@ -4079,11 +4079,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprAddSubContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 794;
+                                        this.state = 792;
                                         if (!(this.precpred(this._ctx, 15))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
                                         }
-                                        this.state = 795;
+                                        this.state = 793;
                                         _la = this._input.LA(1);
                                         if (!(_la === MalloyParser.PLUS || _la === MalloyParser.MINUS)) {
                                             this._errHandler.recoverInline(this);
@@ -4095,7 +4095,7 @@ class MalloyParser extends Parser_1.Parser {
                                             this._errHandler.reportMatch(this);
                                             this.consume();
                                         }
-                                        this.state = 796;
+                                        this.state = 794;
                                         this.fieldExpr(16);
                                     }
                                     break;
@@ -4103,13 +4103,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprRangeContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 797;
+                                        this.state = 795;
                                         if (!(this.precpred(this._ctx, 14))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 14)");
                                         }
-                                        this.state = 798;
+                                        this.state = 796;
                                         this.match(MalloyParser.TO);
-                                        this.state = 799;
+                                        this.state = 797;
                                         this.fieldExpr(15);
                                     }
                                     break;
@@ -4117,13 +4117,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprCompareContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 800;
+                                        this.state = 798;
                                         if (!(this.precpred(this._ctx, 11))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
                                         }
-                                        this.state = 801;
+                                        this.state = 799;
                                         this.compareOp();
-                                        this.state = 802;
+                                        this.state = 800;
                                         this.fieldExpr(12);
                                     }
                                     break;
@@ -4131,11 +4131,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprLogicalContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 804;
+                                        this.state = 802;
                                         if (!(this.precpred(this._ctx, 8))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 8)");
                                         }
-                                        this.state = 805;
+                                        this.state = 803;
                                         _la = this._input.LA(1);
                                         if (!(_la === MalloyParser.AND || _la === MalloyParser.OR)) {
                                             this._errHandler.recoverInline(this);
@@ -4147,7 +4147,7 @@ class MalloyParser extends Parser_1.Parser {
                                             this._errHandler.reportMatch(this);
                                             this.consume();
                                         }
-                                        this.state = 806;
+                                        this.state = 804;
                                         this.fieldExpr(9);
                                     }
                                     break;
@@ -4155,15 +4155,15 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprFilterContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 807;
+                                        this.state = 805;
                                         if (!(this.precpred(this._ctx, 22))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 22)");
                                         }
-                                        this.state = 808;
+                                        this.state = 806;
                                         this.match(MalloyParser.OCURLY);
-                                        this.state = 809;
+                                        this.state = 807;
                                         this.filteredBy();
-                                        this.state = 810;
+                                        this.state = 808;
                                         this.match(MalloyParser.CCURLY);
                                     }
                                     break;
@@ -4171,11 +4171,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprDurationContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 812;
+                                        this.state = 810;
                                         if (!(this.precpred(this._ctx, 19))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
                                         }
-                                        this.state = 813;
+                                        this.state = 811;
                                         this.timeframe();
                                     }
                                     break;
@@ -4183,13 +4183,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprTimeTruncContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 814;
+                                        this.state = 812;
                                         if (!(this.precpred(this._ctx, 18))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 18)");
                                         }
-                                        this.state = 815;
+                                        this.state = 813;
                                         this.match(MalloyParser.DOT);
-                                        this.state = 816;
+                                        this.state = 814;
                                         this.timeframe();
                                     }
                                     break;
@@ -4197,13 +4197,13 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprSafeCastContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 817;
+                                        this.state = 815;
                                         if (!(this.precpred(this._ctx, 17))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 17)");
                                         }
-                                        this.state = 818;
+                                        this.state = 816;
                                         this.match(MalloyParser.DOUBLECOLON);
-                                        this.state = 819;
+                                        this.state = 817;
                                         this.malloyType();
                                     }
                                     break;
@@ -4212,15 +4212,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 = 820;
+                                        this.state = 818;
                                         if (!(this.precpred(this._ctx, 13))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 13)");
                                         }
-                                        this.state = 821;
+                                        this.state = 819;
                                         this.match(MalloyParser.FOR);
-                                        this.state = 822;
+                                        this.state = 820;
                                         _localctx._duration = this.fieldExpr(0);
-                                        this.state = 823;
+                                        this.state = 821;
                                         this.timeframe();
                                     }
                                     break;
@@ -4228,11 +4228,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprLogicalTreeContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 825;
+                                        this.state = 823;
                                         if (!(this.precpred(this._ctx, 12))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
                                         }
-                                        this.state = 826;
+                                        this.state = 824;
                                         _la = this._input.LA(1);
                                         if (!(_la === MalloyParser.AMPER || _la === MalloyParser.BAR)) {
                                             this._errHandler.recoverInline(this);
@@ -4244,7 +4244,7 @@ class MalloyParser extends Parser_1.Parser {
                                             this._errHandler.reportMatch(this);
                                             this.consume();
                                         }
-                                        this.state = 827;
+                                        this.state = 825;
                                         this.partialAllowedFieldExpr();
                                     }
                                     break;
@@ -4252,11 +4252,11 @@ class MalloyParser extends Parser_1.Parser {
                                     {
                                         _localctx = new ExprApplyContext(new FieldExprContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, MalloyParser.RULE_fieldExpr);
-                                        this.state = 828;
+                                        this.state = 826;
                                         if (!(this.precpred(this._ctx, 10))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
                                         }
-                                        this.state = 829;
+                                        this.state = 827;
                                         _la = this._input.LA(1);
                                         if (!(_la === MalloyParser.QMARK || _la === MalloyParser.COLON)) {
                                             this._errHandler.recoverInline(this);
@@ -4268,14 +4268,14 @@ class MalloyParser extends Parser_1.Parser {
                                             this._errHandler.reportMatch(this);
                                             this.consume();
                                         }
-                                        this.state = 830;
+                                        this.state = 828;
                                         this.partialAllowedFieldExpr();
                                     }
                                     break;
                             }
                         }
                     }
-                    this.state = 835;
+                    this.state = 833;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 89, this._ctx);
                 }
@@ -4301,7 +4301,7 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new PartialAllowedFieldExprContext(this._ctx, this.state);
         this.enterRule(_localctx, 164, MalloyParser.RULE_partialAllowedFieldExpr);
         try {
-            this.state = 840;
+            this.state = 838;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.LT:
@@ -4315,9 +4315,9 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprPartialCompareContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 836;
+                        this.state = 834;
                         this.compareOp();
-                        this.state = 837;
+                        this.state = 835;
                         this.fieldExpr(0);
                     }
                     break;
@@ -4360,7 +4360,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new ExprNotPartialContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 839;
+                        this.state = 837;
                         this.fieldExpr(0);
                     }
                     break;
@@ -4391,7 +4391,7 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 843;
+                this.state = 841;
                 this._errHandler.sync(this);
                 _alt = 1;
                 do {
@@ -4399,7 +4399,7 @@ class MalloyParser extends Parser_1.Parser {
                         case 1:
                             {
                                 {
-                                    this.state = 842;
+                                    this.state = 840;
                                     this.pick();
                                 }
                             }
@@ -4407,18 +4407,18 @@ class MalloyParser extends Parser_1.Parser {
                         default:
                             throw new NoViableAltException_1.NoViableAltException(this);
                     }
-                    this.state = 845;
+                    this.state = 843;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 91, this._ctx);
                 } while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER);
-                this.state = 849;
+                this.state = 847;
                 this._errHandler.sync(this);
                 switch (this.interpreter.adaptivePredict(this._input, 92, this._ctx)) {
                     case 1:
                         {
-                            this.state = 847;
+                            this.state = 845;
                             this.match(MalloyParser.ELSE);
-                            this.state = 848;
+                            this.state = 846;
                             _localctx._pickElse = this.fieldExpr(0);
                         }
                         break;
@@ -4448,20 +4448,20 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 851;
+                this.state = 849;
                 this.match(MalloyParser.PICK);
-                this.state = 853;
+                this.state = 851;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if (((((_la - 27)) & ~0x1F) === 0 && ((1 << (_la - 27)) & ((1 << (MalloyParser.ALL - 27)) | (1 << (MalloyParser.AVG - 27)) | (1 << (MalloyParser.CAST - 27)) | (1 << (MalloyParser.COUNT - 27)) | (1 << (MalloyParser.DAY - 27)) | (1 << (MalloyParser.EXCLUDE - 27)) | (1 << (MalloyParser.FALSE - 27)) | (1 << (MalloyParser.HOUR - 27)) | (1 << (MalloyParser.MAX - 27)) | (1 << (MalloyParser.MIN - 27)) | (1 << (MalloyParser.MINUTE - 27)) | (1 << (MalloyParser.MONTH - 27)))) !== 0) || ((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & ((1 << (MalloyParser.NOT - 59)) | (1 << (MalloyParser.NOW - 59)) | (1 << (MalloyParser.NULL - 59)) | (1 << (MalloyParser.PICK - 59)) | (1 << (MalloyParser.QUARTER - 59)) | (1 << (MalloyParser.SECOND - 59)) | (1 << (MalloyParser.SUM - 59)) | (1 << (MalloyParser.TRUE - 59)) | (1 << (MalloyParser.WEEK - 59)) | (1 << (MalloyParser.YEAR - 59)) | (1 << (MalloyParser.HACKY_REGEX - 59)) | (1 << (MalloyParser.STRING_LITERAL - 59)) | (1 << (MalloyParser.OPAREN - 59)))) !== 0) || ((((_la - 106)) & ~0x1F) === 0 && ((1 << (_la - 106)) & ((1 << (MalloyParser.MINUS - 106)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 106)) | (1 << (MalloyParser.LITERAL_DAY - 106)) | (1 << (MalloyParser.LITERAL_QUARTER - 106)) | (1 << (MalloyParser.LITERAL_MONTH - 106)) | (1 << (MalloyParser.LITERAL_WEEK - 106)) | (1 << (MalloyParser.LITERAL_YEAR - 106)) | (1 << (MalloyParser.IDENTIFIER - 106)) | (1 << (MalloyParser.INTEGER_LITERAL - 106)) | (1 << (MalloyParser.NUMERIC_LITERAL - 106)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 106)))) !== 0)) {
+                if (((((_la - 28)) & ~0x1F) === 0 && ((1 << (_la - 28)) & ((1 << (MalloyParser.ALL - 28)) | (1 << (MalloyParser.AVG - 28)) | (1 << (MalloyParser.CAST - 28)) | (1 << (MalloyParser.COUNT - 28)) | (1 << (MalloyParser.DAY - 28)) | (1 << (MalloyParser.EXCLUDE - 28)) | (1 << (MalloyParser.FALSE - 28)) | (1 << (MalloyParser.HOUR - 28)) | (1 << (MalloyParser.MAX - 28)) | (1 << (MalloyParser.MIN - 28)) | (1 << (MalloyParser.MINUTE - 28)) | (1 << (MalloyParser.MONTH - 28)))) !== 0) || ((((_la - 60)) & ~0x1F) === 0 && ((1 << (_la - 60)) & ((1 << (MalloyParser.NOT - 60)) | (1 << (MalloyParser.NOW - 60)) | (1 << (MalloyParser.NULL - 60)) | (1 << (MalloyParser.PICK - 60)) | (1 << (MalloyParser.QUARTER - 60)) | (1 << (MalloyParser.SECOND - 60)) | (1 << (MalloyParser.SUM - 60)) | (1 << (MalloyParser.TRUE - 60)) | (1 << (MalloyParser.WEEK - 60)) | (1 << (MalloyParser.YEAR - 60)) | (1 << (MalloyParser.HACKY_REGEX - 60)) | (1 << (MalloyParser.STRING_LITERAL - 60)) | (1 << (MalloyParser.OPAREN - 60)))) !== 0) || ((((_la - 107)) & ~0x1F) === 0 && ((1 << (_la - 107)) & ((1 << (MalloyParser.MINUS - 107)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 107)) | (1 << (MalloyParser.LITERAL_DAY - 107)) | (1 << (MalloyParser.LITERAL_QUARTER - 107)) | (1 << (MalloyParser.LITERAL_MONTH - 107)) | (1 << (MalloyParser.LITERAL_WEEK - 107)) | (1 << (MalloyParser.LITERAL_YEAR - 107)) | (1 << (MalloyParser.IDENTIFIER - 107)) | (1 << (MalloyParser.INTEGER_LITERAL - 107)) | (1 << (MalloyParser.NUMERIC_LITERAL - 107)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 107)))) !== 0)) {
                     {
-                        this.state = 852;
+                        this.state = 850;
                         _localctx._pickValue = this.fieldExpr(0);
                     }
                 }
-                this.state = 855;
+                this.state = 853;
                 this.match(MalloyParser.WHEN);
-                this.state = 856;
+                this.state = 854;
                 _localctx._pickWhen = this.partialAllowedFieldExpr();
             }
         }
@@ -4489,32 +4489,32 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 858;
+                this.state = 856;
                 this.fieldExpr(0);
-                this.state = 863;
+                this.state = 861;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 94, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 859;
+                                this.state = 857;
                                 this.match(MalloyParser.COMMA);
-                                this.state = 860;
+                                this.state = 858;
                                 this.fieldExpr(0);
                             }
                         }
                     }
-                    this.state = 865;
+                    this.state = 863;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 94, this._ctx);
                 }
-                this.state = 867;
+                this.state = 865;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 866;
+                        this.state = 864;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -4543,28 +4543,28 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 869;
+                this.state = 867;
                 this.fieldName();
-                this.state = 876;
+                this.state = 874;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while (((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (MalloyParser.COMMA - 97)) | (1 << (MalloyParser.IDENTIFIER - 97)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 97)))) !== 0)) {
+                while (((((_la - 98)) & ~0x1F) === 0 && ((1 << (_la - 98)) & ((1 << (MalloyParser.COMMA - 98)) | (1 << (MalloyParser.IDENTIFIER - 98)) | (1 << (MalloyParser.OBJECT_NAME_LITERAL - 98)))) !== 0)) {
                     {
                         {
-                            this.state = 871;
+                            this.state = 869;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             if (_la === MalloyParser.COMMA) {
                                 {
-                                    this.state = 870;
+                                    this.state = 868;
                                     this.match(MalloyParser.COMMA);
                                 }
                             }
-                            this.state = 873;
+                            this.state = 871;
                             this.fieldName();
                         }
                     }
-                    this.state = 878;
+                    this.state = 876;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
@@ -4594,39 +4594,39 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 879;
+                this.state = 877;
                 this.collectionMember();
-                this.state = 886;
+                this.state = 884;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 99, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 881;
+                                this.state = 879;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === MalloyParser.COMMA) {
                                     {
-                                        this.state = 880;
+                                        this.state = 878;
                                         this.match(MalloyParser.COMMA);
                                     }
                                 }
-                                this.state = 883;
+                                this.state = 881;
                                 this.collectionMember();
                             }
                         }
                     }
-                    this.state = 888;
+                    this.state = 886;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 99, this._ctx);
                 }
-                this.state = 890;
+                this.state = 888;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyParser.COMMA) {
                     {
-                        this.state = 889;
+                        this.state = 887;
                         this.match(MalloyParser.COMMA);
                     }
                 }
@@ -4653,14 +4653,14 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 176, MalloyParser.RULE_collectionMember);
         let _la;
         try {
-            this.state = 900;
+            this.state = 898;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 102, this._ctx)) {
                 case 1:
                     _localctx = new NameMemberContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 892;
+                        this.state = 890;
                         this.fieldPath();
                     }
                     break;
@@ -4668,18 +4668,18 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new WildMemberContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 896;
+                        this.state = 894;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyParser.IDENTIFIER || _la === MalloyParser.OBJECT_NAME_LITERAL) {
                             {
-                                this.state = 893;
+                                this.state = 891;
                                 this.fieldPath();
-                                this.state = 894;
+                                this.state = 892;
                                 this.match(MalloyParser.DOT);
                             }
                         }
-                        this.state = 898;
+                        this.state = 896;
                         _la = this._input.LA(1);
                         if (!(_la === MalloyParser.STAR || _la === MalloyParser.STARSTAR)) {
                             this._errHandler.recoverInline(this);
@@ -4697,7 +4697,7 @@ class MalloyParser extends Parser_1.Parser {
                     _localctx = new NewMemberContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 899;
+                        this.state = 897;
                         this.fieldDef();
                     }
                     break;
@@ -4726,23 +4726,23 @@ class MalloyParser extends Parser_1.Parser {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 902;
+                this.state = 900;
                 this.fieldName();
-                this.state = 907;
+                this.state = 905;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 103, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 903;
+                                this.state = 901;
                                 this.match(MalloyParser.DOT);
-                                this.state = 904;
+                                this.state = 902;
                                 this.fieldName();
                             }
                         }
                     }
-                    this.state = 909;
+                    this.state = 907;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 103, this._ctx);
                 }
@@ -4770,7 +4770,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 910;
+                this.state = 908;
                 this.id();
             }
         }
@@ -4796,7 +4796,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 912;
+                this.state = 910;
                 this.id();
             }
         }
@@ -4822,9 +4822,9 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 914;
+                this.state = 912;
                 this.fieldExpr(0);
-                this.state = 915;
+                this.state = 913;
                 this.match(MalloyParser.EOF);
             }
         }
@@ -4850,7 +4850,7 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 917;
+                this.state = 915;
                 this.jsonValue();
             }
         }
@@ -4874,62 +4874,62 @@ class MalloyParser extends Parser_1.Parser {
         let _localctx = new JsonValueContext(this._ctx, this.state);
         this.enterRule(_localctx, 188, MalloyParser.RULE_jsonValue);
         try {
-            this.state = 927;
+            this.state = 925;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyParser.JSON_STRING:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 919;
+                        this.state = 917;
                         this.match(MalloyParser.JSON_STRING);
                     }
                     break;
                 case MalloyParser.INTEGER_LITERAL:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 920;
+                        this.state = 918;
                         this.match(MalloyParser.INTEGER_LITERAL);
                     }
                     break;
                 case MalloyParser.NUMERIC_LITERAL:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 921;
+                        this.state = 919;
                         this.match(MalloyParser.NUMERIC_LITERAL);
                     }
                     break;
                 case MalloyParser.OCURLY:
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 922;
+                        this.state = 920;
                         this.jsonObject();
                     }
                     break;
                 case MalloyParser.OBRACK:
                     this.enterOuterAlt(_localctx, 5);
                     {
-                        this.state = 923;
+                        this.state = 921;
                         this.jsonArray();
                     }
                     break;
                 case MalloyParser.TRUE:
                     this.enterOuterAlt(_localctx, 6);
                     {
-                        this.state = 924;
+                        this.state = 922;
                         this.match(MalloyParser.TRUE);
                     }
                     break;
                 case MalloyParser.FALSE:
                     this.enterOuterAlt(_localctx, 7);
                     {
-                        this.state = 925;
+                        this.state = 923;
                         this.match(MalloyParser.FALSE);
                     }
                     break;
                 case MalloyParser.NULL:
                     this.enterOuterAlt(_localctx, 8);
                     {
-                        this.state = 926;
+                        this.state = 924;
                         this.match(MalloyParser.NULL);
                     }
                     break;
@@ -4958,42 +4958,42 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 190, MalloyParser.RULE_jsonObject);
         let _la;
         try {
-            this.state = 942;
+            this.state = 940;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 106, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 929;
+                        this.state = 927;
                         this.match(MalloyParser.OCURLY);
-                        this.state = 930;
+                        this.state = 928;
                         this.jsonProperty();
-                        this.state = 935;
+                        this.state = 933;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         while (_la === MalloyParser.COMMA) {
                             {
                                 {
-                                    this.state = 931;
+                                    this.state = 929;
                                     this.match(MalloyParser.COMMA);
-                                    this.state = 932;
+                                    this.state = 930;
                                     this.jsonProperty();
                                 }
                             }
-                            this.state = 937;
+                            this.state = 935;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                         }
-                        this.state = 938;
+                        this.state = 936;
                         this.match(MalloyParser.CCURLY);
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 940;
+                        this.state = 938;
                         this.match(MalloyParser.OCURLY);
-                        this.state = 941;
+                        this.state = 939;
                         this.match(MalloyParser.CCURLY);
                     }
                     break;
@@ -5021,11 +5021,11 @@ class MalloyParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 944;
+                this.state = 942;
                 this.match(MalloyParser.JSON_STRING);
-                this.state = 945;
+                this.state = 943;
                 this.match(MalloyParser.COLON);
-                this.state = 946;
+                this.state = 944;
                 this.jsonValue();
             }
         }
@@ -5050,42 +5050,42 @@ class MalloyParser extends Parser_1.Parser {
         this.enterRule(_localctx, 194, MalloyParser.RULE_jsonArray);
         let _la;
         try {
-            this.state = 961;
+            this.state = 959;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 108, this._ctx)) {
                 case 1:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 948;
+                        this.state = 946;
                         this.match(MalloyParser.OBRACK);
-                        this.state = 949;
+                        this.state = 947;
                         this.jsonValue();
-                        this.state = 954;
+                        this.state = 952;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         while (_la === MalloyParser.COMMA) {
                             {
                                 {
-                                    this.state = 950;
+                                    this.state = 948;
                                     this.match(MalloyParser.COMMA);
-                                    this.state = 951;
+                                    this.state = 949;
                                     this.jsonValue();
                                 }
                             }
-                            this.state = 956;
+                            this.state = 954;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                         }
-                        this.state = 957;
+                        this.state = 955;
                         this.match(MalloyParser.CBRACK);
                     }
                     break;
                 case 2:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 959;
+                        this.state = 957;
                         this.match(MalloyParser.OBRACK);
-                        this.state = 960;
+                        this.state = 958;
                         this.match(MalloyParser.CBRACK);
                     }
                     break;
@@ -5107,39 +5107,13 @@ class MalloyParser extends Parser_1.Parser {
         return _localctx;
     }
     // @RuleVersion(0)
-    sqlBlock() {
-        let _localctx = new SqlBlockContext(this._ctx, this.state);
-        this.enterRule(_localctx, 196, MalloyParser.RULE_sqlBlock);
-        try {
-            this.enterOuterAlt(_localctx, 1);
-            {
-                this.state = 963;
-                this.match(MalloyParser.SQL_STRING);
-            }
-        }
-        catch (re) {
-            if (re instanceof RecognitionException_1.RecognitionException) {
-                _localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return _localctx;
-    }
-    // @RuleVersion(0)
     sqlExploreNameRef() {
         let _localctx = new SqlExploreNameRefContext(this._ctx, this.state);
-        this.enterRule(_localctx, 198, MalloyParser.RULE_sqlExploreNameRef);
+        this.enterRule(_localctx, 196, MalloyParser.RULE_sqlExploreNameRef);
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 965;
+                this.state = 961;
                 this.id();
             }
         }
@@ -5161,11 +5135,11 @@ class MalloyParser extends Parser_1.Parser {
     // @RuleVersion(0)
     sqlCommandNameDef() {
         let _localctx = new SqlCommandNameDefContext(this._ctx, this.state);
-        this.enterRule(_localctx, 200, MalloyParser.RULE_sqlCommandNameDef);
+        this.enterRule(_localctx, 198, MalloyParser.RULE_sqlCommandNameDef);
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 967;
+                this.state = 963;
                 this.id();
             }
         }
@@ -5187,11 +5161,11 @@ class MalloyParser extends Parser_1.Parser {
     // @RuleVersion(0)
     connectionName() {
         let _localctx = new ConnectionNameContext(this._ctx, this.state);
-        this.enterRule(_localctx, 202, MalloyParser.RULE_connectionName);
+        this.enterRule(_localctx, 200, MalloyParser.RULE_connectionName);
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 969;
+                this.state = 965;
                 this.match(MalloyParser.JSON_STRING);
             }
         }
@@ -5278,112 +5252,113 @@ MalloyParser.RENAME = 21;
 MalloyParser.SAMPLE = 22;
 MalloyParser.SOURCE = 23;
 MalloyParser.SQL = 24;
-MalloyParser.TOP = 25;
-MalloyParser.WHERE = 26;
-MalloyParser.ALL = 27;
-MalloyParser.AND = 28;
-MalloyParser.AS = 29;
-MalloyParser.ASC = 30;
-MalloyParser.AVG = 31;
-MalloyParser.BOOLEAN = 32;
-MalloyParser.BY = 33;
-MalloyParser.CASE = 34;
-MalloyParser.CAST = 35;
-MalloyParser.CONDITION = 36;
-MalloyParser.COUNT = 37;
-MalloyParser.DATE = 38;
-MalloyParser.DAY = 39;
-MalloyParser.DESC = 40;
-MalloyParser.DISTINCT = 41;
-MalloyParser.ELSE = 42;
-MalloyParser.END = 43;
-MalloyParser.EXCLUDE = 44;
-MalloyParser.FALSE = 45;
-MalloyParser.FOR = 46;
-MalloyParser.FROM = 47;
-MalloyParser.FROM_SQL = 48;
-MalloyParser.HAS = 49;
-MalloyParser.HOUR = 50;
-MalloyParser.IMPORT = 51;
-MalloyParser.IS = 52;
-MalloyParser.JSON = 53;
-MalloyParser.LAST = 54;
-MalloyParser.MAX = 55;
-MalloyParser.MIN = 56;
-MalloyParser.MINUTE = 57;
-MalloyParser.MONTH = 58;
-MalloyParser.NOT = 59;
-MalloyParser.NOW = 60;
-MalloyParser.NULL = 61;
-MalloyParser.NUMBER = 62;
-MalloyParser.ON = 63;
-MalloyParser.OR = 64;
-MalloyParser.PICK = 65;
-MalloyParser.QMARK = 66;
-MalloyParser.QUARTER = 67;
-MalloyParser.SECOND = 68;
-MalloyParser.STRING = 69;
-MalloyParser.SUM = 70;
-MalloyParser.TABLE = 71;
-MalloyParser.THEN = 72;
-MalloyParser.THIS = 73;
-MalloyParser.TIMESTAMP = 74;
-MalloyParser.TO = 75;
-MalloyParser.TRUE = 76;
-MalloyParser.TURTLE = 77;
-MalloyParser.WEEK = 78;
-MalloyParser.WHEN = 79;
-MalloyParser.WITH = 80;
-MalloyParser.YEAR = 81;
-MalloyParser.UNGROUPED = 82;
-MalloyParser.STRING_ESCAPE = 83;
-MalloyParser.HACKY_REGEX = 84;
-MalloyParser.STRING_LITERAL = 85;
-MalloyParser.AMPER = 86;
-MalloyParser.ARROW = 87;
-MalloyParser.FAT_ARROW = 88;
-MalloyParser.OPAREN = 89;
-MalloyParser.CPAREN = 90;
-MalloyParser.OBRACK = 91;
-MalloyParser.CBRACK = 92;
-MalloyParser.OCURLY = 93;
-MalloyParser.CCURLY = 94;
-MalloyParser.DOUBLECOLON = 95;
-MalloyParser.COLON = 96;
-MalloyParser.COMMA = 97;
-MalloyParser.DOT = 98;
-MalloyParser.LT = 99;
-MalloyParser.GT = 100;
-MalloyParser.EQ = 101;
-MalloyParser.NE = 102;
-MalloyParser.LTE = 103;
-MalloyParser.GTE = 104;
-MalloyParser.PLUS = 105;
-MalloyParser.MINUS = 106;
-MalloyParser.STAR = 107;
-MalloyParser.STARSTAR = 108;
-MalloyParser.SLASH = 109;
-MalloyParser.BAR = 110;
-MalloyParser.SEMI = 111;
-MalloyParser.NOT_MATCH = 112;
-MalloyParser.MATCH = 113;
-MalloyParser.LITERAL_TIMESTAMP = 114;
-MalloyParser.LITERAL_DAY = 115;
-MalloyParser.LITERAL_QUARTER = 116;
-MalloyParser.LITERAL_MONTH = 117;
-MalloyParser.LITERAL_WEEK = 118;
-MalloyParser.LITERAL_YEAR = 119;
-MalloyParser.IDENTIFIER = 120;
-MalloyParser.PERCENT_LITERAL = 121;
-MalloyParser.INTEGER_LITERAL = 122;
-MalloyParser.NUMERIC_LITERAL = 123;
-MalloyParser.OBJECT_NAME_LITERAL = 124;
-MalloyParser.BLOCK_COMMENT = 125;
-MalloyParser.COMMENT_TO_EOL = 126;
-MalloyParser.WHITE_SPACE = 127;
-MalloyParser.SQL_STRING = 128;
-MalloyParser.UNWATED_CHARS_TRAILING_NUMBERS = 129;
-MalloyParser.UNEXPECTED_CHAR = 130;
+MalloyParser.FANCYSQL = 25;
+MalloyParser.TOP = 26;
+MalloyParser.WHERE = 27;
+MalloyParser.ALL = 28;
+MalloyParser.AND = 29;
+MalloyParser.AS = 30;
+MalloyParser.ASC = 31;
+MalloyParser.AVG = 32;
+MalloyParser.BOOLEAN = 33;
+MalloyParser.BY = 34;
+MalloyParser.CASE = 35;
+MalloyParser.CAST = 36;
+MalloyParser.CONDITION = 37;
+MalloyParser.COUNT = 38;
+MalloyParser.DATE = 39;
+MalloyParser.DAY = 40;
+MalloyParser.DESC = 41;
+MalloyParser.DISTINCT = 42;
+MalloyParser.ELSE = 43;
+MalloyParser.END = 44;
+MalloyParser.EXCLUDE = 45;
+MalloyParser.FALSE = 46;
+MalloyParser.FOR = 47;
+MalloyParser.FROM = 48;
+MalloyParser.FROM_SQL = 49;
+MalloyParser.HAS = 50;
+MalloyParser.HOUR = 51;
+MalloyParser.IMPORT = 52;
+MalloyParser.IS = 53;
+MalloyParser.JSON = 54;
+MalloyParser.LAST = 55;
+MalloyParser.MAX = 56;
+MalloyParser.MIN = 57;
+MalloyParser.MINUTE = 58;
+MalloyParser.MONTH = 59;
+MalloyParser.NOT = 60;
+MalloyParser.NOW = 61;
+MalloyParser.NULL = 62;
+MalloyParser.NUMBER = 63;
+MalloyParser.ON = 64;
+MalloyParser.OR = 65;
+MalloyParser.PICK = 66;
+MalloyParser.QMARK = 67;
+MalloyParser.QUARTER = 68;
+MalloyParser.SECOND = 69;
+MalloyParser.STRING = 70;
+MalloyParser.SUM = 71;
+MalloyParser.TABLE = 72;
+MalloyParser.THEN = 73;
+MalloyParser.THIS = 74;
+MalloyParser.TIMESTAMP = 75;
+MalloyParser.TO = 76;
+MalloyParser.TRUE = 77;
+MalloyParser.TURTLE = 78;
+MalloyParser.WEEK = 79;
+MalloyParser.WHEN = 80;
+MalloyParser.WITH = 81;
+MalloyParser.YEAR = 82;
+MalloyParser.UNGROUPED = 83;
+MalloyParser.STRING_ESCAPE = 84;
+MalloyParser.HACKY_REGEX = 85;
+MalloyParser.STRING_LITERAL = 86;
+MalloyParser.AMPER = 87;
+MalloyParser.ARROW = 88;
+MalloyParser.FAT_ARROW = 89;
+MalloyParser.OPAREN = 90;
+MalloyParser.CPAREN = 91;
+MalloyParser.OBRACK = 92;
+MalloyParser.CBRACK = 93;
+MalloyParser.OCURLY = 94;
+MalloyParser.CCURLY = 95;
+MalloyParser.DOUBLECOLON = 96;
+MalloyParser.COLON = 97;
+MalloyParser.COMMA = 98;
+MalloyParser.DOT = 99;
+MalloyParser.LT = 100;
+MalloyParser.GT = 101;
+MalloyParser.EQ = 102;
+MalloyParser.NE = 103;
+MalloyParser.LTE = 104;
+MalloyParser.GTE = 105;
+MalloyParser.PLUS = 106;
+MalloyParser.MINUS = 107;
+MalloyParser.STAR = 108;
+MalloyParser.STARSTAR = 109;
+MalloyParser.SLASH = 110;
+MalloyParser.BAR = 111;
+MalloyParser.SEMI = 112;
+MalloyParser.NOT_MATCH = 113;
+MalloyParser.MATCH = 114;
+MalloyParser.LITERAL_TIMESTAMP = 115;
+MalloyParser.LITERAL_DAY = 116;
+MalloyParser.LITERAL_QUARTER = 117;
+MalloyParser.LITERAL_MONTH = 118;
+MalloyParser.LITERAL_WEEK = 119;
+MalloyParser.LITERAL_YEAR = 120;
+MalloyParser.IDENTIFIER = 121;
+MalloyParser.PERCENT_LITERAL = 122;
+MalloyParser.INTEGER_LITERAL = 123;
+MalloyParser.NUMERIC_LITERAL = 124;
+MalloyParser.OBJECT_NAME_LITERAL = 125;
+MalloyParser.BLOCK_COMMENT = 126;
+MalloyParser.COMMENT_TO_EOL = 127;
+MalloyParser.WHITE_SPACE = 128;
+MalloyParser.SQL_STRING = 129;
+MalloyParser.UNWATED_CHARS_TRAILING_NUMBERS = 130;
+MalloyParser.UNEXPECTED_CHAR = 131;
 MalloyParser.RULE_malloyDocument = 0;
 MalloyParser.RULE_malloyStatement = 1;
 MalloyParser.RULE_defineExploreStatement = 2;
@@ -5482,10 +5457,9 @@ MalloyParser.RULE_jsonValue = 94;
 MalloyParser.RULE_jsonObject = 95;
 MalloyParser.RULE_jsonProperty = 96;
 MalloyParser.RULE_jsonArray = 97;
-MalloyParser.RULE_sqlBlock = 98;
-MalloyParser.RULE_sqlExploreNameRef = 99;
-MalloyParser.RULE_sqlCommandNameDef = 100;
-MalloyParser.RULE_connectionName = 101;
+MalloyParser.RULE_sqlExploreNameRef = 98;
+MalloyParser.RULE_sqlCommandNameDef = 99;
+MalloyParser.RULE_connectionName = 100;
 // tslint:disable:no-trailing-whitespace
 MalloyParser.ruleNames = [
     "malloyDocument", "malloyStatement", "defineExploreStatement", "exploreKeyword",
@@ -5509,7 +5483,7 @@ MalloyParser.ruleNames = [
     "partialAllowedFieldExpr", "pickStatement", "pick", "argumentList", "fieldNameList",
     "fieldCollection", "collectionMember", "fieldPath", "joinName", "fieldName",
     "justExpr", "json", "jsonValue", "jsonObject", "jsonProperty", "jsonArray",
-    "sqlBlock", "sqlExploreNameRef", "sqlCommandNameDef", "connectionName",
+    "sqlExploreNameRef", "sqlCommandNameDef", "connectionName",
 ];
 MalloyParser._LITERAL_NAMES = [
     undefined, undefined, undefined, undefined, undefined, undefined, undefined,
@@ -5521,24 +5495,24 @@ MalloyParser._LITERAL_NAMES = [
     undefined, undefined, undefined, undefined, undefined, undefined, undefined,
     undefined, undefined, undefined, undefined, undefined, undefined, undefined,
     undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, undefined, "'?'", undefined, undefined, undefined,
+    undefined, undefined, undefined, undefined, "'?'", undefined, undefined,
     undefined, undefined, undefined, undefined, undefined, undefined, undefined,
     undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, "'&'", "'->'", "'=>'", "'('", "')'", "'['", "']'",
-    "'{'", "'}'", "'::'", "':'", "','", "'.'", "'<'", "'>'", "'='", "'!='",
-    "'<='", "'>='", "'+'", "'-'", "'*'", "'**'", "'/'", "'|'", "';'", "'!~'",
-    "'~'",
+    undefined, undefined, undefined, "'&'", "'->'", "'=>'", "'('", "')'",
+    "'['", "']'", "'{'", "'}'", "'::'", "':'", "','", "'.'", "'<'", "'>'",
+    "'='", "'!='", "'<='", "'>='", "'+'", "'-'", "'*'", "'**'", "'/'", "'|'",
+    "';'", "'!~'", "'~'",
 ];
 MalloyParser._SYMBOLIC_NAMES = [
     undefined, "JSON_STRING", "ACCEPT", "AGGREGATE", "DECLARE", "DIMENSION",
     "EXCEPT", "EXPLORE", "GROUP_BY", "HAVING", "INDEX", "JOIN_CROSS", "JOIN_ONE",
     "JOIN_MANY", "LIMIT", "MEASURE", "NEST", "ORDER_BY", "PRIMARY_KEY", "PROJECT",
-    "QUERY", "RENAME", "SAMPLE", "SOURCE", "SQL", "TOP", "WHERE", "ALL", "AND",
-    "AS", "ASC", "AVG", "BOOLEAN", "BY", "CASE", "CAST", "CONDITION", "COUNT",
-    "DATE", "DAY", "DESC", "DISTINCT", "ELSE", "END", "EXCLUDE", "FALSE",
-    "FOR", "FROM", "FROM_SQL", "HAS", "HOUR", "IMPORT", "IS", "JSON", "LAST",
-    "MAX", "MIN", "MINUTE", "MONTH", "NOT", "NOW", "NULL", "NUMBER", "ON",
-    "OR", "PICK", "QMARK", "QUARTER", "SECOND", "STRING", "SUM", "TABLE",
+    "QUERY", "RENAME", "SAMPLE", "SOURCE", "SQL", "FANCYSQL", "TOP", "WHERE",
+    "ALL", "AND", "AS", "ASC", "AVG", "BOOLEAN", "BY", "CASE", "CAST", "CONDITION",
+    "COUNT", "DATE", "DAY", "DESC", "DISTINCT", "ELSE", "END", "EXCLUDE",
+    "FALSE", "FOR", "FROM", "FROM_SQL", "HAS", "HOUR", "IMPORT", "IS", "JSON",
+    "LAST", "MAX", "MIN", "MINUTE", "MONTH", "NOT", "NOW", "NULL", "NUMBER",
+    "ON", "OR", "PICK", "QMARK", "QUARTER", "SECOND", "STRING", "SUM", "TABLE",
     "THEN", "THIS", "TIMESTAMP", "TO", "TRUE", "TURTLE", "WEEK", "WHEN", "WITH",
     "YEAR", "UNGROUPED", "STRING_ESCAPE", "HACKY_REGEX", "STRING_LITERAL",
     "AMPER", "ARROW", "FAT_ARROW", "OPAREN", "CPAREN", "OBRACK", "CBRACK",
@@ -5552,7 +5526,7 @@ MalloyParser._SYMBOLIC_NAMES = [
 ];
 MalloyParser.VOCABULARY = new VocabularyImpl_1.VocabularyImpl(MalloyParser._LITERAL_NAMES, MalloyParser._SYMBOLIC_NAMES, []);
 MalloyParser._serializedATNSegments = 2;
-MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x84\u03CE\x04" +
+MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x85\u03CA\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" +
@@ -5566,479 +5540,476 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "F\tF\x04G\tG\x04H\tH\x04I\tI\x04J\tJ\x04K\tK\x04L\tL\x04M\tM\x04N\tN\x04" +
     "O\tO\x04P\tP\x04Q\tQ\x04R\tR\x04S\tS\x04T\tT\x04U\tU\x04V\tV\x04W\tW\x04" +
     "X\tX\x04Y\tY\x04Z\tZ\x04[\t[\x04\\\t\\\x04]\t]\x04^\t^\x04_\t_\x04`\t" +
-    "`\x04a\ta\x04b\tb\x04c\tc\x04d\td\x04e\te\x04f\tf\x04g\tg\x03\x02\x03" +
-    "\x02\x07\x02\xD1\n\x02\f\x02\x0E\x02\xD4\v\x02\x03\x02\x03\x02\x03\x03" +
-    "\x03\x03\x03\x03\x03\x03\x05\x03\xDC\n\x03\x03\x04\x03\x04\x03\x04\x03" +
-    "\x05\x03\x05\x03\x06\x03\x06\x03\x06\x03\x06\x05\x06\xE7\n\x06\x03\x07" +
-    "\x03\x07\x03\b\x03\b\x03\b\x03\t\x03\t\x03\t\x05\t\xF1\n\t\x03\t\x03\t" +
-    "\x03\t\x05\t\xF6\n\t\x03\n\x03\n\x03\n\x03\v\x03\v\x03\f\x03\f\x05\f\xFF" +
-    "\n\f\x03\f\x07\f\u0102\n\f\f\f\x0E\f\u0105\v\f\x03\f\x05\f\u0108\n\f\x03" +
-    "\r\x03\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03" +
-    "\x0F\x03\x0F\x03\x0F\x05\x0F\u0117\n\x0F\x03\x0F\x05\x0F\u011A\n\x0F\x03" +
-    "\x0F\x07\x0F\u011D\n\x0F\f\x0F\x0E\x0F\u0120\v\x0F\x05\x0F\u0122\n\x0F" +
-    "\x03\x10\x03\x10\x07\x10\u0126\n\x10\f\x10\x0E\x10\u0129\v\x10\x03\x11" +
-    "\x03\x11\x03\x11\x05\x11\u012E\n\x11\x03\x11\x05\x11\u0131\n\x11\x05\x11" +
-    "\u0133\n\x11\x03\x12\x03\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03" +
-    "\x13\x03\x14\x03\x14\x03\x14\x03\x14\x07\x14\u0141\n\x14\f\x14\x0E\x14" +
-    "\u0144\v\x14\x03\x14\x05\x14\u0147\n\x14\x03\x15\x03\x15\x03\x15\x03\x15" +
-    "\x03\x15\x03\x16\x03\x16\x03\x17\x03\x17\x03\x18\x03\x18\x05\x18\u0154" +
-    "\n\x18\x03\x18\x07\x18\u0157\n\x18\f\x18\x0E\x18\u015A\v\x18\x03\x18\x05" +
-    "\x18\u015D\n\x18\x03\x19\x03\x19\x03\x19\x03\x19\x03\x1A\x03\x1A\x05\x1A" +
-    "\u0165\n\x1A\x03\x1A\x05\x1A\u0168\n\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B" +
-    "\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x05\x1B" +
-    "\u0176\n\x1B\x03\x1C\x03\x1C\x03\x1D\x03\x1D\x03\x1E\x03\x1E\x03\x1E\x07" +
-    "\x1E\u017F\n\x1E\f\x1E\x0E\x1E\u0182\v\x1E\x03\x1E\x03\x1E\x05\x1E\u0186" +
-    "\n\x1E\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F" +
-    "\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x05\x1F\u0197" +
-    "\n\x1F\x03 \x03 \x05 \u019B\n \x03 \x07 \u019E\n \f \x0E \u01A1\v \x03" +
-    " \x05 \u01A4\n \x03!\x03!\x03!\x03!\x03\"\x03\"\x05\"\u01AC\n\"\x03\"" +
-    "\x07\"\u01AF\n\"\f\"\x0E\"\u01B2\v\"\x03\"\x05\"\u01B5\n\"\x03#\x03#\x05" +
-    "#\u01B9\n#\x03#\x07#\u01BC\n#\f#\x0E#\u01BF\v#\x03#\x05#\u01C2\n#\x03" +
-    "$\x03$\x03$\x03$\x03%\x03%\x03&\x03&\x03\'\x03\'\x03(\x03(\x03(\x05(\u01D1" +
-    "\n(\x03(\x07(\u01D4\n(\f(\x0E(\u01D7\v(\x03(\x05(\u01DA\n(\x03)\x03)\x03" +
-    ")\x03)\x03)\x03)\x05)\u01E2\n)\x03*\x03*\x05*\u01E6\n*\x03*\x07*\u01E9" +
-    "\n*\f*\x0E*\u01EC\v*\x03*\x05*\u01EF\n*\x03+\x03+\x03+\x05+\u01F4\n+\x03" +
-    "+\x03+\x03+\x03+\x03+\x03+\x05+\u01FC\n+\x03+\x03+\x05+\u0200\n+\x05+" +
-    "\u0202\n+\x03,\x03,\x03-\x03-\x05-\u0208\n-\x03.\x03.\x03.\x05.\u020D" +
-    "\n.\x03/\x03/\x03/\x07/\u0212\n/\f/\x0E/\u0215\v/\x03/\x05/\u0218\n/\x03" +
-    "0\x030\x030\x031\x031\x031\x032\x032\x052\u0222\n2\x032\x072\u0225\n2" +
-    "\f2\x0E2\u0228\v2\x032\x052\u022B\n2\x033\x033\x034\x034\x034\x034\x03" +
-    "5\x035\x035\x035\x035\x035\x035\x035\x035\x035\x035\x035\x035\x055\u0240" +
-    "\n5\x036\x036\x036\x037\x037\x057\u0247\n7\x037\x077\u024A\n7\f7\x0E7" +
-    "\u024D\v7\x037\x057\u0250\n7\x038\x038\x039\x039\x059\u0256\n9\x03:\x03" +
-    ":\x03:\x03;\x03;\x05;\u025D\n;\x03;\x07;\u0260\n;\f;\x0E;\u0263\v;\x03" +
-    ";\x05;\u0266\n;\x03<\x03<\x05<\u026A\n<\x03<\x05<\u026D\n<\x03<\x03<\x03" +
-    "<\x03<\x05<\u0273\n<\x03=\x03=\x03=\x03>\x03>\x03>\x03?\x03?\x03?\x03" +
-    "@\x03@\x05@\u0280\n@\x03@\x07@\u0283\n@\f@\x0E@\u0286\v@\x03@\x05@\u0289" +
-    "\n@\x03A\x03A\x05A\u028D\nA\x03A\x05A\u0290\nA\x03B\x03B\x03B\x03C\x03" +
-    "C\x03C\x03C\x05C\u0299\nC\x03D\x03D\x03D\x05D\u029E\nD\x03E\x03E\x03E" +
-    "\x05E\u02A3\nE\x03E\x05E\u02A6\nE\x03F\x03F\x05F\u02AA\nF\x03F\x07F\u02AD" +
-    "\nF\fF\x0EF\u02B0\vF\x03G\x03G\x03G\x03G\x05G\u02B6\nG\x03H\x03H\x03H" +
+    "`\x04a\ta\x04b\tb\x04c\tc\x04d\td\x04e\te\x04f\tf\x03\x02\x03\x02\x07" +
+    "\x02\xCF\n\x02\f\x02\x0E\x02\xD2\v\x02\x03\x02\x03\x02\x03\x03\x03\x03" +
+    "\x03\x03\x03\x03\x05\x03\xDA\n\x03\x03\x04\x03\x04\x03\x04\x03\x05\x03" +
+    "\x05\x03\x06\x03\x06\x03\x06\x03\x06\x05\x06\xE5\n\x06\x03\x07\x03\x07" +
+    "\x03\b\x03\b\x03\b\x03\t\x03\t\x03\t\x05\t\xEF\n\t\x03\t\x03\t\x03\t\x05" +
+    "\t\xF4\n\t\x03\n\x03\n\x03\n\x03\v\x03\v\x03\f\x03\f\x05\f\xFD\n\f\x03" +
+    "\f\x07\f\u0100\n\f\f\f\x0E\f\u0103\v\f\x03\f\x05\f\u0106\n\f\x03\r\x03" +
+    "\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F" +
+    "\x03\x0F\x03\x0F\x05\x0F\u0115\n\x0F\x03\x0F\x05\x0F\u0118\n\x0F\x03\x0F" +
+    "\x07\x0F\u011B\n\x0F\f\x0F\x0E\x0F\u011E\v\x0F\x05\x0F\u0120\n\x0F\x03" +
+    "\x10\x03\x10\x07\x10\u0124\n\x10\f\x10\x0E\x10\u0127\v\x10\x03\x11\x03" +
+    "\x11\x03\x11\x05\x11\u012C\n\x11\x03\x11\x05\x11\u012F\n\x11\x05\x11\u0131" +
+    "\n\x11\x03\x12\x03\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13" +
+    "\x03\x14\x03\x14\x03\x14\x03\x14\x07\x14\u013F\n\x14\f\x14\x0E\x14\u0142" +
+    "\v\x14\x03\x14\x05\x14\u0145\n\x14\x03\x15\x03\x15\x03\x15\x03\x15\x03" +
+    "\x15\x03\x16\x03\x16\x03\x17\x03\x17\x03\x18\x03\x18\x05\x18\u0152\n\x18" +
+    "\x03\x18\x07\x18\u0155\n\x18\f\x18\x0E\x18\u0158\v\x18\x03\x18\x05\x18" +
+    "\u015B\n\x18\x03\x19\x03\x19\x03\x19\x03\x19\x03\x1A\x03\x1A\x05\x1A\u0163" +
+    "\n\x1A\x03\x1A\x05\x1A\u0166\n\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03" +
+    "\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x05\x1B\u0174" +
+    "\n\x1B\x03\x1C\x03\x1C\x03\x1D\x03\x1D\x03\x1E\x03\x1E\x03\x1E\x07\x1E" +
+    "\u017D\n\x1E\f\x1E\x0E\x1E\u0180\v\x1E\x03\x1E\x03\x1E\x05\x1E\u0184\n" +
+    "\x1E\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03" +
+    "\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x05\x1F\u0195\n\x1F" +
+    "\x03 \x03 \x05 \u0199\n \x03 \x07 \u019C\n \f \x0E \u019F\v \x03 \x05" +
+    " \u01A2\n \x03!\x03!\x03!\x03!\x03\"\x03\"\x05\"\u01AA\n\"\x03\"\x07\"" +
+    "\u01AD\n\"\f\"\x0E\"\u01B0\v\"\x03\"\x05\"\u01B3\n\"\x03#\x03#\x05#\u01B7" +
+    "\n#\x03#\x07#\u01BA\n#\f#\x0E#\u01BD\v#\x03#\x05#\u01C0\n#\x03$\x03$\x03" +
+    "$\x03$\x03%\x03%\x03&\x03&\x03\'\x03\'\x03(\x03(\x03(\x05(\u01CF\n(\x03" +
+    "(\x07(\u01D2\n(\f(\x0E(\u01D5\v(\x03(\x05(\u01D8\n(\x03)\x03)\x03)\x03" +
+    ")\x03)\x03)\x05)\u01E0\n)\x03*\x03*\x05*\u01E4\n*\x03*\x07*\u01E7\n*\f" +
+    "*\x0E*\u01EA\v*\x03*\x05*\u01ED\n*\x03+\x03+\x03+\x05+\u01F2\n+\x03+\x03" +
+    "+\x03+\x03+\x03+\x03+\x05+\u01FA\n+\x03+\x03+\x05+\u01FE\n+\x05+\u0200" +
+    "\n+\x03,\x03,\x03-\x03-\x05-\u0206\n-\x03.\x03.\x03.\x05.\u020B\n.\x03" +
+    "/\x03/\x03/\x07/\u0210\n/\f/\x0E/\u0213\v/\x03/\x05/\u0216\n/\x030\x03" +
+    "0\x030\x031\x031\x031\x032\x032\x052\u0220\n2\x032\x072\u0223\n2\f2\x0E" +
+    "2\u0226\v2\x032\x052\u0229\n2\x033\x033\x034\x034\x034\x034\x035\x035" +
+    "\x035\x035\x035\x035\x035\x035\x035\x035\x035\x035\x035\x055\u023E\n5" +
+    "\x036\x036\x036\x037\x037\x057\u0245\n7\x037\x077\u0248\n7\f7\x0E7\u024B" +
+    "\v7\x037\x057\u024E\n7\x038\x038\x039\x039\x059\u0254\n9\x03:\x03:\x03" +
+    ":\x03;\x03;\x05;\u025B\n;\x03;\x07;\u025E\n;\f;\x0E;\u0261\v;\x03;\x05" +
+    ";\u0264\n;\x03<\x03<\x05<\u0268\n<\x03<\x05<\u026B\n<\x03<\x03<\x03<\x03" +
+    "<\x05<\u0271\n<\x03=\x03=\x03=\x03>\x03>\x03>\x03?\x03?\x03?\x03@\x03" +
+    "@\x05@\u027E\n@\x03@\x07@\u0281\n@\f@\x0E@\u0284\v@\x03@\x05@\u0287\n" +
+    "@\x03A\x03A\x05A\u028B\nA\x03A\x05A\u028E\nA\x03B\x03B\x03B\x03C\x03C" +
+    "\x03C\x03C\x05C\u0297\nC\x03D\x03D\x03D\x05D\u029C\nD\x03E\x03E\x03E\x05" +
+    "E\u02A1\nE\x03E\x05E\u02A4\nE\x03F\x03F\x05F\u02A8\nF\x03F\x07F\u02AB" +
+    "\nF\fF\x0EF\u02AE\vF\x03G\x03G\x03G\x03G\x05G\u02B4\nG\x03H\x03H\x03H" +
     "\x03I\x03I\x03J\x03J\x03K\x03K\x03L\x03L\x03M\x03M\x03M\x03M\x03M\x03" +
-    "M\x03M\x05M\u02CA\nM\x03N\x03N\x03N\x03N\x03N\x03N\x05N\u02D2\nN\x03O" +
+    "M\x03M\x05M\u02C8\nM\x03N\x03N\x03N\x03N\x03N\x03N\x05N\u02D0\nN\x03O" +
     "\x03O\x03P\x03P\x03Q\x03Q\x03R\x03R\x03S\x03S\x03S\x03S\x03S\x03S\x03" +
     "S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03" +
-    "S\x03S\x03S\x05S\u02F3\nS\x03S\x03S\x03S\x03S\x05S\u02F9\nS\x03S\x03S" +
-    "\x03S\x03S\x03S\x03S\x03S\x03S\x05S\u0303\nS\x03S\x03S\x05S\u0307\nS\x03" +
-    "S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x07S\u0311\nS\fS\x0ES\u0314\vS\x03" +
-    "S\x03S\x05S\u0318\nS\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03" +
+    "S\x03S\x03S\x05S\u02F1\nS\x03S\x03S\x03S\x03S\x05S\u02F7\nS\x03S\x03S" +
+    "\x03S\x03S\x03S\x03S\x03S\x03S\x05S\u0301\nS\x03S\x03S\x05S\u0305\nS\x03" +
+    "S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x07S\u030F\nS\fS\x0ES\u0312\vS\x03" +
+    "S\x03S\x05S\u0316\nS\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03" +
     "S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03" +
     "S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03S\x03" +
-    "S\x03S\x03S\x07S\u0342\nS\fS\x0ES\u0345\vS\x03T\x03T\x03T\x03T\x05T\u034B" +
-    "\nT\x03U\x06U\u034E\nU\rU\x0EU\u034F\x03U\x03U\x05U\u0354\nU\x03V\x03" +
-    "V\x05V\u0358\nV\x03V\x03V\x03V\x03W\x03W\x03W\x07W\u0360\nW\fW\x0EW\u0363" +
-    "\vW\x03W\x05W\u0366\nW\x03X\x03X\x05X\u036A\nX\x03X\x07X\u036D\nX\fX\x0E" +
-    "X\u0370\vX\x03Y\x03Y\x05Y\u0374\nY\x03Y\x07Y\u0377\nY\fY\x0EY\u037A\v" +
-    "Y\x03Y\x05Y\u037D\nY\x03Z\x03Z\x03Z\x03Z\x05Z\u0383\nZ\x03Z\x03Z\x05Z" +
-    "\u0387\nZ\x03[\x03[\x03[\x07[\u038C\n[\f[\x0E[\u038F\v[\x03\\\x03\\\x03" +
+    "S\x03S\x03S\x07S\u0340\nS\fS\x0ES\u0343\vS\x03T\x03T\x03T\x03T\x05T\u0349" +
+    "\nT\x03U\x06U\u034C\nU\rU\x0EU\u034D\x03U\x03U\x05U\u0352\nU\x03V\x03" +
+    "V\x05V\u0356\nV\x03V\x03V\x03V\x03W\x03W\x03W\x07W\u035E\nW\fW\x0EW\u0361" +
+    "\vW\x03W\x05W\u0364\nW\x03X\x03X\x05X\u0368\nX\x03X\x07X\u036B\nX\fX\x0E" +
+    "X\u036E\vX\x03Y\x03Y\x05Y\u0372\nY\x03Y\x07Y\u0375\nY\fY\x0EY\u0378\v" +
+    "Y\x03Y\x05Y\u037B\nY\x03Z\x03Z\x03Z\x03Z\x05Z\u0381\nZ\x03Z\x03Z\x05Z" +
+    "\u0385\nZ\x03[\x03[\x03[\x07[\u038A\n[\f[\x0E[\u038D\v[\x03\\\x03\\\x03" +
     "]\x03]\x03^\x03^\x03^\x03_\x03_\x03`\x03`\x03`\x03`\x03`\x03`\x03`\x03" +
-    "`\x05`\u03A2\n`\x03a\x03a\x03a\x03a\x07a\u03A8\na\fa\x0Ea\u03AB\va\x03" +
-    "a\x03a\x03a\x03a\x05a\u03B1\na\x03b\x03b\x03b\x03b\x03c\x03c\x03c\x03" +
-    "c\x07c\u03BB\nc\fc\x0Ec\u03BE\vc\x03c\x03c\x03c\x03c\x05c\u03C4\nc\x03" +
-    "d\x03d\x03e\x03e\x03f\x03f\x03g\x03g\x03g\x02\x02\x03\xA4h\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\x02" +
-    "J\x02L\x02N\x02P\x02R\x02T\x02V\x02X\x02Z\x02\\\x02^\x02`\x02b\x02d\x02" +
-    "f\x02h\x02j\x02l\x02n\x02p\x02r\x02t\x02v\x02x\x02z\x02|\x02~\x02\x80" +
-    "\x02\x82\x02\x84\x02\x86\x02\x88\x02\x8A\x02\x8C\x02\x8E\x02\x90\x02\x92" +
-    "\x02\x94\x02\x96\x02\x98\x02\x9A\x02\x9C\x02\x9E\x02\xA0\x02\xA2\x02\xA4" +
-    "\x02\xA6\x02\xA8\x02\xAA\x02\xAC\x02\xAE\x02\xB0\x02\xB2\x02\xB4\x02\xB6" +
-    "\x02\xB8\x02\xBA\x02\xBC\x02\xBE\x02\xC0\x02\xC2\x02\xC4\x02\xC6\x02\xC8" +
-    "\x02\xCA\x02\xCC\x02\x02\x14\x04\x02\t\t\x19\x19\x04\x02\x04\x04\b\b\x04" +
-    "\x02  **\x05\x02//NN{|\x06\x02!!\'\'9:HH\x07\x02\"\"((@@GGLL\x04\x02e" +
-    "jrs\x03\x02|}\x04\x02//NN\x04\x02zz~~\b\x02))44;<EFPPSS\x04\x02\x1D\x1D" +
-    "..\x04\x02mmoo\x03\x02kl\x04\x02\x1E\x1EBB\x04\x02XXpp\x04\x02DDbb\x03" +
-    "\x02mn\x02\u040F\x02\xD2\x03\x02\x02\x02\x04\xDB\x03\x02\x02\x02\x06\xDD" +
-    "\x03\x02\x02\x02\b\xE0\x03\x02\x02\x02\n\xE6\x03\x02\x02\x02\f\xE8\x03" +
-    "\x02\x02\x02\x0E\xEA\x03\x02\x02\x02\x10\xF0\x03\x02\x02\x02\x12\xF7\x03" +
-    "\x02\x02\x02\x14\xFA\x03\x02\x02\x02\x16\xFC\x03\x02\x02\x02\x18\u0109" +
-    "\x03\x02\x02\x02\x1A\u010D\x03\x02\x02\x02\x1C\u0121\x03\x02\x02\x02\x1E" +
-    "\u0123\x03\x02\x02\x02 \u0132\x03\x02\x02\x02\"\u0134\x03\x02\x02\x02" +
-    "$\u0137\x03\x02\x02\x02&\u0146\x03\x02\x02\x02(\u0148\x03\x02\x02\x02" +
-    "*\u014D\x03\x02\x02\x02,\u014F\x03\x02\x02\x02.\u0151\x03\x02\x02\x02" +
-    "0\u015E\x03\x02\x02\x022\u0162\x03\x02\x02\x024\u0175\x03\x02\x02\x02" +
-    "6\u0177\x03\x02\x02\x028\u0179\x03\x02\x02\x02:\u0185\x03\x02\x02\x02" +
-    "<\u0196\x03\x02\x02\x02>\u0198\x03\x02\x02\x02@\u01A5\x03\x02\x02\x02" +
-    "B\u01A9\x03\x02\x02\x02D\u01B6\x03\x02\x02\x02F\u01C3\x03\x02\x02\x02" +
-    "H\u01C7\x03\x02\x02\x02J\u01C9\x03\x02\x02\x02L\u01CB\x03\x02\x02\x02" +
-    "N\u01CD\x03\x02\x02\x02P\u01E1\x03\x02\x02\x02R\u01E3\x03\x02\x02\x02" +
-    "T\u0201\x03\x02\x02\x02V\u0203\x03\x02\x02\x02X\u0207\x03\x02\x02\x02" +
-    "Z\u020C\x03\x02\x02\x02\\\u020E\x03\x02\x02\x02^\u0219\x03\x02\x02\x02" +
-    "`\u021C\x03\x02\x02\x02b\u021F\x03\x02\x02\x02d\u022C\x03\x02\x02\x02" +
-    "f\u022E\x03\x02\x02\x02h\u023F\x03\x02\x02\x02j\u0241\x03\x02\x02\x02" +
-    "l\u0244\x03\x02\x02\x02n\u0251\x03\x02\x02\x02p\u0255\x03\x02\x02\x02" +
-    "r\u0257\x03\x02\x02\x02t\u025A\x03\x02\x02\x02v\u0272\x03\x02\x02\x02" +
-    "x\u0274\x03\x02\x02\x02z\u0277\x03\x02\x02\x02|\u027A\x03\x02\x02\x02" +
-    "~\u027D\x03\x02\x02\x02\x80\u028C\x03\x02\x02\x02\x82\u0291\x03\x02\x02" +
-    "\x02\x84\u0298\x03\x02\x02\x02\x86\u029A\x03\x02\x02\x02\x88\u02A5\x03" +
-    "\x02\x02\x02\x8A\u02A7\x03\x02\x02\x02\x8C\u02B1\x03\x02\x02\x02\x8E\u02B7" +
-    "\x03\x02\x02\x02\x90\u02BA\x03\x02\x02\x02\x92\u02BC\x03\x02\x02\x02\x94" +
-    "\u02BE\x03\x02\x02\x02\x96\u02C0\x03\x02\x02\x02\x98\u02C9\x03\x02\x02" +
-    "\x02\x9A\u02D1\x03\x02\x02\x02\x9C\u02D3\x03\x02\x02\x02\x9E\u02D5\x03" +
-    "\x02\x02\x02\xA0\u02D7\x03\x02\x02\x02\xA2\u02D9\x03\x02\x02\x02\xA4\u0317" +
-    "\x03\x02\x02\x02\xA6\u034A\x03\x02\x02\x02\xA8\u034D\x03\x02\x02\x02\xAA" +
-    "\u0355\x03\x02\x02\x02\xAC\u035C\x03\x02\x02\x02\xAE\u0367\x03\x02\x02" +
-    "\x02\xB0\u0371\x03\x02\x02\x02\xB2\u0386\x03\x02\x02\x02\xB4\u0388\x03" +
-    "\x02\x02\x02\xB6\u0390\x03\x02\x02\x02\xB8\u0392\x03\x02\x02\x02\xBA\u0394" +
-    "\x03\x02\x02\x02\xBC\u0397\x03\x02\x02\x02\xBE\u03A1\x03\x02\x02\x02\xC0" +
-    "\u03B0\x03\x02\x02\x02\xC2\u03B2\x03\x02\x02\x02\xC4\u03C3\x03\x02\x02" +
-    "\x02\xC6\u03C5\x03\x02\x02\x02\xC8\u03C7\x03\x02\x02\x02\xCA\u03C9\x03" +
-    "\x02\x02\x02\xCC\u03CB\x03\x02\x02\x02\xCE\xD1\x05\x04\x03\x02\xCF\xD1" +
-    "\x07q\x02\x02\xD0\xCE\x03\x02\x02\x02\xD0\xCF\x03\x02\x02\x02\xD1\xD4" +
-    "\x03\x02\x02\x02\xD2\xD0\x03\x02\x02\x02\xD2\xD3\x03\x02\x02\x02\xD3\xD5" +
-    "\x03\x02\x02\x02\xD4\xD2\x03\x02\x02\x02\xD5\xD6\x07\x02\x02\x03\xD6\x03" +
-    "\x03\x02\x02\x02\xD7\xDC\x05\x06\x04\x02\xD8\xDC\x05\x0E\b\x02\xD9\xDC" +
-    "\x05\n\x06\x02\xDA\xDC\x05\x12\n\x02\xDB\xD7\x03\x02\x02\x02\xDB\xD8\x03" +
-    "\x02\x02\x02\xDB\xD9\x03\x02\x02\x02\xDB\xDA\x03\x02\x02\x02\xDC\x05\x03" +
-    "\x02\x02\x02\xDD\xDE\x05\b\x05\x02\xDE\xDF\x05.\x18\x02\xDF\x07\x03\x02" +
-    "\x02\x02\xE0\xE1\t\x02\x02\x02\xE1\t\x03\x02\x02\x02\xE2\xE3\x07\x16\x02" +
-    "\x02\xE3\xE7\x05\x16\f\x02\xE4\xE5\x07\x16\x02\x02\xE5\xE7\x05\f\x07\x02" +
-    "\xE6\xE2\x03\x02\x02\x02\xE6\xE4\x03\x02\x02\x02\xE7\v\x03\x02\x02\x02" +
-    "\xE8\xE9\x05\x1C\x0F\x02\xE9\r\x03\x02\x02\x02\xEA\xEB\x07\x1A\x02\x02" +
-    "\xEB\xEC\x05\x10\t\x02\xEC\x0F\x03\x02\x02\x02\xED\xEE\x05\xCAf\x02\xEE" +
-    "\xEF\x076\x02\x02\xEF\xF1\x03\x02\x02\x02\xF0\xED\x03\x02\x02\x02\xF0" +
-    "\xF1\x03\x02\x02\x02\xF1\xF2\x03\x02\x02\x02\xF2\xF5\x05\xC6d\x02\xF3" +
-    "\xF4\x07A\x02\x02\xF4\xF6\x05\xCCg\x02\xF5\xF3\x03\x02\x02\x02\xF5\xF6" +
-    "\x03\x02\x02\x02\xF6\x11\x03\x02\x02\x02\xF7\xF8\x075\x02\x02\xF8\xF9" +
-    "\x05\x14\v\x02\xF9\x13\x03\x02\x02\x02\xFA\xFB\x07\x03\x02\x02\xFB\x15" +
-    "\x03\x02\x02\x02\xFC\u0103\x05\x18\r\x02\xFD\xFF\x07c\x02\x02\xFE\xFD" +
-    "\x03\x02\x02\x02\xFE\xFF\x03\x02\x02\x02\xFF\u0100\x03\x02\x02\x02\u0100" +
-    "\u0102\x05\x18\r\x02\u0101\xFE\x03\x02\x02\x02\u0102\u0105\x03\x02\x02" +
-    "\x02\u0103\u0101\x03\x02\x02\x02\u0103\u0104\x03\x02\x02\x02\u0104\u0107" +
-    "\x03\x02\x02\x02\u0105\u0103\x03\x02\x02\x02\u0106\u0108\x07c\x02\x02" +
-    "\u0107\u0106\x03\x02\x02\x02\u0107\u0108\x03\x02\x02\x02\u0108\x17\x03" +
-    "\x02\x02\x02\u0109\u010A\x05,\x17\x02\u010A\u010B\x076\x02\x02\u010B\u010C" +
-    "\x05\x1C\x0F\x02\u010C\x19\x03\x02\x02\x02\u010D\u010E\x07k\x02\x02\u010E" +
-    "\x1B\x03\x02\x02\x02\u010F\u0110\x052\x1A\x02\u0110\u0111\x07Y\x02\x02" +
-    "\u0111\u0112\x05\x1E\x10\x02\u0112\u0122\x03\x02\x02\x02\u0113\u0114\x07" +
-    "Y\x02\x02\u0114\u0119\x05,\x17\x02\u0115\u0117\x05\x1A\x0E\x02\u0116\u0115" +
-    "\x03\x02\x02\x02\u0116\u0117\x03\x02\x02\x02\u0117\u0118\x03\x02\x02\x02" +
-    "\u0118\u011A\x05&\x14\x02\u0119\u0116\x03\x02\x02\x02\u0119\u011A\x03" +
-    "\x02\x02\x02\u011A\u011E\x03\x02\x02\x02\u011B\u011D\x05\"\x12\x02\u011C" +
-    "\u011B\x03\x02\x02\x02\u011D\u0120\x03\x02\x02\x02\u011E\u011C\x03\x02" +
-    "\x02\x02\u011E\u011F\x03\x02\x02\x02\u011F\u0122\x03\x02\x02\x02\u0120" +
-    "\u011E\x03\x02\x02\x02\u0121\u010F\x03\x02\x02\x02\u0121\u0113\x03\x02" +
-    "\x02\x02\u0122\x1D\x03\x02\x02\x02\u0123\u0127\x05 \x11\x02\u0124\u0126" +
-    "\x05\"\x12\x02\u0125\u0124\x03\x02\x02\x02\u0126\u0129\x03\x02\x02\x02" +
-    "\u0127\u0125\x03\x02\x02\x02\u0127\u0128\x03\x02\x02\x02\u0128\x1F\x03" +
-    "\x02\x02\x02\u0129\u0127\x03\x02\x02\x02\u012A\u0133\x05&\x14\x02\u012B" +
-    "\u0130\x05*\x16\x02\u012C\u012E\x05\x1A\x0E\x02\u012D\u012C\x03\x02\x02" +
-    "\x02\u012D\u012E\x03\x02\x02\x02\u012E\u012F\x03\x02\x02\x02\u012F\u0131" +
-    "\x05&\x14\x02\u0130\u012D\x03\x02\x02\x02\u0130\u0131\x03\x02\x02\x02" +
-    "\u0131\u0133\x03\x02\x02\x02\u0132\u012A\x03\x02\x02\x02\u0132\u012B\x03" +
-    "\x02\x02\x02\u0133!\x03\x02\x02\x02\u0134\u0135\x07Y\x02\x02\u0135\u0136" +
-    "\x05&\x14\x02\u0136#\x03\x02\x02\x02\u0137\u0138\x07I\x02\x02\u0138\u0139" +
-    "\x07[\x02\x02\u0139\u013A\x05\x9CO\x02\u013A\u013B\x07\\\x02\x02\u013B" +
-    "%\x03\x02\x02\x02\u013C\u0147\x05(\x15\x02\u013D\u0142\x07_\x02\x02\u013E" +
-    "\u0141\x05h5\x02\u013F\u0141\x07q\x02\x02\u0140\u013E\x03\x02\x02\x02" +
-    "\u0140\u013F\x03\x02\x02\x02\u0141\u0144\x03\x02\x02\x02\u0142\u0140\x03" +
-    "\x02\x02\x02\u0142\u0143\x03\x02\x02\x02\u0143\u0145\x03\x02\x02\x02\u0144" +
-    "\u0142\x03\x02\x02\x02\u0145\u0147\x07`\x02\x02\u0146\u013C\x03\x02\x02" +
-    "\x02\u0146\u013D\x03\x02\x02\x02\u0147\'\x03\x02\x02\x02\u0148\u0149\x07" +
-    "_\x02\x02\u0149\u014A\x07D\x02\x02\u014A\u014B\x05\xA4S\x02\u014B\u014C" +
-    "\x07`\x02\x02\u014C)\x03\x02\x02\x02\u014D\u014E\x05\x9EP\x02\u014E+\x03" +
-    "\x02\x02\x02\u014F\u0150\x05\x9EP\x02\u0150-\x03\x02\x02\x02\u0151\u0158" +
-    "\x050\x19\x02\u0152\u0154\x07c\x02\x02\u0153\u0152\x03\x02\x02\x02\u0153" +
-    "\u0154\x03\x02\x02\x02\u0154\u0155\x03\x02\x02\x02\u0155\u0157\x050\x19" +
-    "\x02\u0156\u0153\x03\x02\x02\x02\u0157\u015A\x03\x02\x02\x02\u0158\u0156" +
-    "\x03\x02\x02\x02\u0158\u0159\x03\x02\x02\x02\u0159\u015C\x03\x02\x02\x02" +
-    "\u015A\u0158\x03\x02\x02\x02\u015B\u015D\x07c\x02\x02\u015C\u015B\x03" +
-    "\x02\x02\x02\u015C\u015D\x03\x02\x02\x02\u015D/\x03\x02\x02\x02\u015E" +
-    "\u015F\x056\x1C\x02\u015F\u0160\x076\x02\x02\u0160\u0161\x052\x1A\x02" +
-    "\u01611\x03\x02\x02\x02\u0162\u0167\x054\x1B\x02\u0163\u0165\x05\x1A\x0E" +
-    "\x02\u0164\u0163\x03\x02\x02\x02\u0164\u0165\x03\x02\x02\x02\u0165\u0166" +
-    "\x03\x02\x02\x02\u0166\u0168\x05:\x1E\x02\u0167\u0164\x03\x02\x02\x02" +
-    "\u0167\u0168\x03\x02\x02\x02\u01683\x03\x02\x02\x02\u0169\u0176\x058\x1D" +
-    "\x02\u016A\u0176\x05$\x13\x02\u016B\u016C\x071\x02\x02\u016C\u016D\x07" +
-    "[\x02\x02\u016D\u016E\x05\x1C\x0F\x02\u016E\u016F\x07\\\x02\x02\u016F" +
-    "\u0176\x03\x02\x02\x02\u0170\u0171\x072\x02\x02\u0171\u0172\x07[\x02\x02" +
-    "\u0172\u0173\x05\xC8e\x02\u0173\u0174\x07\\\x02\x02\u0174\u0176\x03\x02" +
-    "\x02\x02\u0175\u0169\x03\x02\x02\x02\u0175\u016A\x03\x02\x02\x02\u0175" +
-    "\u016B\x03\x02\x02\x02\u0175\u0170\x03\x02\x02\x02\u01765\x03\x02\x02" +
-    "\x02\u0177\u0178\x05\x9EP\x02\u01787\x03\x02\x02\x02\u0179\u017A\x05\x9E" +
-    "P\x02\u017A9\x03\x02\x02\x02\u017B\u0180\x07_\x02\x02\u017C\u017F\x05" +
-    "<\x1F\x02\u017D\u017F\x07q\x02\x02\u017E\u017C\x03\x02\x02\x02\u017E\u017D" +
-    "\x03\x02\x02\x02\u017F\u0182\x03\x02\x02\x02\u0180\u017E\x03\x02\x02\x02" +
-    "\u0180\u0181\x03\x02\x02\x02\u0181\u0183\x03\x02\x02\x02\u0182\u0180\x03" +
-    "\x02\x02\x02\u0183\u0186\x07`\x02\x02\u0184\u0186\x05(\x15\x02\u0185\u017B" +
-    "\x03\x02\x02\x02\u0185\u0184\x03\x02\x02\x02\u0186;\x03\x02\x02\x02\u0187" +
-    "\u0188\x07\x07\x02\x02\u0188\u0197\x05B\"\x02\u0189\u018A\x07\x11\x02" +
-    "\x02\u018A\u0197\x05D#\x02\u018B\u0197\x05N(\x02\u018C\u0197\x05P)\x02" +
-    "\u018D\u0197\x05^0\x02\u018E\u018F\x07\x14\x02\x02\u018F\u0197\x05\xB8" +
-    "]\x02\u0190\u0191\x07\x17\x02\x02\u0191\u0197\x05> \x02\u0192\u0193\t" +
-    "\x03\x02\x02\u0193\u0197\x05\xAEX\x02\u0194\u0195\x07\x16\x02\x02\u0195" +
-    "\u0197\x05b2\x02\u0196\u0187\x03\x02\x02\x02\u0196\u0189\x03\x02\x02\x02" +
-    "\u0196\u018B\x03\x02\x02\x02\u0196\u018C\x03\x02\x02\x02\u0196\u018D\x03" +
-    "\x02\x02\x02\u0196\u018E\x03\x02\x02\x02\u0196\u0190\x03\x02\x02\x02\u0196" +
-    "\u0192\x03\x02\x02\x02\u0196\u0194\x03\x02\x02\x02\u0197=\x03\x02\x02" +
-    "\x02\u0198\u019F\x05@!\x02\u0199\u019B\x07c\x02\x02\u019A\u0199\x03\x02" +
-    "\x02\x02\u019A\u019B\x03\x02\x02\x02\u019B\u019C\x03\x02\x02\x02\u019C" +
-    "\u019E\x05@!\x02\u019D\u019A\x03\x02\x02\x02\u019E\u01A1\x03\x02\x02\x02" +
-    "\u019F\u019D\x03\x02\x02\x02\u019F\u01A0\x03\x02\x02\x02\u01A0\u01A3\x03" +
-    "\x02\x02\x02\u01A1\u019F\x03\x02\x02\x02\u01A2\u01A4\x07c\x02\x02\u01A3" +
-    "\u01A2\x03\x02\x02\x02\u01A3\u01A4\x03\x02\x02\x02\u01A4?\x03\x02\x02" +
-    "\x02\u01A5\u01A6\x05\xB8]\x02\u01A6\u01A7\x076\x02\x02\u01A7\u01A8\x05" +
-    "\xB8]\x02\u01A8A\x03\x02\x02\x02\u01A9\u01B0\x05n8\x02\u01AA\u01AC\x07" +
-    "c\x02\x02\u01AB\u01AA\x03\x02\x02\x02\u01AB\u01AC\x03\x02\x02\x02\u01AC" +
-    "\u01AD\x03\x02\x02\x02\u01AD\u01AF\x05n8\x02\u01AE\u01AB\x03\x02\x02\x02" +
-    "\u01AF\u01B2\x03\x02\x02\x02\u01B0\u01AE\x03\x02\x02\x02\u01B0\u01B1\x03" +
-    "\x02\x02\x02\u01B1\u01B4\x03\x02\x02\x02\u01B2\u01B0\x03\x02\x02\x02\u01B3" +
-    "\u01B5\x07c\x02\x02\u01B4\u01B3\x03\x02\x02\x02\u01B4\u01B5\x03\x02\x02" +
-    "\x02\u01B5C\x03\x02\x02\x02\u01B6\u01BD\x05L\'\x02\u01B7\u01B9\x07c\x02" +
-    "\x02\u01B8\u01B7\x03\x02\x02\x02\u01B8\u01B9\x03\x02\x02\x02\u01B9\u01BA" +
-    "\x03\x02\x02\x02\u01BA\u01BC\x05L\'\x02\u01BB\u01B8\x03\x02\x02\x02\u01BC" +
-    "\u01BF\x03\x02\x02\x02\u01BD\u01BB\x03\x02\x02\x02\u01BD\u01BE\x03\x02" +
-    "\x02\x02\u01BE\u01C1\x03\x02\x02\x02\u01BF\u01BD\x03\x02\x02\x02\u01C0" +
-    "\u01C2\x07c\x02\x02\u01C1\u01C0\x03\x02\x02\x02\u01C1\u01C2\x03\x02\x02" +
-    "\x02\u01C2E\x03\x02\x02\x02\u01C3\u01C4\x05H%\x02\u01C4\u01C5\x076\x02" +
-    "\x02\u01C5\u01C6\x05\xA4S\x02\u01C6G\x03\x02\x02\x02\u01C7\u01C8\x05\x9E" +
-    "P\x02\u01C8I\x03\x02\x02\x02\u01C9\u01CA\x05\x9EP\x02\u01CAK\x03\x02\x02" +
-    "\x02\u01CB\u01CC\x05F$\x02\u01CCM\x03\x02\x02\x02\u01CD\u01CE\x07\x06" +
-    "\x02\x02\u01CE\u01D5\x05F$\x02\u01CF\u01D1\x07c\x02\x02\u01D0\u01CF\x03" +
-    "\x02\x02\x02\u01D0\u01D1\x03\x02\x02\x02\u01D1\u01D2\x03\x02\x02\x02\u01D2" +
-    "\u01D4\x05F$\x02\u01D3\u01D0\x03\x02\x02\x02\u01D4\u01D7\x03\x02\x02\x02" +
-    "\u01D5\u01D3\x03\x02\x02\x02\u01D5\u01D6\x03\x02\x02\x02\u01D6\u01D9\x03" +
-    "\x02\x02\x02\u01D7\u01D5\x03\x02\x02\x02\u01D8\u01DA\x07c\x02\x02\u01D9" +
-    "\u01D8\x03\x02\x02\x02\u01D9\u01DA\x03\x02\x02\x02\u01DAO\x03\x02\x02" +
-    "\x02\u01DB\u01DC\x07\x0E\x02\x02\u01DC\u01E2\x05R*\x02\u01DD\u01DE\x07" +
-    "\x0F\x02\x02\u01DE\u01E2\x05R*\x02\u01DF\u01E0\x07\r\x02\x02\u01E0\u01E2" +
-    "\x05";
-MalloyParser._serializedATNSegment1 = "R*\x02\u01E1\u01DB\x03\x02\x02\x02\u01E1\u01DD\x03\x02\x02\x02\u01E1\u01DF" +
-    "\x03\x02\x02\x02\u01E2Q\x03\x02\x02\x02\u01E3\u01EA\x05T+\x02\u01E4\u01E6" +
-    "\x07c\x02\x02\u01E5\u01E4\x03\x02\x02\x02\u01E5\u01E6\x03\x02\x02\x02" +
-    "\u01E6\u01E7\x03\x02\x02\x02\u01E7\u01E9\x05T+\x02\u01E8\u01E5\x03\x02" +
-    "\x02\x02\u01E9\u01EC\x03\x02\x02\x02\u01EA\u01E8\x03\x02\x02\x02\u01EA" +
-    "\u01EB\x03\x02\x02\x02\u01EB\u01EE\x03\x02\x02\x02\u01EC\u01EA\x03\x02" +
-    "\x02\x02\u01ED\u01EF\x07c\x02\x02\u01EE\u01ED\x03\x02\x02\x02\u01EE\u01EF" +
-    "\x03\x02\x02\x02\u01EFS\x03\x02\x02\x02\u01F0\u01F3\x05J&\x02\u01F1\u01F2" +
-    "\x076\x02\x02\u01F2\u01F4\x052\x1A\x02\u01F3\u01F1\x03\x02\x02\x02\u01F3" +
-    "\u01F4\x03\x02\x02\x02\u01F4\u01F5\x03\x02\x02\x02\u01F5\u01F6\x07R\x02" +
-    "\x02\u01F6\u01F7\x05\xA4S\x02\u01F7\u0202\x03\x02\x02\x02\u01F8\u01FB" +
-    "\x05J&\x02\u01F9\u01FA\x076\x02\x02\u01FA\u01FC\x052\x1A\x02\u01FB\u01F9" +
-    "\x03\x02\x02\x02\u01FB\u01FC\x03\x02\x02\x02\u01FC\u01FF\x03\x02\x02\x02" +
-    "\u01FD\u01FE\x07A\x02\x02\u01FE\u0200\x05V,\x02\u01FF\u01FD\x03\x02\x02" +
-    "\x02\u01FF\u0200\x03\x02\x02\x02\u0200\u0202\x03\x02\x02\x02\u0201\u01F0" +
-    "\x03\x02\x02\x02\u0201\u01F8\x03\x02\x02\x02\u0202U\x03\x02\x02\x02\u0203" +
-    "\u0204\x05\xA4S\x02\u0204W\x03\x02\x02\x02\u0205\u0208\x05^0\x02\u0206" +
-    "\u0208\x05`1\x02\u0207\u0205\x03\x02\x02\x02\u0207\u0206\x03\x02\x02\x02" +
-    "\u0208Y\x03\x02\x02\x02\u0209\u020A\x07D\x02\x02\u020A\u020D\x05\xA4S" +
-    "\x02\u020B\u020D\x05^0\x02\u020C\u0209\x03\x02\x02\x02\u020C\u020B\x03" +
-    "\x02\x02\x02\u020D[\x03\x02\x02\x02\u020E\u0213\x05\xA4S\x02\u020F\u0210" +
-    "\x07c\x02\x02\u0210\u0212\x05\xA4S\x02\u0211\u020F\x03\x02\x02\x02\u0212" +
-    "\u0215\x03\x02\x02\x02\u0213\u0211\x03\x02\x02\x02\u0213\u0214\x03\x02" +
-    "\x02\x02\u0214\u0217\x03\x02\x02\x02\u0215\u0213\x03\x02\x02\x02\u0216" +
-    "\u0218\x07c\x02\x02\u0217\u0216\x03\x02\x02\x02\u0217\u0218\x03\x02\x02" +
-    "\x02\u0218]\x03\x02\x02\x02\u0219\u021A\x07\x1C\x02\x02\u021A\u021B\x05" +
-    "\\/\x02\u021B_\x03\x02\x02\x02\u021C\u021D\x07\v\x02\x02\u021D\u021E\x05" +
-    "\\/\x02\u021Ea\x03\x02\x02\x02\u021F\u0226\x05f4\x02\u0220\u0222\x07c" +
-    "\x02\x02\u0221\u0220\x03\x02\x02\x02\u0221\u0222\x03\x02\x02\x02\u0222" +
-    "\u0223\x03\x02\x02\x02\u0223\u0225\x05f4\x02\u0224\u0221\x03\x02\x02\x02" +
-    "\u0225\u0228\x03\x02\x02\x02\u0226\u0224\x03\x02\x02\x02\u0226\u0227\x03" +
-    "\x02\x02\x02\u0227\u022A\x03\x02\x02\x02\u0228\u0226\x03\x02\x02\x02\u0229" +
-    "\u022B\x07c\x02\x02\u022A\u0229\x03\x02\x02\x02\u022A\u022B\x03\x02\x02" +
-    "\x02\u022Bc\x03\x02\x02\x02\u022C\u022D\x05\x9EP\x02\u022De\x03\x02\x02" +
-    "\x02\u022E\u022F\x05d3\x02\u022F\u0230\x076\x02\x02\u0230\u0231\x05\x1E" +
-    "\x10\x02\u0231g\x03\x02\x02\x02\u0232\u0240\x05j6\x02\u0233\u0240\x05" +
-    "N(\x02\u0234\u0240\x05P)\x02\u0235\u0240\x05z>\x02\u0236\u0240\x05\x8C" +
-    "G\x02\u0237\u0240\x05x=\x02\u0238\u0240\x05\x86D\x02\u0239\u0240\x05\x82" +
-    "B\x02\u023A\u0240\x05|?\x02\u023B\u0240\x05^0\x02\u023C\u0240\x05`1\x02" +
-    "\u023D\u0240\x05r:\x02\u023E\u0240\x05\x8EH\x02\u023F\u0232\x03\x02\x02" +
-    "\x02\u023F\u0233\x03\x02\x02\x02\u023F\u0234\x03\x02\x02\x02\u023F\u0235" +
-    "\x03\x02\x02\x02\u023F\u0236\x03\x02\x02\x02\u023F\u0237\x03\x02\x02\x02" +
-    "\u023F\u0238\x03\x02\x02\x02\u023F\u0239\x03\x02\x02\x02\u023F\u023A\x03" +
-    "\x02\x02\x02\u023F\u023B\x03\x02\x02\x02\u023F\u023C\x03\x02\x02\x02\u023F" +
-    "\u023D\x03\x02\x02\x02\u023F\u023E\x03\x02\x02\x02\u0240i\x03\x02\x02" +
-    "\x02\u0241\u0242\x07\n\x02\x02\u0242\u0243\x05l7\x02\u0243k\x03\x02\x02" +
-    "\x02\u0244\u024B\x05p9\x02\u0245\u0247\x07c\x02\x02\u0246\u0245\x03\x02" +
-    "\x02\x02\u0246\u0247\x03\x02\x02\x02\u0247\u0248\x03\x02\x02\x02\u0248" +
-    "\u024A\x05p9\x02\u0249\u0246\x03\x02\x02\x02\u024A\u024D\x03\x02\x02\x02" +
-    "\u024B\u0249\x03\x02\x02\x02\u024B\u024C\x03\x02\x02\x02\u024C\u024F\x03" +
-    "\x02\x02\x02\u024D\u024B\x03\x02\x02\x02\u024E\u0250\x07c\x02\x02\u024F" +
-    "\u024E\x03\x02\x02\x02\u024F\u0250\x03\x02\x02\x02\u0250m\x03\x02\x02" +
-    "\x02\u0251\u0252\x05F$\x02\u0252o\x03\x02\x02\x02\u0253\u0256\x05\xB4" +
-    "[\x02\u0254\u0256\x05n8\x02\u0255\u0253\x03\x02\x02\x02\u0255\u0254\x03" +
-    "\x02\x02\x02\u0256q\x03\x02\x02\x02\u0257\u0258\x07\x12\x02\x02\u0258" +
-    "\u0259\x05t;\x02\u0259s\x03\x02\x02\x02\u025A\u0261\x05v<\x02\u025B\u025D" +
-    "\x07c\x02\x02\u025C\u025B\x03\x02\x02\x02\u025C\u025D\x03\x02\x02\x02" +
-    "\u025D\u025E\x03\x02\x02\x02\u025E\u0260\x05v<\x02\u025F\u025C\x03\x02" +
-    "\x02\x02\u0260\u0263\x03\x02\x02\x02\u0261\u025F\x03\x02\x02\x02\u0261" +
-    "\u0262\x03\x02\x02\x02\u0262\u0265\x03\x02\x02\x02\u0263\u0261\x03\x02" +
-    "\x02\x02\u0264\u0266\x07c\x02\x02\u0265\u0264\x03\x02\x02\x02\u0265\u0266" +
-    "\x03\x02\x02\x02\u0266u\x03\x02\x02\x02\u0267\u026C\x05,\x17\x02\u0268" +
-    "\u026A\x05\x1A\x0E\x02\u0269\u0268\x03\x02\x02\x02\u0269\u026A\x03\x02" +
-    "\x02\x02\u026A\u026B\x03\x02\x02\x02\u026B\u026D\x05&\x14\x02\u026C\u0269" +
-    "\x03\x02\x02\x02\u026C\u026D\x03\x02\x02\x02\u026D\u0273\x03\x02\x02\x02" +
-    "\u026E\u026F\x05,\x17\x02\u026F\u0270\x076\x02\x02\u0270\u0271\x05\x1E" +
-    "\x10\x02\u0271\u0273\x03\x02\x02\x02\u0272\u0267\x03\x02\x02\x02\u0272" +
-    "\u026E\x03\x02\x02\x02\u0273w\x03\x02\x02\x02\u0274\u0275\x07\x05\x02" +
-    "\x02\u0275\u0276\x05l7\x02\u0276y\x03\x02\x02\x02\u0277\u0278\x07\x15" +
-    "\x02\x02\u0278\u0279\x05\xB0Y\x02\u0279{\x03\x02\x02\x02\u027A\u027B\x07" +
-    "\x13\x02\x02\u027B\u027C\x05~@\x02\u027C}\x03\x02\x02\x02\u027D\u0284" +
-    "\x05\x80A\x02\u027E\u0280\x07c\x02\x02\u027F\u027E\x03\x02\x02\x02\u027F" +
-    "\u0280\x03\x02\x02\x02\u0280\u0281\x03\x02\x02\x02\u0281\u0283\x05\x80" +
-    "A\x02\u0282\u027F\x03\x02\x02\x02\u0283\u0286\x03\x02\x02\x02\u0284\u0282" +
-    "\x03\x02\x02\x02\u0284\u0285\x03\x02\x02\x02\u0285\u0288\x03\x02\x02\x02" +
-    "\u0286\u0284\x03\x02\x02\x02\u0287\u0289\x07c\x02\x02\u0288\u0287\x03" +
-    "\x02\x02\x02\u0288\u0289\x03\x02\x02\x02\u0289\x7F\x03\x02\x02\x02\u028A" +
-    "\u028D\x07|\x02\x02\u028B\u028D\x05\xB8]\x02\u028C\u028A\x03\x02\x02\x02" +
-    "\u028C\u028B\x03\x02\x02\x02\u028D\u028F\x03\x02\x02\x02\u028E\u0290\t" +
-    "\x04\x02\x02\u028F\u028E\x03\x02\x02\x02\u028F\u0290\x03\x02\x02\x02\u0290" +
-    "\x81\x03\x02\x02\x02\u0291\u0292\x07\x10\x02\x02\u0292\u0293\x07|\x02" +
-    "\x02\u0293\x83\x03\x02\x02\x02\u0294\u0295\x07#\x02\x02\u0295\u0299\x05" +
-    "\xB8]\x02\u0296\u0297\x07#\x02\x02\u0297\u0299\x05\xA4S\x02\u0298\u0294" +
-    "\x03\x02\x02\x02\u0298\u0296\x03\x02\x02\x02\u0299\x85\x03\x02\x02\x02" +
-    "\u029A\u029B\x07\x1B\x02\x02\u029B\u029D\x07|\x02\x02\u029C\u029E\x05" +
-    "\x84C\x02\u029D\u029C\x03\x02\x02\x02\u029D\u029E\x03\x02\x02\x02\u029E" +
-    "\x87\x03\x02\x02\x02\u029F\u02A2\x05\xB4[\x02\u02A0\u02A1\x07d\x02\x02" +
-    "\u02A1\u02A3\x07m\x02\x02\u02A2\u02A0\x03\x02\x02\x02\u02A2\u02A3\x03" +
-    "\x02\x02\x02\u02A3\u02A6\x03\x02\x02\x02\u02A4\u02A6\x07m\x02\x02\u02A5" +
-    "\u029F\x03\x02\x02\x02\u02A5\u02A4\x03\x02\x02\x02\u02A6\x89\x03\x02\x02" +
-    "\x02\u02A7\u02AE\x05\x88E\x02\u02A8\u02AA\x07c\x02\x02\u02A9\u02A8\x03" +
-    "\x02\x02\x02\u02A9\u02AA\x03\x02\x02\x02\u02AA\u02AB\x03\x02\x02\x02\u02AB" +
-    "\u02AD\x05\x88E\x02\u02AC\u02A9\x03\x02\x02\x02\u02AD\u02B0\x03\x02\x02" +
-    "\x02\u02AE\u02AC\x03\x02\x02\x02\u02AE\u02AF\x03\x02\x02\x02\u02AF\x8B" +
-    "\x03\x02\x02\x02\u02B0\u02AE\x03\x02\x02\x02\u02B1\u02B2\x07\f\x02\x02" +
-    "\u02B2\u02B5\x05\x8AF\x02\u02B3\u02B4\x07#\x02\x02\u02B4\u02B6\x05\xB8" +
-    "]\x02\u02B5\u02B3\x03\x02\x02\x02\u02B5\u02B6\x03\x02\x02\x02\u02B6\x8D" +
-    "\x03\x02\x02\x02\u02B7\u02B8\x07\x18\x02\x02\u02B8\u02B9\x05\x90I\x02" +
-    "\u02B9\x8F\x03\x02\x02\x02\u02BA\u02BB\t\x05\x02\x02\u02BB\x91\x03\x02" +
-    "\x02\x02\u02BC\u02BD\t\x06\x02\x02\u02BD\x93\x03\x02\x02\x02\u02BE\u02BF" +
-    "\t\x07\x02\x02\u02BF\x95\x03\x02\x02\x02\u02C0\u02C1\t\b\x02\x02\u02C1" +
-    "\x97\x03\x02\x02\x02\u02C2\u02CA\x07W\x02\x02\u02C3\u02CA\t\t\x02\x02" +
-    "\u02C4\u02CA\x05\x9AN\x02\u02C5\u02CA\x07?\x02\x02\u02C6\u02CA\t\n\x02" +
-    "\x02\u02C7\u02CA\x07V\x02\x02\u02C8\u02CA\x07>\x02\x02\u02C9\u02C2\x03" +
-    "\x02\x02\x02\u02C9\u02C3\x03\x02\x02\x02\u02C9\u02C4\x03\x02\x02\x02\u02C9" +
-    "\u02C5\x03\x02\x02\x02\u02C9\u02C6\x03\x02\x02\x02\u02C9\u02C7\x03\x02" +
-    "\x02\x02\u02C9\u02C8\x03\x02\x02\x02\u02CA\x99\x03\x02\x02\x02\u02CB\u02D2" +
-    "\x07t\x02\x02\u02CC\u02D2\x07u\x02\x02\u02CD\u02D2\x07x\x02\x02\u02CE" +
-    "\u02D2\x07w\x02\x02\u02CF\u02D2\x07v\x02\x02\u02D0\u02D2\x07y\x02\x02" +
-    "\u02D1\u02CB\x03\x02\x02\x02\u02D1\u02CC\x03\x02\x02\x02\u02D1\u02CD\x03" +
-    "\x02\x02\x02\u02D1\u02CE\x03\x02\x02\x02\u02D1\u02CF\x03\x02\x02\x02\u02D1" +
-    "\u02D0\x03\x02\x02\x02\u02D2\x9B\x03\x02\x02\x02\u02D3\u02D4\x07W\x02" +
-    "\x02\u02D4\x9D\x03\x02\x02\x02\u02D5\u02D6\t\v\x02\x02\u02D6\x9F\x03\x02" +
-    "\x02\x02\u02D7\u02D8\t\f\x02\x02\u02D8\xA1\x03\x02\x02\x02\u02D9\u02DA" +
-    "\t\r\x02\x02\u02DA\xA3\x03\x02\x02\x02\u02DB\u02DC\bS\x01\x02\u02DC\u0318" +
-    "\x05\xB4[\x02\u02DD\u0318\x05\x98M\x02\u02DE\u02DF\x07l\x02\x02\u02DF" +
-    "\u0318\x05\xA4S\x16\u02E0\u02E1\x07=\x02\x02\u02E1\u0318\x05\xA4S\v\u02E2" +
-    "\u02E3\x07%\x02\x02\u02E3\u02E4\x07[\x02\x02\u02E4\u02E5\x05\xA4S\x02" +
-    "\u02E5\u02E6\x07\x1F\x02\x02\u02E6\u02E7\x05\x94K\x02\u02E7\u02E8\x07" +
-    "\\\x02\x02\u02E8\u0318\x03\x02\x02\x02\u02E9\u02EA\x07\'\x02\x02\u02EA" +
-    "\u02EB\x07[\x02\x02\u02EB\u02EC\x07+\x02\x02\u02EC\u02ED\x05\xA4S\x02" +
-    "\u02ED\u02EE\x07\\\x02\x02\u02EE\u0318\x03\x02\x02\x02\u02EF\u02F0\x05" +
-    "\xB4[\x02\u02F0\u02F1\x07d\x02\x02\u02F1\u02F3\x03\x02\x02\x02\u02F2\u02EF" +
-    "\x03\x02\x02\x02\u02F2\u02F3\x03\x02\x02\x02\u02F3\u02F4\x03\x02\x02\x02" +
-    "\u02F4\u02F5\x05\x92J\x02\u02F5\u02F8\x07[\x02\x02\u02F6\u02F9\x05\xA4" +
-    "S\x02\u02F7\u02F9\x07m\x02\x02\u02F8\u02F6\x03\x02\x02\x02\u02F8\u02F7" +
-    "\x03\x02\x02\x02\u02F8\u02F9\x03\x02\x02\x02\u02F9\u02FA\x03\x02\x02\x02" +
-    "\u02FA\u02FB\x07\\\x02\x02\u02FB\u0318\x03\x02\x02\x02\u02FC\u02FD\x07" +
-    "[\x02\x02\u02FD\u02FE\x05\xA6T\x02\u02FE\u02FF\x07\\\x02\x02\u02FF\u0318" +
-    "\x03\x02\x02\x02\u0300\u0303\x05\x9EP\x02\u0301\u0303\x05\xA0Q\x02\u0302" +
-    "\u0300\x03\x02\x02\x02\u0302\u0301\x03\x02\x02\x02\u0303\u0304\x03\x02" +
-    "\x02\x02\u0304\u0306\x07[\x02\x02\u0305\u0307\x05\xACW\x02\u0306\u0305" +
-    "\x03\x02\x02\x02\u0306\u0307\x03\x02\x02\x02\u0307\u0308\x03\x02\x02\x02" +
-    "\u0308\u0309\x07\\\x02\x02\u0309\u0318\x03\x02\x02\x02\u030A\u0318\x05" +
-    "\xA8U\x02\u030B\u030C\x05\xA2R\x02\u030C\u030D\x07[\x02\x02\u030D\u0312" +
-    "\x05\xA4S\x02\u030E\u030F\x07c\x02\x02\u030F\u0311\x05\xB8]\x02\u0310" +
-    "\u030E\x03\x02\x02\x02\u0311\u0314\x03\x02\x02\x02\u0312\u0310\x03\x02" +
-    "\x02\x02\u0312\u0313\x03\x02\x02\x02\u0313\u0315\x03\x02\x02\x02\u0314" +
-    "\u0312\x03\x02\x02\x02\u0315\u0316\x07\\\x02\x02\u0316\u0318\x03\x02\x02" +
-    "\x02\u0317\u02DB\x03\x02\x02\x02\u0317\u02DD\x03\x02\x02\x02\u0317\u02DE" +
-    "\x03\x02\x02\x02\u0317\u02E0\x03\x02\x02\x02\u0317\u02E2\x03\x02\x02\x02" +
-    "\u0317\u02E9\x03\x02\x02\x02\u0317\u02F2\x03\x02\x02\x02\u0317\u02FC\x03" +
-    "\x02\x02\x02\u0317\u0302\x03\x02\x02\x02\u0317\u030A\x03\x02\x02\x02\u0317" +
-    "\u030B\x03\x02\x02\x02\u0318\u0343\x03\x02\x02\x02\u0319\u031A\f\x12\x02" +
-    "\x02\u031A\u031B\t\x0E\x02\x02\u031B\u0342\x05\xA4S\x13\u031C\u031D\f" +
-    "\x11\x02\x02\u031D\u031E\t\x0F\x02\x02\u031E\u0342\x05\xA4S\x12\u031F" +
-    "\u0320\f\x10\x02\x02\u0320\u0321\x07M\x02\x02\u0321\u0342\x05\xA4S\x11" +
-    "\u0322\u0323\f\r\x02\x02\u0323\u0324\x05\x96L\x02\u0324\u0325\x05\xA4" +
-    "S\x0E\u0325\u0342\x03\x02\x02\x02\u0326\u0327\f\n\x02\x02\u0327\u0328" +
-    "\t\x10\x02\x02\u0328\u0342\x05\xA4S\v\u0329\u032A\f\x18\x02\x02\u032A" +
-    "\u032B\x07_\x02\x02\u032B\u032C\x05Z.\x02\u032C\u032D\x07`\x02\x02\u032D" +
-    "\u0342\x03\x02\x02\x02\u032E\u032F\f\x15\x02\x02\u032F\u0342\x05\xA0Q" +
-    "\x02\u0330\u0331\f\x14\x02\x02\u0331\u0332\x07d\x02\x02\u0332\u0342\x05" +
-    "\xA0Q\x02\u0333\u0334\f\x13\x02\x02\u0334\u0335\x07a\x02\x02\u0335\u0342" +
-    "\x05\x94K\x02\u0336\u0337\f\x0F\x02\x02\u0337\u0338\x070\x02\x02\u0338" +
-    "\u0339\x05\xA4S\x02\u0339\u033A\x05\xA0Q\x02\u033A\u0342\x03\x02\x02\x02" +
-    "\u033B\u033C\f\x0E\x02\x02\u033C\u033D\t\x11\x02\x02\u033D\u0342\x05\xA6" +
-    "T\x02\u033E\u033F\f\f\x02\x02\u033F\u0340\t\x12\x02\x02\u0340\u0342\x05" +
-    "\xA6T\x02\u0341\u0319\x03\x02\x02\x02\u0341\u031C\x03\x02\x02\x02\u0341" +
-    "\u031F\x03\x02\x02\x02\u0341\u0322\x03\x02\x02\x02\u0341\u0326\x03\x02" +
-    "\x02\x02\u0341\u0329\x03\x02\x02\x02\u0341\u032E\x03\x02\x02\x02\u0341" +
-    "\u0330\x03\x02\x02\x02\u0341\u0333\x03\x02\x02\x02\u0341\u0336\x03\x02" +
-    "\x02\x02\u0341\u033B\x03\x02\x02\x02\u0341\u033E\x03\x02\x02\x02\u0342" +
-    "\u0345\x03\x02\x02\x02\u0343\u0341\x03\x02\x02\x02\u0343\u0344\x03\x02" +
-    "\x02\x02\u0344\xA5\x03\x02\x02\x02\u0345\u0343\x03\x02\x02\x02\u0346\u0347" +
-    "\x05\x96L\x02\u0347\u0348\x05\xA4S\x02\u0348\u034B\x03\x02\x02\x02\u0349" +
-    "\u034B\x05\xA4S\x02\u034A\u0346\x03\x02\x02\x02\u034A\u0349\x03\x02\x02" +
-    "\x02\u034B\xA7\x03\x02\x02\x02\u034C\u034E\x05\xAAV\x02\u034D\u034C\x03" +
-    "\x02\x02\x02\u034E\u034F\x03\x02\x02\x02\u034F\u034D\x03\x02\x02\x02\u034F" +
-    "\u0350\x03\x02\x02\x02\u0350\u0353\x03\x02\x02\x02\u0351\u0352\x07,\x02" +
-    "\x02\u0352\u0354\x05\xA4S\x02\u0353\u0351\x03\x02\x02\x02\u0353\u0354" +
-    "\x03\x02\x02\x02\u0354\xA9\x03\x02\x02\x02\u0355\u0357\x07C\x02\x02\u0356" +
-    "\u0358\x05\xA4S\x02\u0357\u0356\x03\x02\x02\x02\u0357\u0358\x03\x02\x02" +
-    "\x02\u0358\u0359\x03\x02\x02\x02\u0359\u035A\x07Q\x02\x02\u035A\u035B" +
-    "\x05\xA6T\x02\u035B\xAB\x03\x02\x02\x02\u035C\u0361\x05\xA4S\x02\u035D" +
-    "\u035E\x07c\x02\x02\u035E\u0360\x05\xA4S\x02\u035F\u035D\x03\x02\x02\x02" +
-    "\u0360\u0363\x03\x02\x02\x02\u0361\u035F\x03\x02\x02\x02\u0361\u0362\x03" +
-    "\x02\x02\x02\u0362\u0365\x03\x02\x02\x02\u0363\u0361\x03\x02\x02\x02\u0364" +
-    "\u0366\x07c\x02\x02\u0365\u0364\x03\x02\x02\x02\u0365\u0366\x03\x02\x02" +
-    "\x02\u0366\xAD\x03\x02\x02\x02\u0367\u036E\x05\xB8]\x02\u0368\u036A\x07" +
-    "c\x02\x02\u0369\u0368\x03\x02\x02\x02\u0369\u036A\x03\x02\x02\x02\u036A" +
-    "\u036B\x03\x02\x02\x02\u036B\u036D\x05\xB8]\x02\u036C\u0369\x03\x02\x02" +
-    "\x02\u036D\u0370\x03\x02\x02\x02\u036E\u036C\x03\x02\x02\x02\u036E\u036F" +
-    "\x03\x02\x02\x02\u036F\xAF\x03\x02\x02\x02\u0370\u036E\x03\x02\x02\x02" +
-    "\u0371\u0378\x05\xB2Z\x02\u0372\u0374\x07c\x02\x02\u0373\u0372\x03\x02" +
-    "\x02\x02\u0373\u0374\x03\x02\x02\x02\u0374\u0375\x03\x02\x02\x02\u0375" +
-    "\u0377\x05\xB2Z\x02\u0376\u0373\x03\x02\x02\x02\u0377\u037A\x03\x02\x02" +
-    "\x02\u0378\u0376\x03\x02\x02\x02\u0378\u0379\x03\x02\x02\x02\u0379\u037C" +
-    "\x03\x02\x02\x02\u037A\u0378\x03\x02\x02\x02\u037B\u037D\x07c\x02\x02" +
-    "\u037C\u037B\x03\x02\x02\x02\u037C\u037D\x03\x02\x02\x02\u037D\xB1\x03" +
-    "\x02\x02\x02\u037E\u0387\x05\xB4[\x02\u037F\u0380\x05\xB4[\x02\u0380\u0381" +
-    "\x07d\x02\x02\u0381\u0383\x03\x02\x02\x02\u0382\u037F\x03\x02\x02\x02" +
-    "\u0382\u0383\x03\x02\x02\x02\u0383\u0384\x03\x02\x02\x02\u0384\u0387\t" +
-    "\x13\x02\x02\u0385\u0387\x05F$\x02\u0386\u037E\x03\x02\x02\x02\u0386\u0382" +
-    "\x03\x02\x02\x02\u0386\u0385\x03\x02\x02\x02\u0387\xB3\x03\x02\x02\x02" +
-    "\u0388\u038D\x05\xB8]\x02\u0389\u038A\x07d\x02\x02\u038A\u038C\x05\xB8" +
-    "]\x02\u038B\u0389\x03\x02\x02\x02\u038C\u038F\x03\x02\x02\x02\u038D\u038B" +
-    "\x03\x02\x02\x02\u038D\u038E\x03\x02\x02\x02\u038E\xB5\x03\x02\x02\x02" +
-    "\u038F\u038D\x03\x02\x02\x02\u0390\u0391\x05\x9EP\x02\u0391\xB7\x03\x02" +
-    "\x02\x02\u0392\u0393\x05\x9EP\x02\u0393\xB9\x03\x02\x02\x02\u0394\u0395" +
-    "\x05\xA4S\x02\u0395\u0396\x07\x02\x02\x03\u0396\xBB\x03\x02\x02\x02\u0397" +
-    "\u0398\x05\xBE`\x02\u0398\xBD\x03\x02\x02\x02\u0399\u03A2\x07\x03\x02" +
-    "\x02\u039A\u03A2\x07|\x02\x02\u039B\u03A2\x07}\x02\x02\u039C\u03A2\x05" +
-    "\xC0a\x02\u039D\u03A2\x05\xC4c\x02\u039E\u03A2\x07N\x02\x02\u039F\u03A2" +
-    "\x07/\x02\x02\u03A0\u03A2\x07?\x02\x02\u03A1\u0399\x03\x02\x02\x02\u03A1" +
-    "\u039A\x03\x02\x02\x02\u03A1\u039B\x03\x02\x02\x02\u03A1\u039C\x03\x02" +
-    "\x02\x02\u03A1\u039D\x03\x02\x02\x02\u03A1\u039E\x03\x02\x02\x02\u03A1" +
-    "\u039F\x03\x02\x02\x02\u03A1\u03A0\x03\x02\x02\x02\u03A2\xBF\x03\x02\x02" +
-    "\x02\u03A3\u03A4\x07_\x02\x02\u03A4\u03A9\x05\xC2b\x02\u03A5\u03A6\x07" +
-    "c\x02\x02\u03A6\u03A8\x05\xC2b\x02\u03A7\u03A5\x03\x02\x02\x02\u03A8\u03AB" +
-    "\x03\x02\x02\x02\u03A9\u03A7\x03\x02\x02\x02\u03A9\u03AA\x03\x02\x02\x02" +
-    "\u03AA\u03AC\x03\x02\x02\x02\u03AB\u03A9\x03\x02\x02\x02\u03AC\u03AD\x07" +
-    "`\x02\x02\u03AD\u03B1\x03\x02\x02\x02\u03AE\u03AF\x07_\x02\x02\u03AF\u03B1" +
-    "\x07`\x02\x02\u03B0\u03A3\x03\x02\x02\x02\u03B0\u03AE\x03\x02\x02\x02" +
-    "\u03B1\xC1\x03\x02\x02\x02\u03B2\u03B3\x07\x03\x02\x02\u03B3\u03B4\x07" +
-    "b\x02\x02\u03B4\u03B5\x05\xBE`\x02\u03B5\xC3\x03\x02\x02\x02\u03B6\u03B7" +
-    "\x07]\x02\x02\u03B7\u03BC\x05\xBE`\x02\u03B8\u03B9\x07c\x02\x02\u03B9" +
-    "\u03BB\x05\xBE`\x02\u03BA\u03B8\x03\x02\x02\x02\u03BB\u03BE\x03\x02\x02" +
-    "\x02\u03BC\u03BA\x03\x02\x02\x02\u03BC\u03BD\x03\x02\x02\x02\u03BD\u03BF" +
-    "\x03\x02\x02\x02\u03BE\u03BC\x03\x02\x02\x02\u03BF\u03C0\x07^\x02\x02" +
-    "\u03C0\u03C4\x03\x02\x02\x02\u03C1\u03C2\x07]\x02\x02\u03C2\u03C4\x07" +
-    "^\x02\x02\u03C3\u03B6\x03\x02\x02\x02\u03C3\u03C1\x03\x02\x02\x02\u03C4" +
-    "\xC5\x03\x02\x02\x02\u03C5\u03C6\x07\x82\x02\x02\u03C6\xC7\x03\x02\x02" +
-    "\x02\u03C7\u03C8\x05\x9EP\x02\u03C8\xC9\x03\x02\x02\x02\u03C9\u03CA\x05" +
-    "\x9EP\x02\u03CA\xCB\x03\x02\x02\x02\u03CB\u03CC\x07\x03\x02\x02\u03CC" +
-    "\xCD\x03\x02\x02\x02o\xD0\xD2\xDB\xE6\xF0\xF5\xFE\u0103\u0107\u0116\u0119" +
-    "\u011E\u0121\u0127\u012D\u0130\u0132\u0140\u0142\u0146\u0153\u0158\u015C" +
-    "\u0164\u0167\u0175\u017E\u0180\u0185\u0196\u019A\u019F\u01A3\u01AB\u01B0" +
-    "\u01B4\u01B8\u01BD\u01C1\u01D0\u01D5\u01D9\u01E1\u01E5\u01EA\u01EE\u01F3" +
-    "\u01FB\u01FF\u0201\u0207\u020C\u0213\u0217\u0221\u0226\u022A\u023F\u0246" +
-    "\u024B\u024F\u0255\u025C\u0261\u0265\u0269\u026C\u0272\u027F\u0284\u0288" +
-    "\u028C\u028F\u0298\u029D\u02A2\u02A5\u02A9\u02AE\u02B5\u02C9\u02D1\u02F2" +
-    "\u02F8\u0302\u0306\u0312\u0317\u0341\u0343\u034A\u034F\u0353\u0357\u0361" +
-    "\u0365\u0369\u036E\u0373\u0378\u037C\u0382\u0386\u038D\u03A1\u03A9\u03B0" +
-    "\u03BC\u03C3";
+    "`\x05`\u03A0\n`\x03a\x03a\x03a\x03a\x07a\u03A6\na\fa\x0Ea\u03A9\va\x03" +
+    "a\x03a\x03a\x03a\x05a\u03AF\na\x03b\x03b\x03b\x03b\x03c\x03c\x03c\x03" +
+    "c\x07c\u03B9\nc\fc\x0Ec\u03BC\vc\x03c\x03c\x03c\x03c\x05c\u03C2\nc\x03" +
+    "d\x03d\x03e\x03e\x03f\x03f\x03f\x02\x02\x03\xA4g\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\x02" +
+    "4\x026\x028\x02:\x02<\x02>\x02@\x02B\x02D\x02F\x02H\x02J\x02L\x02N\x02" +
+    "P\x02R\x02T\x02V\x02X\x02Z\x02\\\x02^\x02`\x02b\x02d\x02f\x02h\x02j\x02" +
+    "l\x02n\x02p\x02r\x02t\x02v\x02x\x02z\x02|\x02~\x02\x80\x02\x82\x02\x84" +
+    "\x02\x86\x02\x88\x02\x8A\x02\x8C\x02\x8E\x02\x90\x02\x92\x02\x94\x02\x96" +
+    "\x02\x98\x02\x9A\x02\x9C\x02\x9E\x02\xA0\x02\xA2\x02\xA4\x02\xA6\x02\xA8" +
+    "\x02\xAA\x02\xAC\x02\xAE\x02\xB0\x02\xB2\x02\xB4\x02\xB6\x02\xB8\x02\xBA" +
+    "\x02\xBC\x02\xBE\x02\xC0\x02\xC2\x02\xC4\x02\xC6\x02\xC8\x02\xCA\x02\x02" +
+    "\x14\x04\x02\t\t\x19\x19\x04\x02\x04\x04\b\b\x04\x02!!++\x05\x0200OO|" +
+    "}\x06\x02\"\"((:;II\x07\x02##))AAHHMM\x04\x02fkst\x03\x02}~\x04\x0200" +
+    "OO\x04\x02{{\x7F\x7F\b\x02**55<=FGQQTT\x04\x02\x1E\x1E//\x04\x02nnpp\x03" +
+    "\x02lm\x04\x02\x1F\x1FCC\x04\x02YYqq\x04\x02EEcc\x03\x02no\x02\u040C\x02" +
+    "\xD0\x03\x02\x02\x02\x04\xD9\x03\x02\x02\x02\x06\xDB\x03\x02\x02\x02\b" +
+    "\xDE\x03\x02\x02\x02\n\xE4\x03\x02\x02\x02\f\xE6\x03\x02\x02\x02\x0E\xE8" +
+    "\x03\x02\x02\x02\x10\xEE\x03\x02\x02\x02\x12\xF5\x03\x02\x02\x02\x14\xF8" +
+    "\x03\x02\x02\x02\x16\xFA\x03\x02\x02\x02\x18\u0107\x03\x02\x02\x02\x1A" +
+    "\u010B\x03\x02\x02\x02\x1C\u011F\x03\x02\x02\x02\x1E\u0121\x03\x02\x02" +
+    "\x02 \u0130\x03\x02\x02\x02\"\u0132\x03\x02\x02\x02$\u0135\x03\x02\x02" +
+    "\x02&\u0144\x03\x02\x02\x02(\u0146\x03\x02\x02\x02*\u014B\x03\x02\x02" +
+    "\x02,\u014D\x03\x02\x02\x02.\u014F\x03\x02\x02\x020\u015C\x03\x02\x02" +
+    "\x022\u0160\x03\x02\x02\x024\u0173\x03\x02\x02\x026\u0175\x03\x02\x02" +
+    "\x028\u0177\x03\x02\x02\x02:\u0183\x03\x02\x02\x02<\u0194\x03\x02\x02" +
+    "\x02>\u0196\x03\x02\x02\x02@\u01A3\x03\x02\x02\x02B\u01A7\x03\x02\x02" +
+    "\x02D\u01B4\x03\x02\x02\x02F\u01C1\x03\x02\x02\x02H\u01C5\x03\x02\x02" +
+    "\x02J\u01C7\x03\x02\x02\x02L\u01C9\x03\x02\x02\x02N\u01CB\x03\x02\x02" +
+    "\x02P\u01DF\x03\x02\x02\x02R\u01E1\x03\x02\x02\x02T\u01FF\x03\x02\x02" +
+    "\x02V\u0201\x03\x02\x02\x02X\u0205\x03\x02\x02\x02Z\u020A\x03\x02\x02" +
+    "\x02\\\u020C\x03\x02\x02\x02^\u0217\x03\x02\x02\x02`\u021A\x03\x02\x02" +
+    "\x02b\u021D\x03\x02\x02\x02d\u022A\x03\x02\x02\x02f\u022C\x03\x02\x02" +
+    "\x02h\u023D\x03\x02\x02\x02j\u023F\x03\x02\x02\x02l\u0242\x03\x02\x02" +
+    "\x02n\u024F\x03\x02\x02\x02p\u0253\x03\x02\x02\x02r\u0255\x03\x02\x02" +
+    "\x02t\u0258\x03\x02\x02\x02v\u0270\x03\x02\x02\x02x\u0272\x03\x02\x02" +
+    "\x02z\u0275\x03\x02\x02\x02|\u0278\x03\x02\x02\x02~\u027B\x03\x02\x02" +
+    "\x02\x80\u028A\x03\x02\x02\x02\x82\u028F\x03\x02\x02\x02\x84\u0296\x03" +
+    "\x02\x02\x02\x86\u0298\x03\x02\x02\x02\x88\u02A3\x03\x02\x02\x02\x8A\u02A5" +
+    "\x03\x02\x02\x02\x8C\u02AF\x03\x02\x02\x02\x8E\u02B5\x03\x02\x02\x02\x90" +
+    "\u02B8\x03\x02\x02\x02\x92\u02BA\x03\x02\x02\x02\x94\u02BC\x03\x02\x02" +
+    "\x02\x96\u02BE\x03\x02\x02\x02\x98\u02C7\x03\x02\x02\x02\x9A\u02CF\x03" +
+    "\x02\x02\x02\x9C\u02D1\x03\x02\x02\x02\x9E\u02D3\x03\x02\x02\x02\xA0\u02D5" +
+    "\x03\x02\x02\x02\xA2\u02D7\x03\x02\x02\x02\xA4\u0315\x03\x02\x02\x02\xA6" +
+    "\u0348\x03\x02\x02\x02\xA8\u034B\x03\x02\x02\x02\xAA\u0353\x03\x02\x02" +
+    "\x02\xAC\u035A\x03\x02\x02\x02\xAE\u0365\x03\x02\x02\x02\xB0\u036F\x03" +
+    "\x02\x02\x02\xB2\u0384\x03\x02\x02\x02\xB4\u0386\x03\x02\x02\x02\xB6\u038E" +
+    "\x03\x02\x02\x02\xB8\u0390\x03\x02\x02\x02\xBA\u0392\x03\x02\x02\x02\xBC" +
+    "\u0395\x03\x02\x02\x02\xBE\u039F\x03\x02\x02\x02\xC0\u03AE\x03\x02\x02" +
+    "\x02\xC2\u03B0\x03\x02\x02\x02\xC4\u03C1\x03\x02\x02\x02\xC6\u03C3\x03" +
+    "\x02\x02\x02\xC8\u03C5\x03\x02\x02\x02\xCA\u03C7\x03\x02\x02\x02\xCC\xCF" +
+    "\x05\x04\x03\x02\xCD\xCF\x07r\x02\x02\xCE\xCC\x03\x02\x02\x02\xCE\xCD" +
+    "\x03\x02\x02\x02\xCF\xD2\x03\x02\x02\x02\xD0\xCE\x03\x02\x02\x02\xD0\xD1" +
+    "\x03\x02\x02\x02\xD1\xD3\x03\x02\x02\x02\xD2\xD0\x03\x02\x02\x02\xD3\xD4" +
+    "\x07\x02\x02\x03\xD4\x03\x03\x02\x02\x02\xD5\xDA\x05\x06\x04\x02\xD6\xDA" +
+    "\x05\x0E\b\x02\xD7\xDA\x05\n\x06\x02\xD8\xDA\x05\x12\n\x02\xD9\xD5\x03" +
+    "\x02\x02\x02\xD9\xD6\x03\x02\x02\x02\xD9\xD7\x03\x02\x02\x02\xD9\xD8\x03" +
+    "\x02\x02\x02\xDA\x05\x03\x02\x02\x02\xDB\xDC\x05\b\x05\x02\xDC\xDD\x05" +
+    ".\x18\x02\xDD\x07\x03\x02\x02\x02\xDE\xDF\t\x02\x02\x02\xDF\t\x03\x02" +
+    "\x02\x02\xE0\xE1\x07\x16\x02\x02\xE1\xE5\x05\x16\f\x02\xE2\xE3\x07\x16" +
+    "\x02\x02\xE3\xE5\x05\f\x07\x02\xE4\xE0\x03\x02\x02\x02\xE4\xE2\x03\x02" +
+    "\x02\x02\xE5\v\x03\x02\x02\x02\xE6\xE7\x05\x1C\x0F\x02\xE7\r\x03\x02\x02" +
+    "\x02\xE8\xE9\x07\x1A\x02\x02\xE9\xEA\x05\x10\t\x02\xEA\x0F\x03\x02\x02" +
+    "\x02\xEB\xEC\x05\xC8e\x02\xEC\xED\x077\x02\x02\xED\xEF\x03\x02\x02\x02" +
+    "\xEE\xEB\x03\x02\x02\x02\xEE\xEF\x03\x02\x02\x02\xEF\xF0\x03\x02\x02\x02" +
+    "\xF0\xF3\x07\x83\x02\x02\xF1\xF2\x07B\x02\x02\xF2\xF4\x05\xCAf\x02\xF3" +
+    "\xF1\x03\x02\x02\x02\xF3\xF4\x03\x02\x02\x02\xF4\x11\x03\x02\x02\x02\xF5" +
+    "\xF6\x076\x02\x02\xF6\xF7\x05\x14\v\x02\xF7\x13\x03\x02\x02\x02\xF8\xF9" +
+    "\x07\x03\x02\x02\xF9\x15\x03\x02\x02\x02\xFA\u0101\x05\x18\r\x02\xFB\xFD" +
+    "\x07d\x02\x02\xFC\xFB\x03\x02\x02\x02\xFC\xFD\x03\x02\x02\x02\xFD\xFE" +
+    "\x03\x02\x02\x02\xFE\u0100\x05\x18\r\x02\xFF\xFC\x03\x02\x02\x02\u0100" +
+    "\u0103\x03\x02\x02\x02\u0101\xFF\x03\x02\x02\x02\u0101\u0102\x03\x02\x02" +
+    "\x02\u0102\u0105\x03\x02\x02\x02\u0103\u0101\x03\x02\x02\x02\u0104\u0106" +
+    "\x07d\x02\x02\u0105\u0104\x03\x02\x02\x02\u0105\u0106\x03\x02\x02\x02" +
+    "\u0106\x17\x03\x02\x02\x02\u0107\u0108\x05,\x17\x02\u0108\u0109\x077\x02" +
+    "\x02\u0109\u010A\x05\x1C\x0F\x02\u010A\x19\x03\x02\x02\x02\u010B\u010C" +
+    "\x07l\x02\x02\u010C\x1B\x03\x02\x02\x02\u010D\u010E\x052\x1A\x02\u010E" +
+    "\u010F\x07Z\x02\x02\u010F\u0110\x05\x1E\x10\x02\u0110\u0120\x03\x02\x02" +
+    "\x02\u0111\u0112\x07Z\x02\x02\u0112\u0117\x05,\x17\x02\u0113\u0115\x05" +
+    "\x1A\x0E\x02\u0114\u0113\x03\x02\x02\x02\u0114\u0115\x03\x02\x02\x02\u0115" +
+    "\u0116\x03\x02\x02\x02\u0116\u0118\x05&\x14\x02\u0117\u0114\x03\x02\x02" +
+    "\x02\u0117\u0118\x03\x02\x02\x02\u0118\u011C\x03\x02\x02\x02\u0119\u011B" +
+    "\x05\"\x12\x02\u011A\u0119\x03\x02\x02\x02\u011B\u011E\x03\x02\x02\x02" +
+    "\u011C\u011A\x03\x02\x02\x02\u011C\u011D\x03\x02\x02\x02\u011D\u0120\x03" +
+    "\x02\x02\x02\u011E\u011C\x03\x02\x02\x02\u011F\u010D\x03\x02\x02\x02\u011F" +
+    "\u0111\x03\x02\x02\x02\u0120\x1D\x03\x02\x02\x02\u0121\u0125\x05 \x11" +
+    "\x02\u0122\u0124\x05\"\x12\x02\u0123\u0122\x03\x02\x02\x02\u0124\u0127" +
+    "\x03\x02\x02\x02\u0125\u0123\x03\x02\x02\x02\u0125\u0126\x03\x02\x02\x02" +
+    "\u0126\x1F\x03\x02\x02\x02\u0127\u0125\x03\x02\x02\x02\u0128\u0131\x05" +
+    "&\x14\x02\u0129\u012E\x05*\x16\x02\u012A\u012C\x05\x1A\x0E\x02\u012B\u012A" +
+    "\x03\x02\x02\x02\u012B\u012C\x03\x02\x02\x02\u012C\u012D\x03\x02\x02\x02" +
+    "\u012D\u012F\x05&\x14\x02\u012E\u012B\x03\x02\x02\x02\u012E\u012F\x03" +
+    "\x02\x02\x02\u012F\u0131\x03\x02\x02\x02\u0130\u0128\x03\x02\x02\x02\u0130" +
+    "\u0129\x03\x02\x02\x02\u0131!\x03\x02\x02\x02\u0132\u0133\x07Z\x02\x02" +
+    "\u0133\u0134\x05&\x14\x02\u0134#\x03\x02\x02\x02\u0135\u0136\x07J\x02" +
+    "\x02\u0136\u0137\x07\\\x02\x02\u0137\u0138\x05\x9CO\x02\u0138\u0139\x07" +
+    "]\x02\x02\u0139%\x03\x02\x02\x02\u013A\u0145\x05(\x15\x02\u013B\u0140" +
+    "\x07`\x02\x02\u013C\u013F\x05h5\x02\u013D\u013F\x07r\x02\x02\u013E\u013C" +
+    "\x03\x02\x02\x02\u013E\u013D\x03\x02\x02\x02\u013F\u0142\x03\x02\x02\x02" +
+    "\u0140\u013E\x03\x02\x02\x02\u0140\u0141\x03\x02\x02\x02\u0141\u0143\x03" +
+    "\x02\x02\x02\u0142\u0140\x03\x02\x02\x02\u0143\u0145\x07a\x02\x02\u0144" +
+    "\u013A\x03\x02\x02\x02\u0144\u013B\x03\x02\x02\x02\u0145\'\x03\x02\x02" +
+    "\x02\u0146\u0147\x07`\x02\x02\u0147\u0148\x07E\x02\x02\u0148\u0149\x05" +
+    "\xA4S\x02\u0149\u014A\x07a\x02\x02\u014A)\x03\x02\x02\x02\u014B\u014C" +
+    "\x05\x9EP\x02\u014C+\x03\x02\x02\x02\u014D\u014E\x05\x9EP\x02\u014E-\x03" +
+    "\x02\x02\x02\u014F\u0156\x050\x19\x02\u0150\u0152\x07d\x02\x02\u0151\u0150" +
+    "\x03\x02\x02\x02\u0151\u0152\x03\x02\x02\x02\u0152\u0153\x03\x02\x02\x02" +
+    "\u0153\u0155\x050\x19\x02\u0154\u0151\x03\x02\x02\x02\u0155\u0158\x03" +
+    "\x02\x02\x02\u0156\u0154\x03\x02\x02\x02\u0156\u0157\x03\x02\x02\x02\u0157" +
+    "\u015A\x03\x02\x02\x02\u0158\u0156\x03\x02\x02\x02\u0159\u015B\x07d\x02" +
+    "\x02\u015A\u0159\x03\x02\x02\x02\u015A\u015B\x03\x02\x02\x02\u015B/\x03" +
+    "\x02\x02\x02\u015C\u015D\x056\x1C\x02\u015D\u015E\x077\x02\x02\u015E\u015F" +
+    "\x052\x1A\x02\u015F1\x03\x02\x02\x02\u0160\u0165\x054\x1B\x02\u0161\u0163" +
+    "\x05\x1A\x0E\x02\u0162\u0161\x03\x02\x02\x02\u0162\u0163\x03\x02\x02\x02" +
+    "\u0163\u0164\x03\x02\x02\x02\u0164\u0166\x05:\x1E\x02\u0165\u0162\x03" +
+    "\x02\x02\x02\u0165\u0166\x03\x02\x02\x02\u01663\x03\x02\x02\x02\u0167" +
+    "\u0174\x058\x1D\x02\u0168\u0174\x05$\x13\x02\u0169\u016A\x072\x02\x02" +
+    "\u016A\u016B\x07\\\x02\x02\u016B\u016C\x05\x1C\x0F\x02\u016C\u016D\x07" +
+    "]\x02\x02\u016D\u0174\x03\x02\x02\x02\u016E\u016F\x073\x02\x02\u016F\u0170" +
+    "\x07\\\x02\x02\u0170\u0171\x05\xC6d\x02\u0171\u0172\x07]\x02\x02\u0172" +
+    "\u0174\x03\x02\x02\x02\u0173\u0167\x03\x02\x02\x02\u0173\u0168\x03\x02" +
+    "\x02\x02\u0173\u0169\x03\x02\x02\x02\u0173\u016E\x03\x02\x02\x02\u0174" +
+    "5\x03\x02\x02\x02\u0175\u0176\x05\x9EP\x02\u01767\x03\x02\x02\x02\u0177" +
+    "\u0178\x05\x9EP\x02\u01789\x03\x02\x02\x02\u0179\u017E\x07`\x02\x02\u017A" +
+    "\u017D\x05<\x1F\x02\u017B\u017D\x07r\x02\x02\u017C\u017A\x03\x02\x02\x02" +
+    "\u017C\u017B\x03\x02\x02\x02\u017D\u0180\x03\x02\x02\x02\u017E\u017C\x03" +
+    "\x02\x02\x02\u017E\u017F\x03\x02\x02\x02\u017F\u0181\x03\x02\x02\x02\u0180" +
+    "\u017E\x03\x02\x02\x02\u0181\u0184\x07a\x02\x02\u0182\u0184\x05(\x15\x02" +
+    "\u0183\u0179\x03\x02\x02\x02\u0183\u0182\x03\x02\x02\x02\u0184;\x03\x02" +
+    "\x02\x02\u0185\u0186\x07\x07\x02\x02\u0186\u0195\x05B\"\x02\u0187\u0188" +
+    "\x07\x11\x02\x02\u0188\u0195\x05D#\x02\u0189\u0195\x05N(\x02\u018A\u0195" +
+    "\x05P)\x02\u018B\u0195\x05^0\x02\u018C\u018D\x07\x14\x02\x02\u018D\u0195" +
+    "\x05\xB8]\x02\u018E\u018F\x07\x17\x02\x02\u018F\u0195\x05> \x02\u0190" +
+    "\u0191\t\x03\x02\x02\u0191\u0195\x05\xAEX\x02\u0192\u0193\x07\x16\x02" +
+    "\x02\u0193\u0195\x05b2\x02\u0194\u0185\x03\x02\x02\x02\u0194\u0187\x03" +
+    "\x02\x02\x02\u0194\u0189\x03\x02\x02\x02\u0194\u018A\x03\x02\x02\x02\u0194" +
+    "\u018B\x03\x02\x02\x02\u0194\u018C\x03\x02\x02\x02\u0194\u018E\x03\x02" +
+    "\x02\x02\u0194\u0190\x03\x02\x02\x02\u0194\u0192\x03\x02\x02\x02\u0195" +
+    "=\x03\x02\x02\x02\u0196\u019D\x05@!\x02\u0197\u0199\x07d\x02\x02\u0198" +
+    "\u0197\x03\x02\x02\x02\u0198\u0199\x03\x02\x02\x02\u0199\u019A\x03\x02" +
+    "\x02\x02\u019A\u019C\x05@!\x02\u019B\u0198\x03\x02\x02\x02\u019C\u019F" +
+    "\x03\x02\x02\x02\u019D\u019B\x03\x02\x02\x02\u019D\u019E\x03\x02\x02\x02" +
+    "\u019E\u01A1\x03\x02\x02\x02\u019F\u019D\x03\x02\x02\x02\u01A0\u01A2\x07" +
+    "d\x02\x02\u01A1\u01A0\x03\x02\x02\x02\u01A1\u01A2\x03\x02\x02\x02\u01A2" +
+    "?\x03\x02\x02\x02\u01A3\u01A4\x05\xB8]\x02\u01A4\u01A5\x077\x02\x02\u01A5" +
+    "\u01A6\x05\xB8]\x02\u01A6A\x03\x02\x02\x02\u01A7\u01AE\x05n8\x02\u01A8" +
+    "\u01AA\x07d\x02\x02\u01A9\u01A8\x03\x02\x02\x02\u01A9\u01AA\x03\x02\x02" +
+    "\x02\u01AA\u01AB\x03\x02\x02\x02\u01AB\u01AD\x05n8\x02\u01AC\u01A9\x03" +
+    "\x02\x02\x02\u01AD\u01B0\x03\x02\x02\x02\u01AE\u01AC\x03\x02\x02\x02\u01AE" +
+    "\u01AF\x03\x02\x02\x02\u01AF\u01B2\x03\x02\x02\x02\u01B0\u01AE\x03\x02" +
+    "\x02\x02\u01B1\u01B3\x07d\x02\x02\u01B2\u01B1\x03\x02\x02\x02\u01B2\u01B3" +
+    "\x03\x02\x02\x02\u01B3C\x03\x02\x02\x02\u01B4\u01BB\x05L\'\x02\u01B5\u01B7" +
+    "\x07d\x02\x02\u01B6\u01B5\x03\x02\x02\x02\u01B6\u01B7\x03\x02\x02\x02" +
+    "\u01B7\u01B8\x03\x02\x02\x02\u01B8\u01BA\x05L\'\x02\u01B9\u01B6\x03\x02" +
+    "\x02\x02\u01BA\u01BD\x03\x02\x02\x02\u01BB\u01B9\x03\x02\x02\x02\u01BB" +
+    "\u01BC\x03\x02\x02\x02\u01BC\u01BF\x03\x02\x02\x02\u01BD\u01BB\x03\x02" +
+    "\x02\x02\u01BE\u01C0\x07d\x02\x02\u01BF\u01BE\x03\x02\x02\x02\u01BF\u01C0" +
+    "\x03\x02\x02\x02\u01C0E\x03\x02\x02\x02\u01C1\u01C2\x05H%\x02\u01C2\u01C3" +
+    "\x077\x02\x02\u01C3\u01C4\x05\xA4S\x02\u01C4G\x03\x02\x02\x02\u01C5\u01C6" +
+    "\x05\x9EP\x02\u01C6I\x03\x02\x02\x02\u01C7\u01C8\x05\x9EP\x02\u01C8K\x03" +
+    "\x02\x02\x02\u01C9\u01CA\x05F$\x02\u01CAM\x03\x02\x02\x02\u01CB\u01CC" +
+    "\x07\x06\x02\x02\u01CC\u01D3\x05F$\x02\u01CD\u01CF\x07d\x02\x02\u01CE" +
+    "\u01CD\x03\x02\x02\x02\u01CE\u01CF\x03\x02\x02\x02\u01CF\u01D0\x03\x02" +
+    "\x02\x02\u01D0\u01D2\x05F$\x02\u01D1\u01CE\x03\x02\x02\x02\u01D2\u01D5" +
+    "\x03\x02\x02\x02\u01D3\u01D1\x03\x02\x02\x02\u01D3\u01D4\x03\x02\x02\x02" +
+    "\u01D4\u01D7\x03\x02\x02\x02\u01D5\u01D3\x03\x02\x02\x02\u01D6\u01D8\x07" +
+    "d\x02\x02\u01D7\u01D6\x03\x02\x02\x02\u01D7\u01D8\x03\x02\x02\x02\u01D8" +
+    "O\x03\x02\x02\x02\u01D9\u01DA\x07\x0E\x02\x02\u01DA\u01E0\x05R*\x02\u01DB" +
+    "\u01DC\x07\x0F\x02\x02\u01DC\u01E0\x05R*\x02\u01DD\u01DE\x07\r\x02\x02" +
+    "\u01DE\u01E0\x05R*\x02\u01DF\u01D9\x03\x02\x02\x02\u01DF\u01DB\x03\x02" +
+    "\x02\x02\u01DF";
+MalloyParser._serializedATNSegment1 = "\u01DD\x03\x02\x02\x02\u01E0Q\x03\x02\x02\x02\u01E1\u01E8\x05T+\x02\u01E2" +
+    "\u01E4\x07d\x02\x02\u01E3\u01E2\x03\x02\x02\x02\u01E3\u01E4\x03\x02\x02" +
+    "\x02\u01E4\u01E5\x03\x02\x02\x02\u01E5\u01E7\x05T+\x02\u01E6\u01E3\x03" +
+    "\x02\x02\x02\u01E7\u01EA\x03\x02\x02\x02\u01E8\u01E6\x03\x02\x02\x02\u01E8" +
+    "\u01E9\x03\x02\x02\x02\u01E9\u01EC\x03\x02\x02\x02\u01EA\u01E8\x03\x02" +
+    "\x02\x02\u01EB\u01ED\x07d\x02\x02\u01EC\u01EB\x03\x02\x02\x02\u01EC\u01ED" +
+    "\x03\x02\x02\x02\u01EDS\x03\x02\x02\x02\u01EE\u01F1\x05J&\x02\u01EF\u01F0" +
+    "\x077\x02\x02\u01F0\u01F2\x052\x1A\x02\u01F1\u01EF\x03\x02\x02\x02\u01F1" +
+    "\u01F2\x03\x02\x02\x02\u01F2\u01F3\x03\x02\x02\x02\u01F3\u01F4\x07S\x02" +
+    "\x02\u01F4\u01F5\x05\xA4S\x02\u01F5\u0200\x03\x02\x02\x02\u01F6\u01F9" +
+    "\x05J&\x02\u01F7\u01F8\x077\x02\x02\u01F8\u01FA\x052\x1A\x02\u01F9\u01F7" +
+    "\x03\x02\x02\x02\u01F9\u01FA\x03\x02\x02\x02\u01FA\u01FD\x03\x02\x02\x02" +
+    "\u01FB\u01FC\x07B\x02\x02\u01FC\u01FE\x05V,\x02\u01FD\u01FB\x03\x02\x02" +
+    "\x02\u01FD\u01FE\x03\x02\x02\x02\u01FE\u0200\x03\x02\x02\x02\u01FF\u01EE" +
+    "\x03\x02\x02\x02\u01FF\u01F6\x03\x02\x02\x02\u0200U\x03\x02\x02\x02\u0201" +
+    "\u0202\x05\xA4S\x02\u0202W\x03\x02\x02\x02\u0203\u0206\x05^0\x02\u0204" +
+    "\u0206\x05`1\x02\u0205\u0203\x03\x02\x02\x02\u0205\u0204\x03\x02\x02\x02" +
+    "\u0206Y\x03\x02\x02\x02\u0207\u0208\x07E\x02\x02\u0208\u020B\x05\xA4S" +
+    "\x02\u0209\u020B\x05^0\x02\u020A\u0207\x03\x02\x02\x02\u020A\u0209\x03" +
+    "\x02\x02\x02\u020B[\x03\x02\x02\x02\u020C\u0211\x05\xA4S\x02\u020D\u020E" +
+    "\x07d\x02\x02\u020E\u0210\x05\xA4S\x02\u020F\u020D\x03\x02\x02\x02\u0210" +
+    "\u0213\x03\x02\x02\x02\u0211\u020F\x03\x02\x02\x02\u0211\u0212\x03\x02" +
+    "\x02\x02\u0212\u0215\x03\x02\x02\x02\u0213\u0211\x03\x02\x02\x02\u0214" +
+    "\u0216\x07d\x02\x02\u0215\u0214\x03\x02\x02\x02\u0215\u0216\x03\x02\x02" +
+    "\x02\u0216]\x03\x02\x02\x02\u0217\u0218\x07\x1D\x02\x02\u0218\u0219\x05" +
+    "\\/\x02\u0219_\x03\x02\x02\x02\u021A\u021B\x07\v\x02\x02\u021B\u021C\x05" +
+    "\\/\x02\u021Ca\x03\x02\x02\x02\u021D\u0224\x05f4\x02\u021E\u0220\x07d" +
+    "\x02\x02\u021F\u021E\x03\x02\x02\x02\u021F\u0220\x03\x02\x02\x02\u0220" +
+    "\u0221\x03\x02\x02\x02\u0221\u0223\x05f4\x02\u0222\u021F\x03\x02\x02\x02" +
+    "\u0223\u0226\x03\x02\x02\x02\u0224\u0222\x03\x02\x02\x02\u0224\u0225\x03" +
+    "\x02\x02\x02\u0225\u0228\x03\x02\x02\x02\u0226\u0224\x03\x02\x02\x02\u0227" +
+    "\u0229\x07d\x02\x02\u0228\u0227\x03\x02\x02\x02\u0228\u0229\x03\x02\x02" +
+    "\x02\u0229c\x03\x02\x02\x02\u022A\u022B\x05\x9EP\x02\u022Be\x03\x02\x02" +
+    "\x02\u022C\u022D\x05d3\x02\u022D\u022E\x077\x02\x02\u022E\u022F\x05\x1E" +
+    "\x10\x02\u022Fg\x03\x02\x02\x02\u0230\u023E\x05j6\x02\u0231\u023E\x05" +
+    "N(\x02\u0232\u023E\x05P)\x02\u0233\u023E\x05z>\x02\u0234\u023E\x05\x8C" +
+    "G\x02\u0235\u023E\x05x=\x02\u0236\u023E\x05\x86D\x02\u0237\u023E\x05\x82" +
+    "B\x02\u0238\u023E\x05|?\x02\u0239\u023E\x05^0\x02\u023A\u023E\x05`1\x02" +
+    "\u023B\u023E\x05r:\x02\u023C\u023E\x05\x8EH\x02\u023D\u0230\x03\x02\x02" +
+    "\x02\u023D\u0231\x03\x02\x02\x02\u023D\u0232\x03\x02\x02\x02\u023D\u0233" +
+    "\x03\x02\x02\x02\u023D\u0234\x03\x02\x02\x02\u023D\u0235\x03\x02\x02\x02" +
+    "\u023D\u0236\x03\x02\x02\x02\u023D\u0237\x03\x02\x02\x02\u023D\u0238\x03" +
+    "\x02\x02\x02\u023D\u0239\x03\x02\x02\x02\u023D\u023A\x03\x02\x02\x02\u023D" +
+    "\u023B\x03\x02\x02\x02\u023D\u023C\x03\x02\x02\x02\u023Ei\x03\x02\x02" +
+    "\x02\u023F\u0240\x07\n\x02\x02\u0240\u0241\x05l7\x02\u0241k\x03\x02\x02" +
+    "\x02\u0242\u0249\x05p9\x02\u0243\u0245\x07d\x02\x02\u0244\u0243\x03\x02" +
+    "\x02\x02\u0244\u0245\x03\x02\x02\x02\u0245\u0246\x03\x02\x02\x02\u0246" +
+    "\u0248\x05p9\x02\u0247\u0244\x03\x02\x02\x02\u0248\u024B\x03\x02\x02\x02" +
+    "\u0249\u0247\x03\x02\x02\x02\u0249\u024A\x03\x02\x02\x02\u024A\u024D\x03" +
+    "\x02\x02\x02\u024B\u0249\x03\x02\x02\x02\u024C\u024E\x07d\x02\x02\u024D" +
+    "\u024C\x03\x02\x02\x02\u024D\u024E\x03\x02\x02\x02\u024Em\x03\x02\x02" +
+    "\x02\u024F\u0250\x05F$\x02\u0250o\x03\x02\x02\x02\u0251\u0254\x05\xB4" +
+    "[\x02\u0252\u0254\x05n8\x02\u0253\u0251\x03\x02\x02\x02\u0253\u0252\x03" +
+    "\x02\x02\x02\u0254q\x03\x02\x02\x02\u0255\u0256\x07\x12\x02\x02\u0256" +
+    "\u0257\x05t;\x02\u0257s\x03\x02\x02\x02\u0258\u025F\x05v<\x02\u0259\u025B" +
+    "\x07d\x02\x02\u025A\u0259\x03\x02\x02\x02\u025A\u025B\x03\x02\x02\x02" +
+    "\u025B\u025C\x03\x02\x02\x02\u025C\u025E\x05v<\x02\u025D\u025A\x03\x02" +
+    "\x02\x02\u025E\u0261\x03\x02\x02\x02\u025F\u025D\x03\x02\x02\x02\u025F" +
+    "\u0260\x03\x02\x02\x02\u0260\u0263\x03\x02\x02\x02\u0261\u025F\x03\x02" +
+    "\x02\x02\u0262\u0264\x07d\x02\x02\u0263\u0262\x03\x02\x02\x02\u0263\u0264" +
+    "\x03\x02\x02\x02\u0264u\x03\x02\x02\x02\u0265\u026A\x05,\x17\x02\u0266" +
+    "\u0268\x05\x1A\x0E\x02\u0267\u0266\x03\x02\x02\x02\u0267\u0268\x03\x02" +
+    "\x02\x02\u0268\u0269\x03\x02\x02\x02\u0269\u026B\x05&\x14\x02\u026A\u0267" +
+    "\x03\x02\x02\x02\u026A\u026B\x03\x02\x02\x02\u026B\u0271\x03\x02\x02\x02" +
+    "\u026C\u026D\x05,\x17\x02\u026D\u026E\x077\x02\x02\u026E\u026F\x05\x1E" +
+    "\x10\x02\u026F\u0271\x03\x02\x02\x02\u0270\u0265\x03\x02\x02\x02\u0270" +
+    "\u026C\x03\x02\x02\x02\u0271w\x03\x02\x02\x02\u0272\u0273\x07\x05\x02" +
+    "\x02\u0273\u0274\x05l7\x02\u0274y\x03\x02\x02\x02\u0275\u0276\x07\x15" +
+    "\x02\x02\u0276\u0277\x05\xB0Y\x02\u0277{\x03\x02\x02\x02\u0278\u0279\x07" +
+    "\x13\x02\x02\u0279\u027A\x05~@\x02\u027A}\x03\x02\x02\x02\u027B\u0282" +
+    "\x05\x80A\x02\u027C\u027E\x07d\x02\x02\u027D\u027C\x03\x02\x02\x02\u027D" +
+    "\u027E\x03\x02\x02\x02\u027E\u027F\x03\x02\x02\x02\u027F\u0281\x05\x80" +
+    "A\x02\u0280\u027D\x03\x02\x02\x02\u0281\u0284\x03\x02\x02\x02\u0282\u0280" +
+    "\x03\x02\x02\x02\u0282\u0283\x03\x02\x02\x02\u0283\u0286\x03\x02\x02\x02" +
+    "\u0284\u0282\x03\x02\x02\x02\u0285\u0287\x07d\x02\x02\u0286\u0285\x03" +
+    "\x02\x02\x02\u0286\u0287\x03\x02\x02\x02\u0287\x7F\x03\x02\x02\x02\u0288" +
+    "\u028B\x07}\x02\x02\u0289\u028B\x05\xB8]\x02\u028A\u0288\x03\x02\x02\x02" +
+    "\u028A\u0289\x03\x02\x02\x02\u028B\u028D\x03\x02\x02\x02\u028C\u028E\t" +
+    "\x04\x02\x02\u028D\u028C\x03\x02\x02\x02\u028D\u028E\x03\x02\x02\x02\u028E" +
+    "\x81\x03\x02\x02\x02\u028F\u0290\x07\x10\x02\x02\u0290\u0291\x07}\x02" +
+    "\x02\u0291\x83\x03\x02\x02\x02\u0292\u0293\x07$\x02\x02\u0293\u0297\x05" +
+    "\xB8]\x02\u0294\u0295\x07$\x02\x02\u0295\u0297\x05\xA4S\x02\u0296\u0292" +
+    "\x03\x02\x02\x02\u0296\u0294\x03\x02\x02\x02\u0297\x85\x03\x02\x02\x02" +
+    "\u0298\u0299\x07\x1C\x02\x02\u0299\u029B\x07}\x02\x02\u029A\u029C\x05" +
+    "\x84C\x02\u029B\u029A\x03\x02\x02\x02\u029B\u029C\x03\x02\x02\x02\u029C" +
+    "\x87\x03\x02\x02\x02\u029D\u02A0\x05\xB4[\x02\u029E\u029F\x07e\x02\x02" +
+    "\u029F\u02A1\x07n\x02\x02\u02A0\u029E\x03\x02\x02\x02\u02A0\u02A1\x03" +
+    "\x02\x02\x02\u02A1\u02A4\x03\x02\x02\x02\u02A2\u02A4\x07n\x02\x02\u02A3" +
+    "\u029D\x03\x02\x02\x02\u02A3\u02A2\x03\x02\x02\x02\u02A4\x89\x03\x02\x02" +
+    "\x02\u02A5\u02AC\x05\x88E\x02\u02A6\u02A8\x07d\x02\x02\u02A7\u02A6\x03" +
+    "\x02\x02\x02\u02A7\u02A8\x03\x02\x02\x02\u02A8\u02A9\x03\x02\x02\x02\u02A9" +
+    "\u02AB\x05\x88E\x02\u02AA\u02A7\x03\x02\x02\x02\u02AB\u02AE\x03\x02\x02" +
+    "\x02\u02AC\u02AA\x03\x02\x02\x02\u02AC\u02AD\x03\x02\x02\x02\u02AD\x8B" +
+    "\x03\x02\x02\x02\u02AE\u02AC\x03\x02\x02\x02\u02AF\u02B0\x07\f\x02\x02" +
+    "\u02B0\u02B3\x05\x8AF\x02\u02B1\u02B2\x07$\x02\x02\u02B2\u02B4\x05\xB8" +
+    "]\x02\u02B3\u02B1\x03\x02\x02\x02\u02B3\u02B4\x03\x02\x02\x02\u02B4\x8D" +
+    "\x03\x02\x02\x02\u02B5\u02B6\x07\x18\x02\x02\u02B6\u02B7\x05\x90I\x02" +
+    "\u02B7\x8F\x03\x02\x02\x02\u02B8\u02B9\t\x05\x02\x02\u02B9\x91\x03\x02" +
+    "\x02\x02\u02BA\u02BB\t\x06\x02\x02\u02BB\x93\x03\x02\x02\x02\u02BC\u02BD" +
+    "\t\x07\x02\x02\u02BD\x95\x03\x02\x02\x02\u02BE\u02BF\t\b\x02\x02\u02BF" +
+    "\x97\x03\x02\x02\x02\u02C0\u02C8\x07X\x02\x02\u02C1\u02C8\t\t\x02\x02" +
+    "\u02C2\u02C8\x05\x9AN\x02\u02C3\u02C8\x07@\x02\x02\u02C4\u02C8\t\n\x02" +
+    "\x02\u02C5\u02C8\x07W\x02\x02\u02C6\u02C8\x07?\x02\x02\u02C7\u02C0\x03" +
+    "\x02\x02\x02\u02C7\u02C1\x03\x02\x02\x02\u02C7\u02C2\x03\x02\x02\x02\u02C7" +
+    "\u02C3\x03\x02\x02\x02\u02C7\u02C4\x03\x02\x02\x02\u02C7\u02C5\x03\x02" +
+    "\x02\x02\u02C7\u02C6\x03\x02\x02\x02\u02C8\x99\x03\x02\x02\x02\u02C9\u02D0" +
+    "\x07u\x02\x02\u02CA\u02D0\x07v\x02\x02\u02CB\u02D0\x07y\x02\x02\u02CC" +
+    "\u02D0\x07x\x02\x02\u02CD\u02D0\x07w\x02\x02\u02CE\u02D0\x07z\x02\x02" +
+    "\u02CF\u02C9\x03\x02\x02\x02\u02CF\u02CA\x03\x02\x02\x02\u02CF\u02CB\x03" +
+    "\x02\x02\x02\u02CF\u02CC\x03\x02\x02\x02\u02CF\u02CD\x03\x02\x02\x02\u02CF" +
+    "\u02CE\x03\x02\x02\x02\u02D0\x9B\x03\x02\x02\x02\u02D1\u02D2\x07X\x02" +
+    "\x02\u02D2\x9D\x03\x02\x02\x02\u02D3\u02D4\t\v\x02\x02\u02D4\x9F\x03\x02" +
+    "\x02\x02\u02D5\u02D6\t\f\x02\x02\u02D6\xA1\x03\x02\x02\x02\u02D7\u02D8" +
+    "\t\r\x02\x02\u02D8\xA3\x03\x02\x02\x02\u02D9\u02DA\bS\x01\x02\u02DA\u0316" +
+    "\x05\xB4[\x02\u02DB\u0316\x05\x98M\x02\u02DC\u02DD\x07m\x02\x02\u02DD" +
+    "\u0316\x05\xA4S\x16\u02DE\u02DF\x07>\x02\x02\u02DF\u0316\x05\xA4S\v\u02E0" +
+    "\u02E1\x07&\x02\x02\u02E1\u02E2\x07\\\x02\x02\u02E2\u02E3\x05\xA4S\x02" +
+    "\u02E3\u02E4\x07 \x02\x02\u02E4\u02E5\x05\x94K\x02\u02E5\u02E6\x07]\x02" +
+    "\x02\u02E6\u0316\x03\x02\x02\x02\u02E7\u02E8\x07(\x02\x02\u02E8\u02E9" +
+    "\x07\\\x02\x02\u02E9\u02EA\x07,\x02\x02\u02EA\u02EB\x05\xA4S\x02\u02EB" +
+    "\u02EC\x07]\x02\x02\u02EC\u0316\x03\x02\x02\x02\u02ED\u02EE\x05\xB4[\x02" +
+    "\u02EE\u02EF\x07e\x02\x02\u02EF\u02F1\x03\x02\x02\x02\u02F0\u02ED\x03" +
+    "\x02\x02\x02\u02F0\u02F1\x03\x02\x02\x02\u02F1\u02F2\x03\x02\x02\x02\u02F2" +
+    "\u02F3\x05\x92J\x02\u02F3\u02F6\x07\\\x02\x02\u02F4\u02F7\x05\xA4S\x02" +
+    "\u02F5\u02F7\x07n\x02\x02\u02F6\u02F4\x03\x02\x02\x02\u02F6\u02F5\x03" +
+    "\x02\x02\x02\u02F6\u02F7\x03\x02\x02\x02\u02F7\u02F8\x03\x02\x02\x02\u02F8" +
+    "\u02F9\x07]\x02\x02\u02F9\u0316\x03\x02\x02\x02\u02FA\u02FB\x07\\\x02" +
+    "\x02\u02FB\u02FC\x05\xA6T\x02\u02FC\u02FD\x07]\x02\x02\u02FD\u0316\x03" +
+    "\x02\x02\x02\u02FE\u0301\x05\x9EP\x02\u02FF\u0301\x05\xA0Q\x02\u0300\u02FE" +
+    "\x03\x02\x02\x02\u0300\u02FF\x03\x02\x02\x02\u0301\u0302\x03\x02\x02\x02" +
+    "\u0302\u0304\x07\\\x02\x02\u0303\u0305\x05\xACW\x02\u0304\u0303\x03\x02" +
+    "\x02\x02\u0304\u0305\x03\x02\x02\x02\u0305\u0306\x03\x02\x02\x02\u0306" +
+    "\u0307\x07]\x02\x02\u0307\u0316\x03\x02\x02\x02\u0308\u0316\x05\xA8U\x02" +
+    "\u0309\u030A\x05\xA2R\x02\u030A\u030B\x07\\\x02\x02\u030B\u0310\x05\xA4" +
+    "S\x02\u030C\u030D\x07d\x02\x02\u030D\u030F\x05\xB8]\x02\u030E\u030C\x03" +
+    "\x02\x02\x02\u030F\u0312\x03\x02\x02\x02\u0310\u030E\x03\x02\x02\x02\u0310" +
+    "\u0311\x03\x02\x02\x02\u0311\u0313\x03\x02\x02\x02\u0312\u0310\x03\x02" +
+    "\x02\x02\u0313\u0314\x07]\x02\x02\u0314\u0316\x03\x02\x02\x02\u0315\u02D9" +
+    "\x03\x02\x02\x02\u0315\u02DB\x03\x02\x02\x02\u0315\u02DC\x03\x02\x02\x02" +
+    "\u0315\u02DE\x03\x02\x02\x02\u0315\u02E0\x03\x02\x02\x02\u0315\u02E7\x03" +
+    "\x02\x02\x02\u0315\u02F0\x03\x02\x02\x02\u0315\u02FA\x03\x02\x02\x02\u0315" +
+    "\u0300\x03\x02\x02\x02\u0315\u0308\x03\x02\x02\x02\u0315\u0309\x03\x02" +
+    "\x02\x02\u0316\u0341\x03\x02\x02\x02\u0317\u0318\f\x12\x02\x02\u0318\u0319" +
+    "\t\x0E\x02\x02\u0319\u0340\x05\xA4S\x13\u031A\u031B\f\x11\x02\x02\u031B" +
+    "\u031C\t\x0F\x02\x02\u031C\u0340\x05\xA4S\x12\u031D\u031E\f\x10\x02\x02" +
+    "\u031E\u031F\x07N\x02\x02\u031F\u0340\x05\xA4S\x11\u0320\u0321\f\r\x02" +
+    "\x02\u0321\u0322\x05\x96L\x02\u0322\u0323\x05\xA4S\x0E\u0323\u0340\x03" +
+    "\x02\x02\x02\u0324\u0325\f\n\x02\x02\u0325\u0326\t\x10\x02\x02\u0326\u0340" +
+    "\x05\xA4S\v\u0327\u0328\f\x18\x02\x02\u0328\u0329\x07`\x02\x02\u0329\u032A" +
+    "\x05Z.\x02\u032A\u032B\x07a\x02\x02\u032B\u0340\x03\x02\x02\x02\u032C" +
+    "\u032D\f\x15\x02\x02\u032D\u0340\x05\xA0Q\x02\u032E\u032F\f\x14\x02\x02" +
+    "\u032F\u0330\x07e\x02\x02\u0330\u0340\x05\xA0Q\x02\u0331\u0332\f\x13\x02" +
+    "\x02\u0332\u0333\x07b\x02\x02\u0333\u0340\x05\x94K\x02\u0334\u0335\f\x0F" +
+    "\x02\x02\u0335\u0336\x071\x02\x02\u0336\u0337\x05\xA4S\x02\u0337\u0338" +
+    "\x05\xA0Q\x02\u0338\u0340\x03\x02\x02\x02\u0339\u033A\f\x0E\x02\x02\u033A" +
+    "\u033B\t\x11\x02\x02\u033B\u0340\x05\xA6T\x02\u033C\u033D\f\f\x02\x02" +
+    "\u033D\u033E\t\x12\x02\x02\u033E\u0340\x05\xA6T\x02\u033F\u0317\x03\x02" +
+    "\x02\x02\u033F\u031A\x03\x02\x02\x02\u033F\u031D\x03\x02\x02\x02\u033F" +
+    "\u0320\x03\x02\x02\x02\u033F\u0324\x03\x02\x02\x02\u033F\u0327\x03\x02" +
+    "\x02\x02\u033F\u032C\x03\x02\x02\x02\u033F\u032E\x03\x02\x02\x02\u033F" +
+    "\u0331\x03\x02\x02\x02\u033F\u0334\x03\x02\x02\x02\u033F\u0339\x03\x02" +
+    "\x02\x02\u033F\u033C\x03\x02\x02\x02\u0340\u0343\x03\x02\x02\x02\u0341" +
+    "\u033F\x03\x02\x02\x02\u0341\u0342\x03\x02\x02\x02\u0342\xA5\x03\x02\x02" +
+    "\x02\u0343\u0341\x03\x02\x02\x02\u0344\u0345\x05\x96L\x02\u0345\u0346" +
+    "\x05\xA4S\x02\u0346\u0349\x03\x02\x02\x02\u0347\u0349\x05\xA4S\x02\u0348" +
+    "\u0344\x03\x02\x02\x02\u0348\u0347\x03\x02\x02\x02\u0349\xA7\x03\x02\x02" +
+    "\x02\u034A\u034C\x05\xAAV\x02\u034B\u034A\x03\x02\x02\x02\u034C\u034D" +
+    "\x03\x02\x02\x02\u034D\u034B\x03\x02\x02\x02\u034D\u034E\x03\x02\x02\x02" +
+    "\u034E\u0351\x03\x02\x02\x02\u034F\u0350\x07-\x02\x02\u0350\u0352\x05" +
+    "\xA4S\x02\u0351\u034F\x03\x02\x02\x02\u0351\u0352\x03\x02\x02\x02\u0352" +
+    "\xA9\x03\x02\x02\x02\u0353\u0355\x07D\x02\x02\u0354\u0356\x05\xA4S\x02" +
+    "\u0355\u0354\x03\x02\x02\x02\u0355\u0356\x03\x02\x02\x02\u0356\u0357\x03" +
+    "\x02\x02\x02\u0357\u0358\x07R\x02\x02\u0358\u0359\x05\xA6T\x02\u0359\xAB" +
+    "\x03\x02\x02\x02\u035A\u035F\x05\xA4S\x02\u035B\u035C\x07d\x02\x02\u035C" +
+    "\u035E\x05\xA4S\x02\u035D\u035B\x03\x02\x02\x02\u035E\u0361\x03\x02\x02" +
+    "\x02\u035F\u035D\x03\x02\x02\x02\u035F\u0360\x03\x02\x02\x02\u0360\u0363" +
+    "\x03\x02\x02\x02\u0361\u035F\x03\x02\x02\x02\u0362\u0364\x07d\x02\x02" +
+    "\u0363\u0362\x03\x02\x02\x02\u0363\u0364\x03\x02\x02\x02\u0364\xAD\x03" +
+    "\x02\x02\x02\u0365\u036C\x05\xB8]\x02\u0366\u0368\x07d\x02\x02\u0367\u0366" +
+    "\x03\x02\x02\x02\u0367\u0368\x03\x02\x02\x02\u0368\u0369\x03\x02\x02\x02" +
+    "\u0369\u036B\x05\xB8]\x02\u036A\u0367\x03\x02\x02\x02\u036B\u036E\x03" +
+    "\x02\x02\x02\u036C\u036A\x03\x02\x02\x02\u036C\u036D\x03\x02\x02\x02\u036D" +
+    "\xAF\x03\x02\x02\x02\u036E\u036C\x03\x02\x02\x02\u036F\u0376\x05\xB2Z" +
+    "\x02\u0370\u0372\x07d\x02\x02\u0371\u0370\x03\x02\x02\x02\u0371\u0372" +
+    "\x03\x02\x02\x02\u0372\u0373\x03\x02\x02\x02\u0373\u0375\x05\xB2Z\x02" +
+    "\u0374\u0371\x03\x02\x02\x02\u0375\u0378\x03\x02\x02\x02\u0376\u0374\x03" +
+    "\x02\x02\x02\u0376\u0377\x03\x02\x02\x02\u0377\u037A\x03\x02\x02\x02\u0378" +
+    "\u0376\x03\x02\x02\x02\u0379\u037B\x07d\x02\x02\u037A\u0379\x03\x02\x02" +
+    "\x02\u037A\u037B\x03\x02\x02\x02\u037B\xB1\x03\x02\x02\x02\u037C\u0385" +
+    "\x05\xB4[\x02\u037D\u037E\x05\xB4[\x02\u037E\u037F\x07e\x02\x02\u037F" +
+    "\u0381\x03\x02\x02\x02\u0380\u037D\x03\x02\x02\x02\u0380\u0381\x03\x02" +
+    "\x02\x02\u0381\u0382\x03\x02\x02\x02\u0382\u0385\t\x13\x02\x02\u0383\u0385" +
+    "\x05F$\x02\u0384\u037C\x03\x02\x02\x02\u0384\u0380\x03\x02\x02\x02\u0384" +
+    "\u0383\x03\x02\x02\x02\u0385\xB3\x03\x02\x02\x02\u0386\u038B\x05\xB8]" +
+    "\x02\u0387\u0388\x07e\x02\x02\u0388\u038A\x05\xB8]\x02\u0389\u0387\x03" +
+    "\x02\x02\x02\u038A\u038D\x03\x02\x02\x02\u038B\u0389\x03\x02\x02\x02\u038B" +
+    "\u038C\x03\x02\x02\x02\u038C\xB5\x03\x02\x02\x02\u038D\u038B\x03\x02\x02" +
+    "\x02\u038E\u038F\x05\x9EP\x02\u038F\xB7\x03\x02\x02\x02\u0390\u0391\x05" +
+    "\x9EP\x02\u0391\xB9\x03\x02\x02\x02\u0392\u0393\x05\xA4S\x02\u0393\u0394" +
+    "\x07\x02\x02\x03\u0394\xBB\x03\x02\x02\x02\u0395\u0396\x05\xBE`\x02\u0396" +
+    "\xBD\x03\x02\x02\x02\u0397\u03A0\x07\x03\x02\x02\u0398\u03A0\x07}\x02" +
+    "\x02\u0399\u03A0\x07~\x02\x02\u039A\u03A0\x05\xC0a\x02\u039B\u03A0\x05" +
+    "\xC4c\x02\u039C\u03A0\x07O\x02\x02\u039D\u03A0\x070\x02\x02\u039E\u03A0" +
+    "\x07@\x02\x02\u039F\u0397\x03\x02\x02\x02\u039F\u0398\x03\x02\x02\x02" +
+    "\u039F\u0399\x03\x02\x02\x02\u039F\u039A\x03\x02\x02\x02\u039F\u039B\x03" +
+    "\x02\x02\x02\u039F\u039C\x03\x02\x02\x02\u039F\u039D\x03\x02\x02\x02\u039F" +
+    "\u039E\x03\x02\x02\x02\u03A0\xBF\x03\x02\x02\x02\u03A1\u03A2\x07`\x02" +
+    "\x02\u03A2\u03A7\x05\xC2b\x02\u03A3\u03A4\x07d\x02\x02\u03A4\u03A6\x05" +
+    "\xC2b\x02\u03A5\u03A3\x03\x02\x02\x02\u03A6\u03A9\x03\x02\x02\x02\u03A7" +
+    "\u03A5\x03\x02\x02\x02\u03A7\u03A8\x03\x02\x02\x02\u03A8\u03AA\x03\x02" +
+    "\x02\x02\u03A9\u03A7\x03\x02\x02\x02\u03AA\u03AB\x07a\x02\x02\u03AB\u03AF" +
+    "\x03\x02\x02\x02\u03AC\u03AD\x07`\x02\x02\u03AD\u03AF\x07a\x02\x02\u03AE" +
+    "\u03A1\x03\x02\x02\x02\u03AE\u03AC\x03\x02\x02\x02\u03AF\xC1\x03\x02\x02" +
+    "\x02\u03B0\u03B1\x07\x03\x02\x02\u03B1\u03B2\x07c\x02\x02\u03B2\u03B3" +
+    "\x05\xBE`\x02\u03B3\xC3\x03\x02\x02\x02\u03B4\u03B5\x07^\x02\x02\u03B5" +
+    "\u03BA\x05\xBE`\x02\u03B6\u03B7\x07d\x02\x02\u03B7\u03B9\x05\xBE`\x02" +
+    "\u03B8\u03B6\x03\x02\x02\x02\u03B9\u03BC\x03\x02\x02\x02\u03BA\u03B8\x03" +
+    "\x02\x02\x02\u03BA\u03BB\x03\x02\x02\x02\u03BB\u03BD\x03\x02\x02\x02\u03BC" +
+    "\u03BA\x03\x02\x02\x02\u03BD\u03BE\x07_\x02\x02\u03BE\u03C2\x03\x02\x02" +
+    "\x02\u03BF\u03C0\x07^\x02\x02\u03C0\u03C2\x07_\x02\x02\u03C1\u03B4\x03" +
+    "\x02\x02\x02\u03C1\u03BF\x03\x02\x02\x02\u03C2\xC5\x03\x02\x02\x02\u03C3" +
+    "\u03C4\x05\x9EP\x02\u03C4\xC7\x03\x02\x02\x02\u03C5\u03C6\x05\x9EP\x02" +
+    "\u03C6\xC9\x03\x02\x02\x02\u03C7\u03C8\x07\x03\x02\x02\u03C8\xCB\x03\x02" +
+    "\x02\x02o\xCE\xD0\xD9\xE4\xEE\xF3\xFC\u0101\u0105\u0114\u0117\u011C\u011F" +
+    "\u0125\u012B\u012E\u0130\u013E\u0140\u0144\u0151\u0156\u015A\u0162\u0165" +
+    "\u0173\u017C\u017E\u0183\u0194\u0198\u019D\u01A1\u01A9\u01AE\u01B2\u01B6" +
+    "\u01BB\u01BF\u01CE\u01D3\u01D7\u01DF\u01E3\u01E8\u01EC\u01F1\u01F9\u01FD" +
+    "\u01FF\u0205\u020A\u0211\u0215\u021F\u0224\u0228\u023D\u0244\u0249\u024D" +
+    "\u0253\u025A\u025F\u0263\u0267\u026A\u0270\u027D\u0282\u0286\u028A\u028D" +
+    "\u0296\u029B\u02A0\u02A3\u02A7\u02AC\u02B3\u02C7\u02CF\u02F0\u02F6\u0300" +
+    "\u0304\u0310\u0315\u033F\u0341\u0348\u034D\u0351\u0355\u035F\u0363\u0367" +
+    "\u036C\u0371\u0376\u037A\u0380\u0384\u038B\u039F\u03A7\u03AE\u03BA\u03C1";
 MalloyParser._serializedATN = Utils.join([
     MalloyParser._serializedATNSegment0,
     MalloyParser._serializedATNSegment1,
@@ -6337,9 +6308,7 @@ class DefineSQLStatementContext extends ParserRuleContext_1.ParserRuleContext {
 }
 exports.DefineSQLStatementContext = DefineSQLStatementContext;
 class SqlStatementDefContext extends ParserRuleContext_1.ParserRuleContext {
-    sqlBlock() {
-        return this.getRuleContext(0, SqlBlockContext);
-    }
+    SQL_STRING() { return this.getToken(MalloyParser.SQL_STRING, 0); }
     sqlCommandNameDef() {
         return this.tryGetRuleContext(0, SqlCommandNameDefContext);
     }
@@ -11663,36 +11632,6 @@ class JsonArrayContext extends ParserRuleContext_1.ParserRuleContext {
     }
 }
 exports.JsonArrayContext = JsonArrayContext;
-class SqlBlockContext extends ParserRuleContext_1.ParserRuleContext {
-    SQL_STRING() { return this.getToken(MalloyParser.SQL_STRING, 0); }
-    constructor(parent, invokingState) {
-        super(parent, invokingState);
-    }
-    // @Override
-    get ruleIndex() { return MalloyParser.RULE_sqlBlock; }
-    // @Override
-    enterRule(listener) {
-        if (listener.enterSqlBlock) {
-            listener.enterSqlBlock(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitSqlBlock) {
-            listener.exitSqlBlock(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitSqlBlock) {
-            return visitor.visitSqlBlock(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.SqlBlockContext = SqlBlockContext;
 class SqlExploreNameRefContext extends ParserRuleContext_1.ParserRuleContext {
     id() {
         return this.getRuleContext(0, IdContext);