@malloydata/malloy 0.0.12-dev221202180754 → 0.0.12-dev221204205211

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

@@ -125,26 +125,27 @@ export declare class MalloyParser extends Parser {
     static readonly SEMI = 114;
     static readonly NOT_MATCH = 115;
     static readonly MATCH = 116;
-    static readonly LITERAL_TIMESTAMP = 117;
-    static readonly LITERAL_DAY = 118;
-    static readonly LITERAL_QUARTER = 119;
-    static readonly LITERAL_MONTH = 120;
-    static readonly LITERAL_WEEK = 121;
-    static readonly LITERAL_YEAR = 122;
-    static readonly IDENTIFIER = 123;
-    static readonly PERCENT_LITERAL = 124;
-    static readonly INTEGER_LITERAL = 125;
-    static readonly NUMERIC_LITERAL = 126;
-    static readonly OBJECT_NAME_LITERAL = 127;
-    static readonly BLOCK_COMMENT = 128;
-    static readonly COMMENT_TO_EOL = 129;
-    static readonly WHITE_SPACE = 130;
-    static readonly SQL_BEGIN = 131;
-    static readonly CLOSE_CODE = 132;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 133;
-    static readonly UNEXPECTED_CHAR = 134;
-    static readonly OPEN_CODE = 135;
-    static readonly SQL_END = 136;
+    static readonly PERCENT = 117;
+    static readonly LITERAL_TIMESTAMP = 118;
+    static readonly LITERAL_DAY = 119;
+    static readonly LITERAL_QUARTER = 120;
+    static readonly LITERAL_MONTH = 121;
+    static readonly LITERAL_WEEK = 122;
+    static readonly LITERAL_YEAR = 123;
+    static readonly IDENTIFIER = 124;
+    static readonly PERCENT_LITERAL = 125;
+    static readonly INTEGER_LITERAL = 126;
+    static readonly NUMERIC_LITERAL = 127;
+    static readonly OBJECT_NAME_LITERAL = 128;
+    static readonly BLOCK_COMMENT = 129;
+    static readonly COMMENT_TO_EOL = 130;
+    static readonly WHITE_SPACE = 131;
+    static readonly SQL_BEGIN = 132;
+    static readonly CLOSE_CODE = 133;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 134;
+    static readonly UNEXPECTED_CHAR = 135;
+    static readonly OPEN_CODE = 136;
+    static readonly SQL_END = 137;
     static readonly RULE_malloyDocument = 0;
     static readonly RULE_malloyStatement = 1;
     static readonly RULE_defineExploreStatement = 2;
@@ -1567,6 +1568,7 @@ export declare class ExprMulDivContext extends FieldExprContext {
     fieldExpr(i: number): FieldExprContext;
     STAR(): TerminalNode | undefined;
     SLASH(): TerminalNode | undefined;
+    PERCENT(): TerminalNode | undefined;
     constructor(ctx: FieldExprContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;

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

@@ -4185,7 +4185,7 @@ class MalloyParser extends Parser_1.Parser {
                                         }
                                         this.state = 818;
                                         _la = this._input.LA(1);
-                                        if (!(_la === MalloyParser.STAR || _la === MalloyParser.SLASH)) {
+                                        if (!(((((_la - 110)) & ~0x1F) === 0 && ((1 << (_la - 110)) & ((1 << (MalloyParser.STAR - 110)) | (1 << (MalloyParser.SLASH - 110)) | (1 << (MalloyParser.PERCENT - 110)))) !== 0))) {
                                             this._errHandler.recoverInline(this);
                                         }
                                         else {
@@ -5468,26 +5468,27 @@ MalloyParser.BAR = 113;
 MalloyParser.SEMI = 114;
 MalloyParser.NOT_MATCH = 115;
 MalloyParser.MATCH = 116;
-MalloyParser.LITERAL_TIMESTAMP = 117;
-MalloyParser.LITERAL_DAY = 118;
-MalloyParser.LITERAL_QUARTER = 119;
-MalloyParser.LITERAL_MONTH = 120;
-MalloyParser.LITERAL_WEEK = 121;
-MalloyParser.LITERAL_YEAR = 122;
-MalloyParser.IDENTIFIER = 123;
-MalloyParser.PERCENT_LITERAL = 124;
-MalloyParser.INTEGER_LITERAL = 125;
-MalloyParser.NUMERIC_LITERAL = 126;
-MalloyParser.OBJECT_NAME_LITERAL = 127;
-MalloyParser.BLOCK_COMMENT = 128;
-MalloyParser.COMMENT_TO_EOL = 129;
-MalloyParser.WHITE_SPACE = 130;
-MalloyParser.SQL_BEGIN = 131;
-MalloyParser.CLOSE_CODE = 132;
-MalloyParser.UNWATED_CHARS_TRAILING_NUMBERS = 133;
-MalloyParser.UNEXPECTED_CHAR = 134;
-MalloyParser.OPEN_CODE = 135;
-MalloyParser.SQL_END = 136;
+MalloyParser.PERCENT = 117;
+MalloyParser.LITERAL_TIMESTAMP = 118;
+MalloyParser.LITERAL_DAY = 119;
+MalloyParser.LITERAL_QUARTER = 120;
+MalloyParser.LITERAL_MONTH = 121;
+MalloyParser.LITERAL_WEEK = 122;
+MalloyParser.LITERAL_YEAR = 123;
+MalloyParser.IDENTIFIER = 124;
+MalloyParser.PERCENT_LITERAL = 125;
+MalloyParser.INTEGER_LITERAL = 126;
+MalloyParser.NUMERIC_LITERAL = 127;
+MalloyParser.OBJECT_NAME_LITERAL = 128;
+MalloyParser.BLOCK_COMMENT = 129;
+MalloyParser.COMMENT_TO_EOL = 130;
+MalloyParser.WHITE_SPACE = 131;
+MalloyParser.SQL_BEGIN = 132;
+MalloyParser.CLOSE_CODE = 133;
+MalloyParser.UNWATED_CHARS_TRAILING_NUMBERS = 134;
+MalloyParser.UNEXPECTED_CHAR = 135;
+MalloyParser.OPEN_CODE = 136;
+MalloyParser.SQL_END = 137;
 MalloyParser.RULE_malloyDocument = 0;
 MalloyParser.RULE_malloyStatement = 1;
 MalloyParser.RULE_defineExploreStatement = 2;
@@ -5633,9 +5634,9 @@ 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, "'\"\"\"'", "'}%'",
 ];
 MalloyParser._SYMBOLIC_NAMES = [
     undefined, "JSON_STRING", "ACCEPT", "AGGREGATE", "CONNECTION", "DECLARE",
@@ -5652,7 +5653,7 @@ MalloyParser._SYMBOLIC_NAMES = [
     "AMPER", "ARROW", "FAT_ARROW", "OPAREN", "CPAREN", "OBRACK", "CBRACK",
     "OCURLY", "CCURLY", "DOUBLECOLON", "COLON", "COMMA", "DOT", "LT", "GT",
     "EQ", "NE", "LTE", "GTE", "PLUS", "MINUS", "STAR", "STARSTAR", "SLASH",
-    "BAR", "SEMI", "NOT_MATCH", "MATCH", "LITERAL_TIMESTAMP", "LITERAL_DAY",
+    "BAR", "SEMI", "NOT_MATCH", "MATCH", "PERCENT", "LITERAL_TIMESTAMP", "LITERAL_DAY",
     "LITERAL_QUARTER", "LITERAL_MONTH", "LITERAL_WEEK", "LITERAL_YEAR", "IDENTIFIER",
     "PERCENT_LITERAL", "INTEGER_LITERAL", "NUMERIC_LITERAL", "OBJECT_NAME_LITERAL",
     "BLOCK_COMMENT", "COMMENT_TO_EOL", "WHITE_SPACE", "SQL_BEGIN", "CLOSE_CODE",
@@ -5660,7 +5661,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\x8A\u03E6\x04" +
+MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x8B\u03E6\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" +
@@ -5756,15 +5757,15 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\x02\xA8\x02\xAA\x02\xAC\x02\xAE\x02\xB0\x02\xB2\x02\xB4\x02\xB6\x02\xB8" +
     "\x02\xBA\x02\xBC\x02\xBE\x02\xC0\x02\xC2\x02\xC4\x02\xC6\x02\xC8\x02\xCA" +
     "\x02\xCC\x02\xCE\x02\xD0\x02\x02\x14\x04\x02\n\n\x1B\x1B\x04\x02\x04\x04" +
-    "\t\t\x04\x02##--\x05\x0222QQ~\x7F\x06\x02$$**<=KK\x07\x02%%++CCJJOO\x04" +
-    "\x02hmuv\x03\x02\x7F\x80\x04\x0222QQ\x04\x02}}\x81\x81\b\x02,,77>?HIS" +
-    "SVV\x04\x02  11\x04\x02pprr\x03\x02no\x04\x02!!EE\x04\x02[[ss\x04\x02" +
-    "GGee\x03\x02pq\x02\u0427\x02\xD6\x03\x02\x02\x02\x04\xDF\x03\x02\x02\x02" +
-    "\x06\xE1\x03\x02\x02\x02\b\xE4\x03\x02\x02\x02\n\xEA\x03\x02\x02\x02\f" +
-    "\xEC\x03\x02\x02\x02\x0E\xEE\x03\x02\x02\x02\x10\xF6\x03\x02\x02\x02\x12" +
-    "\u0102\x03\x02\x02\x02\x14\u0104\x03\x02\x02\x02\x16\u010D\x03\x02\x02" +
-    "\x02\x18\u0111\x03\x02\x02\x02\x1A\u0114\x03\x02\x02\x02\x1C\u0116\x03" +
-    "\x02\x02\x02\x1E\u0123\x03\x02\x02\x02 \u0127\x03\x02\x02\x02\"\u013B" +
+    "\t\t\x04\x02##--\x05\x0222QQ\x7F\x80\x06\x02$$**<=KK\x07\x02%%++CCJJO" +
+    "O\x04\x02hmuv\x03\x02\x80\x81\x04\x0222QQ\x04\x02~~\x82\x82\b\x02,,77" +
+    ">?HISSVV\x04\x02  11\x05\x02pprrww\x03\x02no\x04\x02!!EE\x04\x02[[ss\x04" +
+    "\x02GGee\x03\x02pq\x02\u0427\x02\xD6\x03\x02\x02\x02\x04\xDF\x03\x02\x02" +
+    "\x02\x06\xE1\x03\x02\x02\x02\b\xE4\x03\x02\x02\x02\n\xEA\x03\x02\x02\x02" +
+    "\f\xEC\x03\x02\x02\x02\x0E\xEE\x03\x02\x02\x02\x10\xF6\x03\x02\x02\x02" +
+    "\x12\u0102\x03\x02\x02\x02\x14\u0104\x03\x02\x02\x02\x16\u010D\x03\x02" +
+    "\x02\x02\x18\u0111\x03\x02\x02\x02\x1A\u0114\x03\x02\x02\x02\x1C\u0116" +
+    "\x03\x02\x02\x02\x1E\u0123\x03\x02\x02\x02 \u0127\x03\x02\x02\x02\"\u013B" +
     "\x03\x02\x02\x02$\u013D\x03\x02\x02\x02&\u014C\x03\x02\x02\x02(\u014E" +
     "\x03\x02\x02\x02*\u0151\x03\x02\x02\x02,\u0160\x03\x02\x02\x02.\u0162" +
     "\x03\x02\x02\x020\u0167\x03\x02\x02\x022\u0169\x03\x02\x02\x024\u016B" +
@@ -5815,11 +5816,11 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\x07c\x02\x02\xFD\x11\x03\x02\x02\x02\xFE\xFF\x07\x06\x02\x02\xFF\u0103" +
     "\x05\xD0i\x02\u0100\u0101\x07\x1A\x02\x02\u0101\u0103\x05\x14\v\x02\u0102" +
     "\xFE\x03\x02\x02\x02\u0102\u0100\x03\x02\x02\x02\u0103\x13\x03\x02\x02" +
-    "\x02\u0104\u0108\x07\x85\x02\x02\u0105\u0107\x05\x16\f\x02\u0106\u0105" +
+    "\x02\u0104\u0108\x07\x86\x02\x02\u0105\u0107\x05\x16\f\x02\u0106\u0105" +
     "\x03\x02\x02\x02\u0107\u010A\x03\x02\x02\x02\u0108\u0106\x03\x02\x02\x02" +
     "\u0108\u0109\x03\x02\x02\x02\u0109\u010B\x03\x02\x02\x02\u010A\u0108\x03" +
-    "\x02\x02\x02\u010B\u010C\x07\x8A\x02\x02\u010C\x15\x03\x02\x02\x02\u010D" +
-    "\u010E\x07\x89\x02\x02\u010E\u010F\x05\"\x12\x02\u010F\u0110\x07\x86\x02" +
+    "\x02\x02\x02\u010B\u010C\x07\x8B\x02\x02\u010C\x15\x03\x02\x02\x02\u010D" +
+    "\u010E\x07\x8A\x02\x02\u010E\u010F\x05\"\x12\x02\u010F\u0110\x07\x87\x02" +
     "\x02\u0110\x17\x03\x02\x02\x02\u0111\u0112\x078\x02\x02\u0112\u0113\x05" +
     "\x1A\x0E\x02\u0113\x19\x03\x02\x02\x02\u0114\u0115\x07\x03\x02\x02\u0115" +
     "\x1B\x03\x02\x02\x02\u0116\u011D\x05\x1E\x10\x02\u0117\u0119\x07f\x02" +
@@ -5909,13 +5910,12 @@ MalloyParser._serializedATNSegment0 = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\
     "\x03\x02\x02\x02\u01D2\u01D3\x03\x02\x02\x02\u01D3\u01D4\x03\x02\x02\x02" +
     "\u01D4\u01D6\x05R*\x02\u01D5\u01D2\x03\x02\x02\x02\u01D6\u01D9\x03\x02" +
     "\x02\x02\u01D7\u01D5\x03\x02\x02\x02\u01D7\u01D8\x03\x02\x02\x02\u01D8" +
-    "\u01DB\x03\x02\x02\x02\u01D9\u01D7\x03\x02\x02\x02\u01DA\u01DC\x07f\x02" +
-    "\x02\u01DB";
-MalloyParser._serializedATNSegment1 = "\u01DA\x03\x02\x02\x02\u01DB\u01DC\x03\x02\x02\x02\u01DCK\x03\x02\x02" +
-    "\x02\u01DD\u01DE\x05N(\x02\u01DE\u01DF\x079\x02\x02\u01DF\u01E0\x05\xAA" +
-    "V\x02\u01E0M\x03\x02\x02\x02\u01E1\u01E2\x05\xA4S\x02\u01E2O\x03\x02\x02" +
-    "\x02\u01E3\u01E4\x05\xA4S\x02\u01E4Q\x03\x02\x02\x02\u01E5\u01E6\x05L" +
-    "\'\x02\u01E6S\x03\x02\x02\x02\u01E7\u01E8\x07\x07\x02\x02\u01E8\u01EF" +
+    "\u01DB\x03\x02\x02\x02\u01D9\u01D7\x03\x02\x02\x02\u01DA\u01DC\x07f\x02";
+MalloyParser._serializedATNSegment1 = "\x02\u01DB\u01DA\x03\x02\x02\x02\u01DB\u01DC\x03\x02\x02\x02\u01DCK\x03" +
+    "\x02\x02\x02\u01DD\u01DE\x05N(\x02\u01DE\u01DF\x079\x02\x02\u01DF\u01E0" +
+    "\x05\xAAV\x02\u01E0M\x03\x02\x02\x02\u01E1\u01E2\x05\xA4S\x02\u01E2O\x03" +
+    "\x02\x02\x02\u01E3\u01E4\x05\xA4S\x02\u01E4Q\x03\x02\x02\x02\u01E5\u01E6" +
+    "\x05L\'\x02\u01E6S\x03\x02\x02\x02\u01E7\u01E8\x07\x07\x02\x02\u01E8\u01EF" +
     "\x05L\'\x02\u01E9\u01EB\x07f\x02\x02\u01EA\u01E9\x03\x02\x02\x02\u01EA" +
     "\u01EB\x03\x02\x02\x02\u01EB\u01EC\x03\x02\x02\x02\u01EC\u01EE\x05L\'" +
     "\x02\u01ED\u01EA\x03\x02\x02\x02\u01EE\u01F1\x03\x02\x02\x02\u01EF\u01ED" +
@@ -6001,14 +6001,14 @@ MalloyParser._serializedATNSegment1 = "\u01DA\x03\x02\x02\x02\u01DB\u01DC\x03\x0
     "\x03\x02\x02\x02\u029E\u029F\x03\x02\x02\x02\u029F\u02A2\x03\x02\x02\x02" +
     "\u02A0\u029E\x03\x02\x02\x02\u02A1\u02A3\x07f\x02\x02\u02A2\u02A1\x03" +
     "\x02\x02\x02\u02A2\u02A3\x03\x02\x02\x02\u02A3\x85\x03\x02\x02\x02\u02A4" +
-    "\u02A7\x07\x7F\x02\x02\u02A5\u02A7\x05\xBE`\x02\u02A6\u02A4\x03\x02\x02" +
+    "\u02A7\x07\x80\x02\x02\u02A5\u02A7\x05\xBE`\x02\u02A6\u02A4\x03\x02\x02" +
     "\x02\u02A6\u02A5\x03\x02\x02\x02\u02A7\u02A9\x03\x02\x02\x02\u02A8\u02AA" +
     "\t\x04\x02\x02\u02A9\u02A8\x03\x02\x02\x02\u02A9\u02AA\x03\x02\x02\x02" +
     "\u02AA\x87\x03\x02\x02\x02\u02AB\u02AC\x07\x11\x02\x02\u02AC\u02AD\x07" +
-    "\x7F\x02\x02\u02AD\x89\x03\x02\x02\x02\u02AE\u02AF\x07&\x02\x02\u02AF" +
+    "\x80\x02\x02\u02AD\x89\x03\x02\x02\x02\u02AE\u02AF\x07&\x02\x02\u02AF" +
     "\u02B3\x05\xBE`\x02\u02B0\u02B1\x07&\x02\x02\u02B1\u02B3\x05\xAAV\x02" +
     "\u02B2\u02AE\x03\x02\x02\x02\u02B2\u02B0\x03\x02\x02\x02\u02B3\x8B\x03" +
-    "\x02\x02\x02\u02B4\u02B5\x07\x1E\x02\x02\u02B5\u02B7\x07\x7F\x02\x02\u02B6" +
+    "\x02\x02\x02\u02B4\u02B5\x07\x1E\x02\x02\u02B5\u02B7\x07\x80\x02\x02\u02B6" +
     "\u02B8\x05\x8AF\x02\u02B7\u02B6\x03\x02\x02\x02\u02B7\u02B8\x03\x02\x02" +
     "\x02\u02B8\x8D\x03\x02\x02\x02\u02B9\u02BC\x05\xBA^\x02\u02BA\u02BB\x07" +
     "g\x02\x02\u02BB\u02BD\x07p\x02\x02\u02BC\u02BA\x03\x02\x02\x02\u02BC\u02BD" +
@@ -6031,8 +6031,8 @@ MalloyParser._serializedATNSegment1 = "\u01DA\x03\x02\x02\x02\u01DB\u01DC\x03\x0
     "\x03\x02\x02\x02\u02E3\u02DD\x03\x02\x02\x02\u02E3\u02DE\x03\x02\x02\x02" +
     "\u02E3\u02DF\x03\x02\x02\x02\u02E3\u02E0\x03\x02\x02\x02\u02E3\u02E1\x03" +
     "\x02\x02\x02\u02E3\u02E2\x03\x02\x02\x02\u02E4\x9F\x03\x02\x02\x02\u02E5" +
-    "\u02EC\x07w\x02\x02\u02E6\u02EC\x07x\x02\x02\u02E7\u02EC\x07{\x02\x02" +
-    "\u02E8\u02EC\x07z\x02\x02\u02E9\u02EC\x07y\x02\x02\u02EA\u02EC\x07|\x02" +
+    "\u02EC\x07x\x02\x02\u02E6\u02EC\x07y\x02\x02\u02E7\u02EC\x07|\x02\x02" +
+    "\u02E8\u02EC\x07{\x02\x02\u02E9\u02EC\x07z\x02\x02\u02EA\u02EC\x07}\x02" +
     "\x02\u02EB\u02E5\x03\x02\x02\x02\u02EB\u02E6\x03\x02\x02\x02\u02EB\u02E7" +
     "\x03\x02\x02\x02\u02EB\u02E8\x03\x02\x02\x02\u02EB\u02E9\x03\x02\x02\x02" +
     "\u02EB\u02EA\x03\x02\x02\x02\u02EC\xA1\x03\x02\x02\x02\u02ED\u02EE\x07" +
@@ -6126,7 +6126,7 @@ MalloyParser._serializedATNSegment1 = "\u01DA\x03\x02\x02\x02\u01DB\u01DC\x03\x0
     "\x02\x02\x02\u03AC\u03AD\x05\xA4S\x02\u03AD\xBF\x03\x02\x02\x02\u03AE" +
     "\u03AF\x05\xAAV\x02\u03AF\u03B0\x07\x02\x02\x03\u03B0\xC1\x03\x02\x02" +
     "\x02\u03B1\u03B2\x05\xC4c\x02\u03B2\xC3\x03\x02\x02\x02\u03B3\u03BC\x07" +
-    "\x03\x02\x02\u03B4\u03BC\x07\x7F\x02\x02\u03B5\u03BC\x07\x80\x02\x02\u03B6" +
+    "\x03\x02\x02\u03B4\u03BC\x07\x80\x02\x02\u03B5\u03BC\x07\x81\x02\x02\u03B6" +
     "\u03BC\x05\xC6d\x02\u03B7\u03BC\x05\xCAf\x02\u03B8\u03BC\x07Q\x02\x02" +
     "\u03B9\u03BC\x072\x02\x02\u03BA\u03BC\x07B\x02\x02\u03BB\u03B3\x03\x02" +
     "\x02\x02\u03BB\u03B4\x03\x02\x02\x02\u03BB\u03B5\x03\x02\x02\x02\u03BB" +
@@ -10564,6 +10564,7 @@ class ExprMulDivContext extends FieldExprContext {
     }
     STAR() { return this.tryGetToken(MalloyParser.STAR, 0); }
     SLASH() { return this.tryGetToken(MalloyParser.SLASH, 0); }
+    PERCENT() { return this.tryGetToken(MalloyParser.PERCENT, 0); }
     constructor(ctx) {
         super(ctx.parent, ctx.invokingState);
         this.copyFrom(ctx);

package/dist/lang/parse-malloy.js

@@ -49,6 +49,18 @@ const document_highlight_walker_1 = require("./parse-tree-walkers/document-highl
 const document_completion_walker_1 = require("./parse-tree-walkers/document-completion-walker");
 const document_help_context_walker_1 = require("./parse-tree-walkers/document-help-context-walker");
 const reference_list_1 = require("./reference-list");
+/**
+ * This ignores a -> popMode when the mode stack is empty, which is a hack,
+ * but it let's us parse }%
+ */
+class HandlesOverpoppingLexer extends MalloyLexer_1.MalloyLexer {
+    popMode() {
+        if (this._modeStack.isEmpty) {
+            return this._mode;
+        }
+        return super.popMode();
+    }
+}
 class MalloyParserErrorHandler {
     constructor(translator, messages) {
         this.translator = translator;
@@ -105,7 +117,16 @@ class ParseStep {
         }
         const source = srcEnt.value == "" ? "\n" : srcEnt.value;
         this.sourceInfo = this.getSourceInfo(source);
-        const parse = this.runParser(source, that);
+        let parse;
+        try {
+            parse = this.runParser(source, that);
+        }
+        catch (parseException) {
+            that.root.logger.log({
+                message: `Malloy internal parser exception [${parseException.message}]`,
+            });
+            parse = undefined;
+        }
         if (that.root.logger.hasErrors()) {
             this.response = {
                 parse,
@@ -154,7 +175,7 @@ class ParseStep {
     }
     runParser(source, that) {
         const inputStream = antlr4ts_1.CharStreams.fromString(source);
-        const lexer = new MalloyLexer_1.MalloyLexer(inputStream);
+        const lexer = new HandlesOverpoppingLexer(inputStream);
         const tokenStream = new antlr4ts_1.CommonTokenStream(lexer);
         const malloyParser = new MalloyParser_1.MalloyParser(tokenStream);
         malloyParser.removeErrorListeners();

package/dist/lang/parse-to-ast.js

@@ -741,7 +741,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.ExprAddSub(lhs, op, rhs);
     }
     visitExprMulDiv(pcx) {
-        return new ast.ExprMulDiv(this.getFieldExpr(pcx.fieldExpr(0)), pcx.STAR() ? "*" : "/", this.getFieldExpr(pcx.fieldExpr(1)));
+        const op = pcx.STAR() ? "*" : pcx.SLASH() ? "/" : "%";
+        return new ast.ExprMulDiv(this.getFieldExpr(pcx.fieldExpr(0)), op, this.getFieldExpr(pcx.fieldExpr(1)));
     }
     visitExprCompare(pcx) {
         const op = pcx.compareOp().text;

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

@@ -933,6 +933,7 @@ describe("expressions", () => {
         test("addition", exprOK("42 + 7"));
         test("subtraction", exprOK("42 - 7"));
         test("multiplication", exprOK("42 * 7"));
+        test("mod", exprOK("42 % 7"));
         test("division", exprOK("42 / 7"));
         test("unary negation", exprOK("- ai"));
         test("equal", exprOK("42 = 7"));
@@ -1260,6 +1261,9 @@ describe("error handling", () => {
       }
     }
     `));
+    test("popping out of embedding when not embedded", () => {
+        expect("}%").compileToFailWith("extraneous input '}%' expecting {<EOF>, EXPLORE, QUERY, SOURCE, SQL, IMPORT, ';'}");
+    });
 });
 function getSelectOneStruct(sqlBlock) {
     const selectThis = sqlBlock.select[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.12-dev221202180754",
+  "version": "0.0.12-dev221204205211",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",