@malloydata/malloy 0.0.70 → 0.0.71-dev230811214318

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

@@ -147,8 +147,8 @@ export declare class MalloyParser extends Parser {
     static readonly LITERAL_YEAR = 136;
     static readonly IDENTIFIER = 137;
     static readonly PERCENT_LITERAL = 138;
-    static readonly INTEGER_LITERAL = 139;
-    static readonly NUMERIC_LITERAL = 140;
+    static readonly NUMERIC_LITERAL = 139;
+    static readonly INTEGER_LITERAL = 140;
     static readonly BLOCK_COMMENT = 141;
     static readonly COMMENT_TO_EOL = 142;
     static readonly WHITE_SPACE = 143;

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

@@ -71,7 +71,7 @@ class MalloyParser extends Parser_1.Parser {
                 this.state = 254;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE) | (1 << MalloyParser.SQLC))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IMPORT - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)) | (1 << (MalloyParser.DOC_ANNOTATION - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
+                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE) | (1 << MalloyParser.SQLC))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IMPORT - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)) | (1 << (MalloyParser.DOC_ANNOTATION - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
                     {
                         this.state = 252;
                         this._errHandler.sync(this);
@@ -135,8 +135,8 @@ class MalloyParser extends Parser_1.Parser {
                             case MalloyParser.LITERAL_WEEK:
                             case MalloyParser.LITERAL_YEAR:
                             case MalloyParser.IDENTIFIER:
-                            case MalloyParser.INTEGER_LITERAL:
                             case MalloyParser.NUMERIC_LITERAL:
+                            case MalloyParser.INTEGER_LITERAL:
                             case MalloyParser.SQL_BEGIN:
                                 {
                                     this.state = 250;
@@ -1676,7 +1676,7 @@ class MalloyParser extends Parser_1.Parser {
                         this.state = 490;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DECLARE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.EXTENDQ) | (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.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.ORDER_BY) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SAMPLE) | (1 << MalloyParser.SOURCE) | (1 << MalloyParser.TOP) | (1 << MalloyParser.WHERE) | (1 << MalloyParser.TIMEZONE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)) | (1 << (MalloyParser.DOC_ANNOTATION - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
+                        while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DECLARE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.EXTENDQ) | (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.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.ORDER_BY) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SAMPLE) | (1 << MalloyParser.SOURCE) | (1 << MalloyParser.TOP) | (1 << MalloyParser.WHERE) | (1 << MalloyParser.TIMEZONE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)) | (1 << (MalloyParser.DOC_ANNOTATION - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
                             {
                                 this.state = 488;
                                 this._errHandler.sync(this);
@@ -1748,8 +1748,8 @@ class MalloyParser extends Parser_1.Parser {
                                     case MalloyParser.LITERAL_WEEK:
                                     case MalloyParser.LITERAL_YEAR:
                                     case MalloyParser.IDENTIFIER:
-                                    case MalloyParser.INTEGER_LITERAL:
                                     case MalloyParser.NUMERIC_LITERAL:
+                                    case MalloyParser.INTEGER_LITERAL:
                                     case MalloyParser.SQL_BEGIN:
                                         {
                                             this.state = 486;
@@ -2081,7 +2081,7 @@ class MalloyParser extends Parser_1.Parser {
                         this.state = 538;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.ACCEPT) | (1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DECLARE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.EXCEPT) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PRIMARY_KEY) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RENAME) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE) | (1 << MalloyParser.WHERE) | (1 << MalloyParser.TIMEZONE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)) | (1 << (MalloyParser.DOC_ANNOTATION - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
+                        while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.ACCEPT) | (1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DECLARE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.EXCEPT) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PRIMARY_KEY) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RENAME) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE) | (1 << MalloyParser.WHERE) | (1 << MalloyParser.TIMEZONE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)) | (1 << (MalloyParser.DOC_ANNOTATION - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
                             {
                                 this.state = 536;
                                 this._errHandler.sync(this);
@@ -2150,8 +2150,8 @@ class MalloyParser extends Parser_1.Parser {
                                     case MalloyParser.LITERAL_WEEK:
                                     case MalloyParser.LITERAL_YEAR:
                                     case MalloyParser.IDENTIFIER:
-                                    case MalloyParser.INTEGER_LITERAL:
                                     case MalloyParser.NUMERIC_LITERAL:
+                                    case MalloyParser.INTEGER_LITERAL:
                                     case MalloyParser.SQL_BEGIN:
                                         {
                                             this.state = 534;
@@ -2835,7 +2835,7 @@ class MalloyParser extends Parser_1.Parser {
                 this.state = 646;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
+                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)) | (1 << (MalloyParser.SEMI - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
                     {
                         this.state = 644;
                         this._errHandler.sync(this);
@@ -2896,8 +2896,8 @@ class MalloyParser extends Parser_1.Parser {
                             case MalloyParser.LITERAL_WEEK:
                             case MalloyParser.LITERAL_YEAR:
                             case MalloyParser.IDENTIFIER:
-                            case MalloyParser.INTEGER_LITERAL:
                             case MalloyParser.NUMERIC_LITERAL:
+                            case MalloyParser.INTEGER_LITERAL:
                             case MalloyParser.SQL_BEGIN:
                                 {
                                     this.state = 642;
@@ -3063,7 +3063,7 @@ class MalloyParser extends Parser_1.Parser {
                         this.state = 677;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
+                        if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyParser.AGGREGATE) | (1 << MalloyParser.CALCULATE) | (1 << MalloyParser.DIMENSION) | (1 << MalloyParser.GROUP_BY) | (1 << MalloyParser.JOIN_CROSS) | (1 << MalloyParser.JOIN_ONE) | (1 << MalloyParser.JOIN_MANY) | (1 << MalloyParser.MEASURE) | (1 << MalloyParser.NEST) | (1 << MalloyParser.PROJECT) | (1 << MalloyParser.QUERY) | (1 << MalloyParser.RUN) | (1 << MalloyParser.SOURCE))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.FROM - 32)) | (1 << (MalloyParser.FROM_SQL - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.IS - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TABLE - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (MalloyParser.ANNOTATION - 96)) | (1 << (MalloyParser.ARROW - 96)) | (1 << (MalloyParser.OPAREN - 96)) | (1 << (MalloyParser.OCURLY - 96)) | (1 << (MalloyParser.MINUS - 96)))) !== 0) || ((((_la - 130)) & ~0x1F) === 0 && ((1 << (_la - 130)) & ((1 << (MalloyParser.LITERAL_TIMESTAMP - 130)) | (1 << (MalloyParser.LITERAL_HOUR - 130)) | (1 << (MalloyParser.LITERAL_DAY - 130)) | (1 << (MalloyParser.LITERAL_QUARTER - 130)) | (1 << (MalloyParser.LITERAL_MONTH - 130)) | (1 << (MalloyParser.LITERAL_WEEK - 130)) | (1 << (MalloyParser.LITERAL_YEAR - 130)) | (1 << (MalloyParser.IDENTIFIER - 130)) | (1 << (MalloyParser.NUMERIC_LITERAL - 130)) | (1 << (MalloyParser.INTEGER_LITERAL - 130)) | (1 << (MalloyParser.SQL_BEGIN - 130)))) !== 0)) {
                             {
                                 this.state = 676;
                                 this.isExplore();
@@ -4775,7 +4775,7 @@ class MalloyParser extends Parser_1.Parser {
             {
                 this.state = 919;
                 _la = this._input.LA(1);
-                if (!(_la === MalloyParser.INTEGER_LITERAL || _la === MalloyParser.NUMERIC_LITERAL)) {
+                if (!(_la === MalloyParser.NUMERIC_LITERAL || _la === MalloyParser.INTEGER_LITERAL)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -4821,8 +4821,8 @@ class MalloyParser extends Parser_1.Parser {
                         this.string();
                     }
                     break;
-                case MalloyParser.INTEGER_LITERAL:
                 case MalloyParser.NUMERIC_LITERAL:
+                case MalloyParser.INTEGER_LITERAL:
                     _localctx = new ExprNumberContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
@@ -5306,8 +5306,8 @@ class MalloyParser extends Parser_1.Parser {
                                 case MalloyParser.LITERAL_WEEK:
                                 case MalloyParser.LITERAL_YEAR:
                                 case MalloyParser.IDENTIFIER:
-                                case MalloyParser.INTEGER_LITERAL:
                                 case MalloyParser.NUMERIC_LITERAL:
+                                case MalloyParser.INTEGER_LITERAL:
                                 case MalloyParser.SQL_BEGIN:
                                     {
                                         this.state = 976;
@@ -5367,7 +5367,7 @@ class MalloyParser extends Parser_1.Parser {
                                 this.state = 994;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                if (((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.OPAREN - 100)) | (1 << (MalloyParser.MINUS - 100)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 100)) | (1 << (MalloyParser.LITERAL_HOUR - 100)))) !== 0) || ((((_la - 132)) & ~0x1F) === 0 && ((1 << (_la - 132)) & ((1 << (MalloyParser.LITERAL_DAY - 132)) | (1 << (MalloyParser.LITERAL_QUARTER - 132)) | (1 << (MalloyParser.LITERAL_MONTH - 132)) | (1 << (MalloyParser.LITERAL_WEEK - 132)) | (1 << (MalloyParser.LITERAL_YEAR - 132)) | (1 << (MalloyParser.IDENTIFIER - 132)) | (1 << (MalloyParser.INTEGER_LITERAL - 132)) | (1 << (MalloyParser.NUMERIC_LITERAL - 132)) | (1 << (MalloyParser.SQL_BEGIN - 132)))) !== 0)) {
+                                if (((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.OPAREN - 100)) | (1 << (MalloyParser.MINUS - 100)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 100)) | (1 << (MalloyParser.LITERAL_HOUR - 100)))) !== 0) || ((((_la - 132)) & ~0x1F) === 0 && ((1 << (_la - 132)) & ((1 << (MalloyParser.LITERAL_DAY - 132)) | (1 << (MalloyParser.LITERAL_QUARTER - 132)) | (1 << (MalloyParser.LITERAL_MONTH - 132)) | (1 << (MalloyParser.LITERAL_WEEK - 132)) | (1 << (MalloyParser.LITERAL_YEAR - 132)) | (1 << (MalloyParser.IDENTIFIER - 132)) | (1 << (MalloyParser.NUMERIC_LITERAL - 132)) | (1 << (MalloyParser.INTEGER_LITERAL - 132)) | (1 << (MalloyParser.SQL_BEGIN - 132)))) !== 0)) {
                                     {
                                         this.state = 993;
                                         this.argumentList();
@@ -5435,7 +5435,7 @@ class MalloyParser extends Parser_1.Parser {
                                 this.state = 1010;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                if (((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.OPAREN - 100)) | (1 << (MalloyParser.MINUS - 100)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 100)) | (1 << (MalloyParser.LITERAL_HOUR - 100)))) !== 0) || ((((_la - 132)) & ~0x1F) === 0 && ((1 << (_la - 132)) & ((1 << (MalloyParser.LITERAL_DAY - 132)) | (1 << (MalloyParser.LITERAL_QUARTER - 132)) | (1 << (MalloyParser.LITERAL_MONTH - 132)) | (1 << (MalloyParser.LITERAL_WEEK - 132)) | (1 << (MalloyParser.LITERAL_YEAR - 132)) | (1 << (MalloyParser.IDENTIFIER - 132)) | (1 << (MalloyParser.INTEGER_LITERAL - 132)) | (1 << (MalloyParser.NUMERIC_LITERAL - 132)) | (1 << (MalloyParser.SQL_BEGIN - 132)))) !== 0)) {
+                                if (((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.OPAREN - 100)) | (1 << (MalloyParser.MINUS - 100)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 100)) | (1 << (MalloyParser.LITERAL_HOUR - 100)))) !== 0) || ((((_la - 132)) & ~0x1F) === 0 && ((1 << (_la - 132)) & ((1 << (MalloyParser.LITERAL_DAY - 132)) | (1 << (MalloyParser.LITERAL_QUARTER - 132)) | (1 << (MalloyParser.LITERAL_MONTH - 132)) | (1 << (MalloyParser.LITERAL_WEEK - 132)) | (1 << (MalloyParser.LITERAL_YEAR - 132)) | (1 << (MalloyParser.IDENTIFIER - 132)) | (1 << (MalloyParser.NUMERIC_LITERAL - 132)) | (1 << (MalloyParser.INTEGER_LITERAL - 132)) | (1 << (MalloyParser.SQL_BEGIN - 132)))) !== 0)) {
                                     {
                                         this.state = 1009;
                                         this.argumentList();
@@ -5878,7 +5878,7 @@ class MalloyParser extends Parser_1.Parser {
                 this.state = 1102;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if (((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.OPAREN - 100)) | (1 << (MalloyParser.MINUS - 100)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 100)) | (1 << (MalloyParser.LITERAL_HOUR - 100)))) !== 0) || ((((_la - 132)) & ~0x1F) === 0 && ((1 << (_la - 132)) & ((1 << (MalloyParser.LITERAL_DAY - 132)) | (1 << (MalloyParser.LITERAL_QUARTER - 132)) | (1 << (MalloyParser.LITERAL_MONTH - 132)) | (1 << (MalloyParser.LITERAL_WEEK - 132)) | (1 << (MalloyParser.LITERAL_YEAR - 132)) | (1 << (MalloyParser.IDENTIFIER - 132)) | (1 << (MalloyParser.INTEGER_LITERAL - 132)) | (1 << (MalloyParser.NUMERIC_LITERAL - 132)) | (1 << (MalloyParser.SQL_BEGIN - 132)))) !== 0)) {
+                if (((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (MalloyParser.ALL - 32)) | (1 << (MalloyParser.AVG - 32)) | (1 << (MalloyParser.CAST - 32)) | (1 << (MalloyParser.COUNT - 32)) | (1 << (MalloyParser.DAY - 32)) | (1 << (MalloyParser.EXCLUDE - 32)) | (1 << (MalloyParser.FALSE - 32)) | (1 << (MalloyParser.HOUR - 32)) | (1 << (MalloyParser.MAX - 32)) | (1 << (MalloyParser.MIN - 32)) | (1 << (MalloyParser.MINUTE - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (MalloyParser.MONTH - 64)) | (1 << (MalloyParser.NOT - 64)) | (1 << (MalloyParser.NOW - 64)) | (1 << (MalloyParser.NULL - 64)) | (1 << (MalloyParser.PICK - 64)) | (1 << (MalloyParser.QUARTER - 64)) | (1 << (MalloyParser.SECOND - 64)) | (1 << (MalloyParser.SUM - 64)) | (1 << (MalloyParser.TRUE - 64)) | (1 << (MalloyParser.WEEK - 64)) | (1 << (MalloyParser.YEAR - 64)) | (1 << (MalloyParser.HACKY_REGEX - 64)) | (1 << (MalloyParser.SQ_STRING - 64)) | (1 << (MalloyParser.DQ_STRING - 64)) | (1 << (MalloyParser.BQ_STRING - 64)))) !== 0) || ((((_la - 100)) & ~0x1F) === 0 && ((1 << (_la - 100)) & ((1 << (MalloyParser.OPAREN - 100)) | (1 << (MalloyParser.MINUS - 100)) | (1 << (MalloyParser.LITERAL_TIMESTAMP - 100)) | (1 << (MalloyParser.LITERAL_HOUR - 100)))) !== 0) || ((((_la - 132)) & ~0x1F) === 0 && ((1 << (_la - 132)) & ((1 << (MalloyParser.LITERAL_DAY - 132)) | (1 << (MalloyParser.LITERAL_QUARTER - 132)) | (1 << (MalloyParser.LITERAL_MONTH - 132)) | (1 << (MalloyParser.LITERAL_WEEK - 132)) | (1 << (MalloyParser.LITERAL_YEAR - 132)) | (1 << (MalloyParser.IDENTIFIER - 132)) | (1 << (MalloyParser.NUMERIC_LITERAL - 132)) | (1 << (MalloyParser.INTEGER_LITERAL - 132)) | (1 << (MalloyParser.SQL_BEGIN - 132)))) !== 0)) {
                     {
                         this.state = 1101;
                         _localctx._pickValue = this.fieldExpr(0);
@@ -6647,8 +6647,8 @@ MalloyParser.LITERAL_WEEK = 135;
 MalloyParser.LITERAL_YEAR = 136;
 MalloyParser.IDENTIFIER = 137;
 MalloyParser.PERCENT_LITERAL = 138;
-MalloyParser.INTEGER_LITERAL = 139;
-MalloyParser.NUMERIC_LITERAL = 140;
+MalloyParser.NUMERIC_LITERAL = 139;
+MalloyParser.INTEGER_LITERAL = 140;
 MalloyParser.BLOCK_COMMENT = 141;
 MalloyParser.COMMENT_TO_EOL = 142;
 MalloyParser.WHITE_SPACE = 143;
@@ -6854,7 +6854,7 @@ MalloyParser._SYMBOLIC_NAMES = [
     "LTE", "GTE", "PLUS", "MINUS", "STAR", "STARSTAR", "SLASH", "BAR", "SEMI",
     "NOT_MATCH", "MATCH", "PERCENT", "DOUBLE_QMARK", "QMARK", "LITERAL_TIMESTAMP",
     "LITERAL_HOUR", "LITERAL_DAY", "LITERAL_QUARTER", "LITERAL_MONTH", "LITERAL_WEEK",
-    "LITERAL_YEAR", "IDENTIFIER", "PERCENT_LITERAL", "INTEGER_LITERAL", "NUMERIC_LITERAL",
+    "LITERAL_YEAR", "IDENTIFIER", "PERCENT_LITERAL", "NUMERIC_LITERAL", "INTEGER_LITERAL",
     "BLOCK_COMMENT", "COMMENT_TO_EOL", "WHITE_SPACE", "SQL_BEGIN", "CLOSE_CODE",
     "UNWATED_CHARS_TRAILING_NUMBERS", "UNEXPECTED_CHAR", "OPEN_CODE", "SQL_END",
 ];
@@ -6972,13 +6972,13 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\xC4\x02\xC6\x02\xC8\x02\xCA\x02\xCC\x02\xCE\x02\xD0\x02\xD2\x02\xD4\x02" +
     "\xD6\x02\xD8\x02\xDA\x02\xDC\x02\xDE\x02\xE0\x02\xE2\x02\xE4\x02\xE6\x02" +
     "\xE8\x02\xEA\x02\xEC\x02\xEE\x02\xF0\x02\xF2\x02\xF4\x02\xF6\x02\xF8\x02" +
-    "\xFA\x02\x02\x12\x04\x02kk\x93\x93\x04\x02\x03\x03\n\n\x04\x02%%//\x05" +
-    "\x0255UU\x8C\x8D\x06\x02&&,,?@NN\x07\x02\'\'--FFMMSS\x04\x02rw\x7F\x80" +
-    "\x03\x02^_\x03\x02\x8D\x8E\x04\x0255UU\x04\x02``\x8B\x8B\t\x02..::ABJ" +
-    "JLLWWZZ\x04\x02\"\"33\x05\x02zz||\x81\x81\x03\x02xy\x03\x02z{\x02\u04EF" +
-    "\x02\u0100\x03\x02\x02\x02\x04\u010C\x03\x02\x02\x02\x06\u010E\x03\x02" +
-    "\x02\x02\b\u0117\x03\x02\x02\x02\n\u0119\x03\x02\x02\x02\f\u011F\x03\x02" +
-    "\x02\x02\x0E\u0122\x03\x02\x02\x02\x10\u0126\x03\x02\x02\x02\x12\u012B" +
+    "\xFA\x02\x02\x12\x04\x02kk\x93\x93\x04\x02\x03\x03\n\n\x04\x02%%//\x06" +
+    "\x0255UU\x8C\x8C\x8E\x8E\x06\x02&&,,?@NN\x07\x02\'\'--FFMMSS\x04\x02r" +
+    "w\x7F\x80\x03\x02^_\x03\x02\x8D\x8E\x04\x0255UU\x04\x02``\x8B\x8B\t\x02" +
+    "..::ABJJLLWWZZ\x04\x02\"\"33\x05\x02zz||\x81\x81\x03\x02xy\x03\x02z{\x02" +
+    "\u04EF\x02\u0100\x03\x02\x02\x02\x04\u010C\x03\x02\x02\x02\x06\u010E\x03" +
+    "\x02\x02\x02\b\u0117\x03\x02\x02\x02\n\u0119\x03\x02\x02\x02\f\u011F\x03" +
+    "\x02\x02\x02\x0E\u0122\x03\x02\x02\x02\x10\u0126\x03\x02\x02\x02\x12\u012B" +
     "\x03\x02\x02\x02\x14\u0130\x03\x02\x02\x02\x16\u013C\x03\x02\x02\x02\x18" +
     "\u013E\x03\x02\x02\x02\x1A\u0147\x03\x02\x02\x02\x1C\u014B\x03\x02\x02" +
     "\x02\x1E\u014E\x03\x02\x02\x02 \u0151\x03\x02\x02\x02\"\u0156\x03\x02" +
@@ -7102,65 +7102,65 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "f\x02\x02\u01B2\u01B3\x05\xF6|\x02\u01B3\u01B4\x07g\x02\x02\u01B4\u01B7" +
     "\x03\x02\x02\x02\u01B5\u01B7\x05:\x1E\x02\u01B6\u01A9\x03\x02\x02\x02" +
     "\u01B6\u01AA\x03\x02\x02\x02\u01B6\u01AB\x03\x02\x02\x02\u01B6\u01B0\x03" +
-    "\x02\x02\x02\u01B6\u01B5\x03\x02\x02\x02\u01B79";
-MalloyParser._serializedATNSegment1 = "\x03\x02\x02\x02\u01B8\u01B9\x05D#\x02\u01B9\u01BA\x07q\x02\x02\u01BA" +
-    "\u01BB\x07O\x02\x02\u01BB\u01BE\x07f\x02\x02\u01BC\u01BF\x05\x18\r\x02" +
-    "\u01BD\u01BF\x05\xC6d\x02\u01BE\u01BC\x03\x02\x02\x02\u01BE\u01BD\x03" +
-    "\x02\x02\x02\u01BF\u01C0\x03\x02\x02\x02\u01C0\u01C1\x07g\x02\x02\u01C1" +
-    ";\x03\x02\x02\x02\u01C2\u01C6\x05> \x02\u01C3\u01C5\x05@!\x02\u01C4\u01C3" +
-    "\x03\x02\x02\x02\u01C5\u01C8\x03\x02\x02\x02\u01C6\u01C4\x03\x02\x02\x02" +
-    "\u01C6\u01C7\x03\x02\x02\x02\u01C7=\x03\x02\x02\x02\u01C8\u01C6\x03\x02" +
-    "\x02\x02\u01C9\u01CB\x07d\x02\x02\u01CA\u01C9\x03\x02\x02\x02\u01CA\u01CB" +
-    "\x03\x02\x02\x02\u01CB\u01CC\x03\x02\x02\x02\u01CC\u01D2\x05F$\x02\u01CD" +
-    "\u01CF\x05J&\x02\u01CE\u01D0\x05,\x17\x02\u01CF\u01CE\x03\x02\x02\x02" +
-    "\u01CF\u01D0\x03\x02\x02\x02\u01D0\u01D2\x03\x02\x02\x02\u01D1\u01CA\x03" +
-    "\x02\x02\x02\u01D1\u01CD\x03\x02\x02\x02\u01D2?\x03\x02\x02\x02\u01D3" +
-    "\u01D4\x07d\x02\x02\u01D4\u01D5\x05F$\x02\u01D5A\x03\x02\x02\x02\u01D6" +
-    "\u01D7\x07P\x02\x02\u01D7\u01D8\x07f\x02\x02\u01D8\u01D9\x05\xD0i\x02" +
-    "\u01D9\u01DA\x07g\x02\x02\u01DA\u01E3\x03\x02\x02\x02\u01DB\u01DC\x05" +
-    "D#\x02\u01DC\u01DD\x07q\x02\x02\u01DD\u01DE\x07P\x02\x02\u01DE\u01DF\x07" +
-    "f\x02\x02\u01DF\u01E0\x05\xCEh\x02\u01E0\u01E1\x07g\x02\x02\u01E1\u01E3" +
-    "\x03\x02\x02\x02\u01E2\u01D6\x03\x02\x02\x02\u01E2\u01DB\x03\x02\x02\x02" +
-    "\u01E3C\x03\x02\x02\x02\u01E4\u01E5\x05\xD2j\x02\u01E5E\x03\x02\x02\x02" +
-    "\u01E6\u01F1\x05H%\x02\u01E7\u01EC\x07j\x02\x02\u01E8\u01EB\x05\x8EH\x02" +
-    "\u01E9\u01EB\x07~\x02\x02\u01EA\u01E8\x03\x02\x02\x02\u01EA\u01E9\x03" +
-    "\x02\x02\x02\u01EB\u01EE\x03\x02\x02\x02\u01EC\u01EA\x03\x02\x02\x02\u01EC" +
-    "\u01ED\x03\x02\x02\x02\u01ED\u01EF\x03\x02\x02\x02\u01EE\u01EC\x03\x02" +
-    "\x02\x02\u01EF\u01F1\x07k\x02\x02\u01F0\u01E6\x03\x02\x02\x02\u01F0\u01E7" +
-    "\x03\x02\x02\x02\u01F1G\x03\x02\x02\x02\u01F2\u01F3\x07j\x02\x02\u01F3" +
-    "\u01F4\x07\x83\x02\x02\u01F4\u01F5\x05\xD8m\x02\u01F5\u01F6\x07k\x02\x02" +
-    "\u01F6I\x03\x02\x02\x02\u01F7\u01F8\x05\xD2j\x02\u01F8K\x03\x02\x02\x02" +
-    "\u01F9\u01FA\x05\xD2j\x02\u01FAM\x03\x02\x02\x02\u01FB\u0202\x05P)\x02" +
-    "\u01FC\u01FE\x07p\x02\x02\u01FD\u01FC\x03\x02\x02\x02\u01FD\u01FE\x03" +
-    "\x02\x02\x02\u01FE\u01FF\x03\x02\x02\x02\u01FF\u0201\x05P)\x02\u0200\u01FD" +
-    "\x03\x02\x02\x02\u0201\u0204\x03\x02\x02\x02\u0202\u0200\x03\x02\x02\x02" +
-    "\u0202\u0203\x03\x02\x02\x02\u0203\u0206\x03\x02\x02\x02\u0204\u0202\x03" +
-    "\x02\x02\x02\u0205\u0207\x07p\x02\x02\u0206\u0205\x03\x02\x02\x02\u0206" +
-    "\u0207\x03\x02\x02\x02\u0207O\x03\x02\x02\x02\u0208\u0209\x05\f\x07\x02" +
-    "\u0209\u020A\x05T+\x02\u020A\u020B\x05\x0E\b\x02\u020B\u020C\x05R*\x02" +
-    "\u020CQ\x03\x02\x02\x02\u020D\u0212\x056\x1C\x02\u020E\u020F\x050\x19" +
-    "\x02\u020F\u0210\x05.\x18\x02\u0210\u0212\x03\x02\x02\x02\u0211\u020D" +
-    "\x03\x02\x02\x02\u0211\u020E\x03\x02\x02\x02\u0212S\x03\x02\x02\x02\u0213" +
-    "\u0214\x05\xD2j\x02\u0214U\x03\x02\x02\x02\u0215\u0216\x05\xD2j\x02\u0216" +
-    "W\x03\x02\x02\x02\u0217\u021C\x07j\x02\x02\u0218\u021B\x05Z.\x02\u0219" +
-    "\u021B\x07~\x02\x02\u021A\u0218\x03\x02\x02\x02\u021A\u0219\x03\x02\x02" +
-    "\x02\u021B\u021E\x03\x02\x02\x02\u021C\u021A\x03\x02\x02\x02\u021C\u021D" +
-    "\x03\x02\x02\x02\u021D\u021F\x03\x02\x02\x02\u021E\u021C\x03\x02\x02\x02" +
-    "\u021F\u0222\x07k\x02\x02\u0220\u0222\x05H%\x02\u0221\u0217\x03\x02\x02" +
-    "\x02\u0221\u0220\x03\x02\x02\x02\u0222Y\x03\x02\x02\x02\u0223\u023A\x05" +
-    "^0\x02\u0224\u023A\x05\\/\x02\u0225\u023A\x05l7\x02\u0226\u023A\x05n8" +
-    "\x02\u0227\u023A\x05\x84C\x02\u0228\u0229\x07\x16\x02\x02\u0229\u023A" +
-    "\x05\xF2z\x02\u022A\u022B\x07\x19\x02\x02\u022B\u023A\x05`1\x02\u022C" +
-    "\u022D\t\x03\x02\x02\u022D\u023A\x05\xE2r\x02\u022E\u022F\x05\f\x07\x02" +
-    "\u022F\u0230\x07\x18\x02\x02\u0230\u0231\x05\x88E\x02\u0231\u023A\x03" +
-    "\x02\x02\x02\u0232\u023A\x05\xB8]\x02\u0233\u0235\x07b\x02\x02\u0234\u0233" +
-    "\x03\x02\x02\x02\u0235\u0236\x03\x02\x02\x02\u0236\u0234\x03\x02\x02\x02" +
-    "\u0236\u0237\x03\x02\x02\x02\u0237\u023A\x03\x02\x02\x02\u0238\u023A\x05" +
-    "$\x13\x02\u0239\u0223\x03\x02\x02\x02\u0239\u0224\x03\x02\x02\x02\u0239" +
-    "\u0225\x03\x02\x02\x02\u0239\u0226\x03\x02\x02\x02\u0239\u0227\x03\x02" +
-    "\x02\x02\u0239\u0228\x03\x02\x02\x02\u0239\u022A\x03\x02\x02\x02\u0239" +
-    "\u022C\x03\x02\x02\x02\u0239\u022E\x03\x02\x02\x02\u0239\u0232\x03\x02" +
-    "\x02\x02\u0239\u0234\x03\x02\x02\x02\u0239\u0238\x03\x02\x02\x02\u023A" +
+    "\x02\x02\x02\u01B6\u01B5\x03\x02\x02\x02";
+MalloyParser._serializedATNSegment1 = "\u01B79\x03\x02\x02\x02\u01B8\u01B9\x05D#\x02\u01B9\u01BA\x07q\x02\x02" +
+    "\u01BA\u01BB\x07O\x02\x02\u01BB\u01BE\x07f\x02\x02\u01BC\u01BF\x05\x18" +
+    "\r\x02\u01BD\u01BF\x05\xC6d\x02\u01BE\u01BC\x03\x02\x02\x02\u01BE\u01BD" +
+    "\x03\x02\x02\x02\u01BF\u01C0\x03\x02\x02\x02\u01C0\u01C1\x07g\x02\x02" +
+    "\u01C1;\x03\x02\x02\x02\u01C2\u01C6\x05> \x02\u01C3\u01C5\x05@!\x02\u01C4" +
+    "\u01C3\x03\x02\x02\x02\u01C5\u01C8\x03\x02\x02\x02\u01C6\u01C4\x03\x02" +
+    "\x02\x02\u01C6\u01C7\x03\x02\x02\x02\u01C7=\x03\x02\x02\x02\u01C8\u01C6" +
+    "\x03\x02\x02\x02\u01C9\u01CB\x07d\x02\x02\u01CA\u01C9\x03\x02\x02\x02" +
+    "\u01CA\u01CB\x03\x02\x02\x02\u01CB\u01CC\x03\x02\x02\x02\u01CC\u01D2\x05" +
+    "F$\x02\u01CD\u01CF\x05J&\x02\u01CE\u01D0\x05,\x17\x02\u01CF\u01CE\x03" +
+    "\x02\x02\x02\u01CF\u01D0\x03\x02\x02\x02\u01D0\u01D2\x03\x02\x02\x02\u01D1" +
+    "\u01CA\x03\x02\x02\x02\u01D1\u01CD\x03\x02\x02\x02\u01D2?\x03\x02\x02" +
+    "\x02\u01D3\u01D4\x07d\x02\x02\u01D4\u01D5\x05F$\x02\u01D5A\x03\x02\x02" +
+    "\x02\u01D6\u01D7\x07P\x02\x02\u01D7\u01D8\x07f\x02\x02\u01D8\u01D9\x05" +
+    "\xD0i\x02\u01D9\u01DA\x07g\x02\x02\u01DA\u01E3\x03\x02\x02\x02\u01DB\u01DC" +
+    "\x05D#\x02\u01DC\u01DD\x07q\x02\x02\u01DD\u01DE\x07P\x02\x02\u01DE\u01DF" +
+    "\x07f\x02\x02\u01DF\u01E0\x05\xCEh\x02\u01E0\u01E1\x07g\x02\x02\u01E1" +
+    "\u01E3\x03\x02\x02\x02\u01E2\u01D6\x03\x02\x02\x02\u01E2\u01DB\x03\x02" +
+    "\x02\x02\u01E3C\x03\x02\x02\x02\u01E4\u01E5\x05\xD2j\x02\u01E5E\x03\x02" +
+    "\x02\x02\u01E6\u01F1\x05H%\x02\u01E7\u01EC\x07j\x02\x02\u01E8\u01EB\x05" +
+    "\x8EH\x02\u01E9\u01EB\x07~\x02\x02\u01EA\u01E8\x03\x02\x02\x02\u01EA\u01E9" +
+    "\x03\x02\x02\x02\u01EB\u01EE\x03\x02\x02\x02\u01EC\u01EA\x03\x02\x02\x02" +
+    "\u01EC\u01ED\x03\x02\x02\x02\u01ED\u01EF\x03\x02\x02\x02\u01EE\u01EC\x03" +
+    "\x02\x02\x02\u01EF\u01F1\x07k\x02\x02\u01F0\u01E6\x03\x02\x02\x02\u01F0" +
+    "\u01E7\x03\x02\x02\x02\u01F1G\x03\x02\x02\x02\u01F2\u01F3\x07j\x02\x02" +
+    "\u01F3\u01F4\x07\x83\x02\x02\u01F4\u01F5\x05\xD8m\x02\u01F5\u01F6\x07" +
+    "k\x02\x02\u01F6I\x03\x02\x02\x02\u01F7\u01F8\x05\xD2j\x02\u01F8K\x03\x02" +
+    "\x02\x02\u01F9\u01FA\x05\xD2j\x02\u01FAM\x03\x02\x02\x02\u01FB\u0202\x05" +
+    "P)\x02\u01FC\u01FE\x07p\x02\x02\u01FD\u01FC\x03\x02\x02\x02\u01FD\u01FE" +
+    "\x03\x02\x02\x02\u01FE\u01FF\x03\x02\x02\x02\u01FF\u0201\x05P)\x02\u0200" +
+    "\u01FD\x03\x02\x02\x02\u0201\u0204\x03\x02\x02\x02\u0202\u0200\x03\x02" +
+    "\x02\x02\u0202\u0203\x03\x02\x02\x02\u0203\u0206\x03\x02\x02\x02\u0204" +
+    "\u0202\x03\x02\x02\x02\u0205\u0207\x07p\x02\x02\u0206\u0205\x03\x02\x02" +
+    "\x02\u0206\u0207\x03\x02\x02\x02\u0207O\x03\x02\x02\x02\u0208\u0209\x05" +
+    "\f\x07\x02\u0209\u020A\x05T+\x02\u020A\u020B\x05\x0E\b\x02\u020B\u020C" +
+    "\x05R*\x02\u020CQ\x03\x02\x02\x02\u020D\u0212\x056\x1C\x02\u020E\u020F" +
+    "\x050\x19\x02\u020F\u0210\x05.\x18\x02\u0210\u0212\x03\x02\x02\x02\u0211" +
+    "\u020D\x03\x02\x02\x02\u0211\u020E\x03\x02\x02\x02\u0212S\x03\x02\x02" +
+    "\x02\u0213\u0214\x05\xD2j\x02\u0214U\x03\x02\x02\x02\u0215\u0216\x05\xD2" +
+    "j\x02\u0216W\x03\x02\x02\x02\u0217\u021C\x07j\x02\x02\u0218\u021B\x05" +
+    "Z.\x02\u0219\u021B\x07~\x02\x02\u021A\u0218\x03\x02\x02\x02\u021A\u0219" +
+    "\x03\x02\x02\x02\u021B\u021E\x03\x02\x02\x02\u021C\u021A\x03\x02\x02\x02" +
+    "\u021C\u021D\x03\x02\x02\x02\u021D\u021F\x03\x02\x02\x02\u021E\u021C\x03" +
+    "\x02\x02\x02\u021F\u0222\x07k\x02\x02\u0220\u0222\x05H%\x02\u0221\u0217" +
+    "\x03\x02\x02\x02\u0221\u0220\x03\x02\x02\x02\u0222Y\x03\x02\x02\x02\u0223" +
+    "\u023A\x05^0\x02\u0224\u023A\x05\\/\x02\u0225\u023A\x05l7\x02\u0226\u023A" +
+    "\x05n8\x02\u0227\u023A\x05\x84C\x02\u0228\u0229\x07\x16\x02\x02\u0229" +
+    "\u023A\x05\xF2z\x02\u022A\u022B\x07\x19\x02\x02\u022B\u023A\x05`1\x02" +
+    "\u022C\u022D\t\x03\x02\x02\u022D\u023A\x05\xE2r\x02\u022E\u022F\x05\f" +
+    "\x07\x02\u022F\u0230\x07\x18\x02\x02\u0230\u0231\x05\x88E\x02\u0231\u023A" +
+    "\x03\x02\x02\x02\u0232\u023A\x05\xB8]\x02\u0233\u0235\x07b\x02\x02\u0234" +
+    "\u0233\x03\x02\x02\x02\u0235\u0236\x03\x02\x02\x02\u0236\u0234\x03\x02" +
+    "\x02\x02\u0236\u0237\x03\x02\x02\x02\u0237\u023A\x03\x02\x02\x02\u0238" +
+    "\u023A\x05$\x13\x02\u0239\u0223\x03\x02\x02\x02\u0239\u0224\x03\x02\x02" +
+    "\x02\u0239\u0225\x03\x02\x02\x02\u0239\u0226\x03\x02\x02\x02\u0239\u0227" +
+    "\x03\x02\x02\x02\u0239\u0228\x03\x02\x02\x02\u0239\u022A\x03\x02\x02\x02" +
+    "\u0239\u022C\x03\x02\x02\x02\u0239\u022E\x03\x02\x02\x02\u0239\u0232\x03" +
+    "\x02\x02\x02\u0239\u0234\x03\x02\x02\x02\u0239\u0238\x03\x02\x02\x02\u023A" +
     "[\x03\x02\x02\x02\u023B\u023C\x05\f\x07\x02\u023C\u023D\x07\x13\x02\x02" +
     "\u023D\u023E\x05d3\x02\u023E]\x03\x02\x02\x02\u023F\u0240\x05\f\x07\x02" +
     "\u0240\u0241\x07\t\x02\x02\u0241\u0242\x05d3\x02\u0242_\x03\x02\x02\x02" +
@@ -7287,14 +7287,14 @@ MalloyParser._serializedATNSegment1 = "\x03\x02\x02\x02\u01B8\u01B9\x05D#\x02\u0
     "\u034D\x03\x02\x02\x02\u034F\u0350\x03\x02\x02\x02\u0350\u0353\x03\x02" +
     "\x02\x02\u0351\u034F\x03\x02\x02\x02\u0352\u0354\x07p\x02\x02\u0353\u0352" +
     "\x03\x02\x02\x02\u0353\u0354\x03\x02\x02\x02\u0354\xA7\x03\x02\x02\x02" +
-    "\u0355\u0358\x07\x8D\x02\x02\u0356\u0358\x05\xF2z\x02\u0357\u0355\x03" +
+    "\u0355\u0358\x07\x8E\x02\x02\u0356\u0358\x05\xF2z\x02\u0357\u0355\x03" +
     "\x02\x02\x02\u0357\u0356\x03\x02\x02\x02\u0358\u035A\x03\x02\x02\x02\u0359" +
     "\u035B\t\x04\x02\x02\u035A\u0359\x03\x02\x02\x02\u035A\u035B\x03\x02\x02" +
     "\x02\u035B\xA9\x03\x02\x02\x02\u035C\u035D\x07\x12\x02\x02\u035D\u035E" +
-    "\x07\x8D\x02\x02\u035E\xAB\x03\x02\x02\x02\u035F\u0360\x07(\x02\x02\u0360" +
+    "\x07\x8E\x02\x02\u035E\xAB\x03\x02\x02\x02\u035F\u0360\x07(\x02\x02\u0360" +
     "\u0364\x05\xF2z\x02\u0361\u0362\x07(\x02\x02\u0362\u0364\x05\xD8m\x02" +
     "\u0363\u035F\x03\x02\x02\x02\u0363\u0361\x03\x02\x02\x02\u0364\xAD\x03" +
-    "\x02\x02\x02\u0365\u0366\x07\x1F\x02\x02\u0366\u0368\x07\x8D\x02\x02\u0367" +
+    "\x02\x02\x02\u0365\u0366\x07\x1F\x02\x02\u0366\u0368\x07\x8E\x02\x02\u0367" +
     "\u0369\x05\xACW\x02\u0368\u0367\x03\x02\x02\x02\u0368\u0369\x03\x02\x02" +
     "\x02\u0369\xAF\x03\x02\x02\x02\u036A\u036D\x05\xEEx\x02\u036B\u036C\x07" +
     "q\x02\x02\u036C\u036E\x07z\x02\x02\u036D\u036B\x03\x02\x02\x02\u036D\u036E" +
@@ -7411,48 +7411,48 @@ MalloyParser._serializedATNSegment1 = "\x03\x02\x02\x02\u01B8\u01B9\x05D#\x02\u0
     "\x03\x02\x02\x02\u045A\u045B\x03\x02\x02\x02\u045B\u045E\x03\x02\x02\x02" +
     "\u045C\u045A\x03\x02\x02\x02\u045D\u045F\x07p\x02\x02\u045E\u045D\x03" +
     "\x02\x02\x02\u045E\u045F\x03\x02\x02\x02\u045F\xE1\x03\x02\x02\x02\u0460" +
-    "\u0467\x05\xF2";
-MalloyParser._serializedATNSegment2 = "z\x02\u0461\u0463\x07p\x02\x02\u0462\u0461\x03\x02\x02\x02\u0462\u0463" +
-    "\x03\x02\x02\x02\u0463\u0464\x03\x02\x02\x02\u0464\u0466\x05\xF2z\x02" +
-    "\u0465\u0462\x03\x02\x02\x02\u0466\u0469\x03\x02\x02\x02\u0467\u0465\x03" +
-    "\x02\x02\x02\u0467\u0468\x03\x02\x02\x02\u0468\xE3\x03\x02\x02\x02\u0469" +
-    "\u0467\x03\x02\x02\x02\u046A\u0471\x05\xECw\x02\u046B\u046D\x07p\x02\x02" +
-    "\u046C\u046B\x03\x02\x02\x02\u046C\u046D\x03\x02\x02\x02\u046D\u046E\x03" +
-    "\x02\x02\x02\u046E\u0470\x05\xECw\x02\u046F\u046C\x03\x02\x02\x02\u0470" +
-    "\u0473\x03\x02\x02\x02\u0471\u046F\x03\x02\x02\x02\u0471\u0472\x03\x02" +
-    "\x02\x02\u0472\u0475\x03\x02\x02\x02\u0473\u0471\x03\x02\x02\x02\u0474" +
-    "\u0476\x07p\x02\x02\u0475\u0474\x03\x02\x02\x02\u0475\u0476\x03\x02\x02" +
-    "\x02\u0476\xE5\x03\x02\x02\x02\u0477\u0478\x05\xEEx\x02\u0478\u0479\x07" +
-    "q\x02\x02\u0479\u047B\x03\x02\x02\x02\u047A\u0477\x03\x02\x02\x02\u047A" +
-    "\u047B\x03\x02\x02\x02\u047B\u047C\x03\x02\x02\x02\u047C\u047D\t\x11\x02" +
-    "\x02\u047D\xE7\x03\x02\x02\x02\u047E\u047F\x05\f\x07\x02\u047F\u0481\x05" +
-    "\xEEx\x02\u0480\u0482\x05\xEAv\x02\u0481\u0480\x03\x02\x02\x02\u0481\u0482" +
-    "\x03\x02\x02\x02\u0482\xE9\x03\x02\x02\x02\u0483\u0484\x07q\x02\x02\u0484" +
-    "\u048B\x05\xD4k\x02\u0485\u0486\x07q\x02\x02\u0486\u0487\x05\xBE`\x02" +
-    "\u0487\u0488\x07f\x02\x02\u0488\u0489\x07g\x02\x02\u0489\u048B\x03\x02" +
-    "\x02\x02\u048A\u0483\x03\x02\x02\x02\u048A\u0485\x03\x02\x02\x02\u048B" +
-    "\xEB\x03\x02\x02\x02\u048C\u0490\x05\xE8u\x02\u048D\u0490\x05\xE6t\x02" +
-    "\u048E\u0490\x05f4\x02\u048F\u048C\x03\x02\x02\x02\u048F\u048D\x03\x02" +
-    "\x02\x02\u048F\u048E\x03\x02\x02\x02\u0490\xED\x03\x02\x02\x02\u0491\u0496" +
-    "\x05\xF2z\x02\u0492\u0493\x07q\x02\x02\u0493\u0495\x05\xF2z\x02\u0494" +
-    "\u0492\x03\x02\x02\x02\u0495\u0498\x03\x02\x02\x02\u0496\u0494\x03\x02" +
-    "\x02\x02\u0496\u0497\x03\x02\x02\x02\u0497\xEF\x03\x02\x02\x02\u0498\u0496" +
-    "\x03\x02\x02\x02\u0499\u049A\x05\xD2j\x02\u049A\xF1\x03\x02\x02\x02\u049B" +
-    "\u049C\x05\xD2j\x02\u049C\xF3\x03\x02\x02\x02\u049D\u049E\x05\xD8m\x02" +
-    "\u049E\u049F\x07\x02\x02\x03\u049F\xF5\x03\x02\x02\x02\u04A0\u04A1\x05" +
-    "\xD2j\x02\u04A1\xF7\x03\x02\x02\x02\u04A2\u04A3\x05\xD2j\x02\u04A3\xF9" +
-    "\x03\x02\x02\x02\u04A4\u04A5\x05\xC4c\x02\u04A5\xFB\x03\x02\x02\x02\x7F" +
-    "\xFE\u0100\u010C\u0117\u011F\u0134\u013C\u0142\u0153\u0158\u015D\u0163" +
-    "\u0168\u016C\u0176\u017B\u017E\u0183\u0189\u018D\u0193\u0197\u0199\u019C" +
-    "\u01A3\u01A7\u01B6\u01BE\u01C6\u01CA\u01CF\u01D1\u01E2\u01EA\u01EC\u01F0" +
-    "\u01FD\u0202\u0206\u0211\u021A\u021C\u0221\u0236\u0239\u0245\u024A\u024E" +
-    "\u0256\u025B\u025F\u0279\u0281\u0286\u0288\u028F\u0294\u0298\u02A2\u02A7" +
-    "\u02AF\u02B4\u02B8\u02BA\u02C0\u02C5\u02CC\u02D0\u02DA\u02DF\u02E3\u02EA" +
-    "\u0303\u030D\u0312\u0316\u031A\u0322\u0327\u032B\u0330\u0337\u034A\u034F" +
-    "\u0353\u0357\u035A\u0363\u0368\u036D\u0371\u0375\u037A\u0381\u0395\u03A2" +
-    "\u03AB\u03CE\u03D4\u03DF\u03E4\u03EB\u03ED\u03F0\u03F4\u0400\u0405\u043B" +
-    "\u043D\u0441\u0448\u044C\u0450\u045A\u045E\u0462\u0467\u046C\u0471\u0475" +
-    "\u047A\u0481\u048A\u048F\u0496";
+    "\u0467";
+MalloyParser._serializedATNSegment2 = "\x05\xF2z\x02\u0461\u0463\x07p\x02\x02\u0462\u0461\x03\x02\x02\x02\u0462" +
+    "\u0463\x03\x02\x02\x02\u0463\u0464\x03\x02\x02\x02\u0464\u0466\x05\xF2" +
+    "z\x02\u0465\u0462\x03\x02\x02\x02\u0466\u0469\x03\x02\x02\x02\u0467\u0465" +
+    "\x03\x02\x02\x02\u0467\u0468\x03\x02\x02\x02\u0468\xE3\x03\x02\x02\x02" +
+    "\u0469\u0467\x03\x02\x02\x02\u046A\u0471\x05\xECw\x02\u046B\u046D\x07" +
+    "p\x02\x02\u046C\u046B\x03\x02\x02\x02\u046C\u046D\x03\x02\x02\x02\u046D" +
+    "\u046E\x03\x02\x02\x02\u046E\u0470\x05\xECw\x02\u046F\u046C\x03\x02\x02" +
+    "\x02\u0470\u0473\x03\x02\x02\x02\u0471\u046F\x03\x02\x02\x02\u0471\u0472" +
+    "\x03\x02\x02\x02\u0472\u0475\x03\x02\x02\x02\u0473\u0471\x03\x02\x02\x02" +
+    "\u0474\u0476\x07p\x02\x02\u0475\u0474\x03\x02\x02\x02\u0475\u0476\x03" +
+    "\x02\x02\x02\u0476\xE5\x03\x02\x02\x02\u0477\u0478\x05\xEEx\x02\u0478" +
+    "\u0479\x07q\x02\x02\u0479\u047B\x03\x02\x02\x02\u047A\u0477\x03\x02\x02" +
+    "\x02\u047A\u047B\x03\x02\x02\x02\u047B\u047C\x03\x02\x02\x02\u047C\u047D" +
+    "\t\x11\x02\x02\u047D\xE7\x03\x02\x02\x02\u047E\u047F\x05\f\x07\x02\u047F" +
+    "\u0481\x05\xEEx\x02\u0480\u0482\x05\xEAv\x02\u0481\u0480\x03\x02\x02\x02" +
+    "\u0481\u0482\x03\x02\x02\x02\u0482\xE9\x03\x02\x02\x02\u0483\u0484\x07" +
+    "q\x02\x02\u0484\u048B\x05\xD4k\x02\u0485\u0486\x07q\x02\x02\u0486\u0487" +
+    "\x05\xBE`\x02\u0487\u0488\x07f\x02\x02\u0488\u0489\x07g\x02\x02\u0489" +
+    "\u048B\x03\x02\x02\x02\u048A\u0483\x03\x02\x02\x02\u048A\u0485\x03\x02" +
+    "\x02\x02\u048B\xEB\x03\x02\x02\x02\u048C\u0490\x05\xE8u\x02\u048D\u0490" +
+    "\x05\xE6t\x02\u048E\u0490\x05f4\x02\u048F\u048C\x03\x02\x02\x02\u048F" +
+    "\u048D\x03\x02\x02\x02\u048F\u048E\x03\x02\x02\x02\u0490\xED\x03\x02\x02" +
+    "\x02\u0491\u0496\x05\xF2z\x02\u0492\u0493\x07q\x02\x02\u0493\u0495\x05" +
+    "\xF2z\x02\u0494\u0492\x03\x02\x02\x02\u0495\u0498\x03\x02\x02\x02\u0496" +
+    "\u0494\x03\x02\x02\x02\u0496\u0497\x03\x02\x02\x02\u0497\xEF\x03\x02\x02" +
+    "\x02\u0498\u0496\x03\x02\x02\x02\u0499\u049A\x05\xD2j\x02\u049A\xF1\x03" +
+    "\x02\x02\x02\u049B\u049C\x05\xD2j\x02\u049C\xF3\x03\x02\x02\x02\u049D" +
+    "\u049E\x05\xD8m\x02\u049E\u049F\x07\x02\x02\x03\u049F\xF5\x03\x02\x02" +
+    "\x02\u04A0\u04A1\x05\xD2j\x02\u04A1\xF7\x03\x02\x02\x02\u04A2\u04A3\x05" +
+    "\xD2j\x02\u04A3\xF9\x03\x02\x02\x02\u04A4\u04A5\x05\xC4c\x02\u04A5\xFB" +
+    "\x03\x02\x02\x02\x7F\xFE\u0100\u010C\u0117\u011F\u0134\u013C\u0142\u0153" +
+    "\u0158\u015D\u0163\u0168\u016C\u0176\u017B\u017E\u0183\u0189\u018D\u0193" +
+    "\u0197\u0199\u019C\u01A3\u01A7\u01B6\u01BE\u01C6\u01CA\u01CF\u01D1\u01E2" +
+    "\u01EA\u01EC\u01F0\u01FD\u0202\u0206\u0211\u021A\u021C\u0221\u0236\u0239" +
+    "\u0245\u024A\u024E\u0256\u025B\u025F\u0279\u0281\u0286\u0288\u028F\u0294" +
+    "\u0298\u02A2\u02A7\u02AF\u02B4\u02B8\u02BA\u02C0\u02C5\u02CC\u02D0\u02DA" +
+    "\u02DF\u02E3\u02EA\u0303\u030D\u0312\u0316\u031A\u0322\u0327\u032B\u0330" +
+    "\u0337\u034A\u034F\u0353\u0357\u035A\u0363\u0368\u036D\u0371\u0375\u037A" +
+    "\u0381\u0395\u03A2\u03AB\u03CE\u03D4\u03DF\u03E4\u03EB\u03ED\u03F0\u03F4" +
+    "\u0400\u0405\u043B\u043D\u0441\u0448\u044C\u0450\u045A\u045E\u0462\u0467" +
+    "\u046C\u0471\u0475\u047A\u0481\u048A\u048F\u0496";
 MalloyParser._serializedATN = Utils.join([
     MalloyParser._serializedATNSegment0,
     MalloyParser._serializedATNSegment1,

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

@@ -16,10 +16,11 @@ export declare class MalloyTagLexer extends Lexer {
     static readonly AR_END = 11;
     static readonly SQ_STRING = 12;
     static readonly DQ_STRING = 13;
-    static readonly BARE_STRING = 14;
-    static readonly COMMENT = 15;
-    static readonly WHITE_SPACE = 16;
-    static readonly UNEXPECTED_CHAR = 17;
+    static readonly NUMERIC_LITERAL = 14;
+    static readonly BARE_STRING = 15;
+    static readonly COMMENT = 16;
+    static readonly WHITE_SPACE = 17;
+    static readonly UNEXPECTED_CHAR = 18;
     static readonly channelNames: string[];
     static readonly modeNames: string[];
     static readonly ruleNames: string[];