@malloydata/malloy 0.0.78 → 0.0.79-dev230818134709

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

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PropertiesContext = exports.ArrayValueContext = exports.ReferenceContext = exports.ArrayElementContext = exports.EqValueContext = exports.PropNameContext = exports.StringContext = exports.TagDefContext = exports.TagUpdatePropertiesContext = exports.TagReplacePropertiesContext = exports.TagEqContext = exports.TagSpecContext = exports.TagLineContext = exports.MalloyTagParser = void 0;
+exports.PropertiesContext = exports.ArrayValueContext = exports.ReferenceContext = exports.ArrayElementContext = exports.EqValueContext = exports.PropNameContext = exports.IdentifierContext = exports.StringContext = exports.TagDefContext = exports.TagUpdatePropertiesContext = exports.TagReplacePropertiesContext = exports.TagEqContext = exports.TagSpecContext = exports.TagLineContext = exports.MalloyTagParser = void 0;
 const ATN_1 = require("antlr4ts/atn/ATN");
 const ATNDeserializer_1 = require("antlr4ts/atn/ATNDeserializer");
 const FailedPredicateException_1 = require("antlr4ts/FailedPredicateException");
@@ -64,21 +64,21 @@ class MalloyTagParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 21;
+                this.state = 23;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.NUMERIC_LITERAL) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
+                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.BQ_STRING) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
                     {
                         {
-                            this.state = 18;
+                            this.state = 20;
                             this.tagSpec();
                         }
                     }
-                    this.state = 23;
+                    this.state = 25;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
-                this.state = 24;
+                this.state = 26;
                 this.match(MalloyTagParser.EOF);
             }
         }
@@ -103,25 +103,25 @@ class MalloyTagParser extends Parser_1.Parser {
         this.enterRule(_localctx, 2, MalloyTagParser.RULE_tagSpec);
         let _la;
         try {
-            this.state = 46;
+            this.state = 48;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 4, this._ctx)) {
                 case 1:
                     _localctx = new TagEqContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 26;
+                        this.state = 28;
                         this.propName();
-                        this.state = 27;
+                        this.state = 29;
                         this.match(MalloyTagParser.EQ);
-                        this.state = 28;
-                        this.eqValue();
                         this.state = 30;
+                        this.eqValue();
+                        this.state = 32;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyTagParser.PR_BEG) {
                             {
-                                this.state = 29;
+                                this.state = 31;
                                 this.properties();
                             }
                         }
@@ -131,20 +131,20 @@ class MalloyTagParser extends Parser_1.Parser {
                     _localctx = new TagReplacePropertiesContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 32;
+                        this.state = 34;
                         this.propName();
-                        this.state = 33;
-                        this.match(MalloyTagParser.EQ);
                         this.state = 35;
+                        this.match(MalloyTagParser.EQ);
+                        this.state = 37;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyTagParser.DOTTY) {
                             {
-                                this.state = 34;
+                                this.state = 36;
                                 this.match(MalloyTagParser.DOTTY);
                             }
                         }
-                        this.state = 37;
+                        this.state = 39;
                         this.properties();
                     }
                     break;
@@ -152,9 +152,9 @@ class MalloyTagParser extends Parser_1.Parser {
                     _localctx = new TagUpdatePropertiesContext(_localctx);
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 39;
+                        this.state = 41;
                         this.propName();
-                        this.state = 40;
+                        this.state = 42;
                         this.properties();
                     }
                     break;
@@ -162,16 +162,16 @@ class MalloyTagParser extends Parser_1.Parser {
                     _localctx = new TagDefContext(_localctx);
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 43;
+                        this.state = 45;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyTagParser.MINUS) {
                             {
-                                this.state = 42;
+                                this.state = 44;
                                 this.match(MalloyTagParser.MINUS);
                             }
                         }
-                        this.state = 45;
+                        this.state = 47;
                         this.propName();
                     }
                     break;
@@ -200,7 +200,7 @@ class MalloyTagParser extends Parser_1.Parser {
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 48;
+                this.state = 50;
                 _la = this._input.LA(1);
                 if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.NUMERIC_LITERAL) | (1 << MalloyTagParser.BARE_STRING))) !== 0))) {
                     this._errHandler.recoverInline(this);
@@ -230,28 +230,65 @@ class MalloyTagParser extends Parser_1.Parser {
         return _localctx;
     }
     // @RuleVersion(0)
+    identifier() {
+        let _localctx = new IdentifierContext(this._ctx, this.state);
+        this.enterRule(_localctx, 6, MalloyTagParser.RULE_identifier);
+        let _la;
+        try {
+            this.enterOuterAlt(_localctx, 1);
+            {
+                this.state = 52;
+                _la = this._input.LA(1);
+                if (!(_la === MalloyTagParser.BQ_STRING || _la === MalloyTagParser.BARE_STRING)) {
+                    this._errHandler.recoverInline(this);
+                }
+                else {
+                    if (this._input.LA(1) === Token_1.Token.EOF) {
+                        this.matchedEOF = true;
+                    }
+                    this._errHandler.reportMatch(this);
+                    this.consume();
+                }
+            }
+        }
+        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)
     propName() {
         let _localctx = new PropNameContext(this._ctx, this.state);
-        this.enterRule(_localctx, 6, MalloyTagParser.RULE_propName);
+        this.enterRule(_localctx, 8, MalloyTagParser.RULE_propName);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 50;
-                this.string();
-                this.state = 55;
+                this.state = 54;
+                this.identifier();
+                this.state = 59;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 while (_la === MalloyTagParser.DOT) {
                     {
                         {
-                            this.state = 51;
+                            this.state = 55;
                             this.match(MalloyTagParser.DOT);
-                            this.state = 52;
-                            this.string();
+                            this.state = 56;
+                            this.identifier();
                         }
                     }
-                    this.state = 57;
+                    this.state = 61;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
@@ -275,9 +312,9 @@ class MalloyTagParser extends Parser_1.Parser {
     // @RuleVersion(0)
     eqValue() {
         let _localctx = new EqValueContext(this._ctx, this.state);
-        this.enterRule(_localctx, 8, MalloyTagParser.RULE_eqValue);
+        this.enterRule(_localctx, 10, MalloyTagParser.RULE_eqValue);
         try {
-            this.state = 61;
+            this.state = 65;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyTagParser.SQ_STRING:
@@ -286,21 +323,21 @@ class MalloyTagParser extends Parser_1.Parser {
                 case MalloyTagParser.BARE_STRING:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 58;
+                        this.state = 62;
                         this.string();
                     }
                     break;
                 case MalloyTagParser.AR_BEG:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 59;
+                        this.state = 63;
                         this.arrayValue();
                     }
                     break;
                 case MalloyTagParser.RF_BEG:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 60;
+                        this.state = 64;
                         this.reference();
                     }
                     break;
@@ -326,10 +363,10 @@ class MalloyTagParser extends Parser_1.Parser {
     // @RuleVersion(0)
     arrayElement() {
         let _localctx = new ArrayElementContext(this._ctx, this.state);
-        this.enterRule(_localctx, 10, MalloyTagParser.RULE_arrayElement);
+        this.enterRule(_localctx, 12, MalloyTagParser.RULE_arrayElement);
         let _la;
         try {
-            this.state = 70;
+            this.state = 74;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case MalloyTagParser.SQ_STRING:
@@ -338,14 +375,14 @@ class MalloyTagParser extends Parser_1.Parser {
                 case MalloyTagParser.BARE_STRING:
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 63;
+                        this.state = 67;
                         this.string();
-                        this.state = 65;
+                        this.state = 69;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
                         if (_la === MalloyTagParser.PR_BEG) {
                             {
-                                this.state = 64;
+                                this.state = 68;
                                 this.properties();
                             }
                         }
@@ -354,21 +391,21 @@ class MalloyTagParser extends Parser_1.Parser {
                 case MalloyTagParser.PR_BEG:
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 67;
+                        this.state = 71;
                         this.properties();
                     }
                     break;
                 case MalloyTagParser.AR_BEG:
                     this.enterOuterAlt(_localctx, 3);
                     {
-                        this.state = 68;
+                        this.state = 72;
                         this.arrayValue();
                     }
                     break;
                 case MalloyTagParser.RF_BEG:
                     this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 69;
+                        this.state = 73;
                         this.reference();
                     }
                     break;
@@ -394,15 +431,15 @@ class MalloyTagParser extends Parser_1.Parser {
     // @RuleVersion(0)
     reference() {
         let _localctx = new ReferenceContext(this._ctx, this.state);
-        this.enterRule(_localctx, 12, MalloyTagParser.RULE_reference);
+        this.enterRule(_localctx, 14, MalloyTagParser.RULE_reference);
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 72;
+                this.state = 76;
                 this.match(MalloyTagParser.RF_BEG);
-                this.state = 73;
+                this.state = 77;
                 this.propName();
-                this.state = 74;
+                this.state = 78;
                 this.match(MalloyTagParser.RF_END);
             }
         }
@@ -424,44 +461,44 @@ class MalloyTagParser extends Parser_1.Parser {
     // @RuleVersion(0)
     arrayValue() {
         let _localctx = new ArrayValueContext(this._ctx, this.state);
-        this.enterRule(_localctx, 14, MalloyTagParser.RULE_arrayValue);
+        this.enterRule(_localctx, 16, MalloyTagParser.RULE_arrayValue);
         let _la;
         try {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 76;
+                this.state = 80;
                 this.match(MalloyTagParser.AR_BEG);
-                this.state = 77;
+                this.state = 81;
                 this.arrayElement();
-                this.state = 82;
+                this.state = 86;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 9, this._ctx);
                 while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 78;
+                                this.state = 82;
                                 this.match(MalloyTagParser.COMMA);
-                                this.state = 79;
+                                this.state = 83;
                                 this.arrayElement();
                             }
                         }
                     }
-                    this.state = 84;
+                    this.state = 88;
                     this._errHandler.sync(this);
                     _alt = this.interpreter.adaptivePredict(this._input, 9, this._ctx);
                 }
-                this.state = 86;
+                this.state = 90;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === MalloyTagParser.COMMA) {
                     {
-                        this.state = 85;
+                        this.state = 89;
                         this.match(MalloyTagParser.COMMA);
                     }
                 }
-                this.state = 88;
+                this.state = 92;
                 this.match(MalloyTagParser.AR_END);
             }
         }
@@ -483,41 +520,39 @@ class MalloyTagParser extends Parser_1.Parser {
     // @RuleVersion(0)
     properties() {
         let _localctx = new PropertiesContext(this._ctx, this.state);
-        this.enterRule(_localctx, 16, MalloyTagParser.RULE_properties);
+        this.enterRule(_localctx, 18, MalloyTagParser.RULE_properties);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 90;
+                this.state = 94;
                 this.match(MalloyTagParser.PR_BEG);
-                this.state = 98;
+                this.state = 102;
                 this._errHandler.sync(this);
                 switch (this._input.LA(1)) {
                     case MalloyTagParser.DOTTY:
                         {
-                            this.state = 91;
+                            this.state = 95;
                             this.match(MalloyTagParser.DOTTY);
                         }
                         break;
                     case MalloyTagParser.MINUS:
                     case MalloyTagParser.PR_END:
-                    case MalloyTagParser.SQ_STRING:
-                    case MalloyTagParser.DQ_STRING:
-                    case MalloyTagParser.NUMERIC_LITERAL:
+                    case MalloyTagParser.BQ_STRING:
                     case MalloyTagParser.BARE_STRING:
                         {
                             {
-                                this.state = 95;
+                                this.state = 99;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.NUMERIC_LITERAL) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
+                                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.BQ_STRING) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
                                     {
                                         {
-                                            this.state = 92;
+                                            this.state = 96;
                                             this.tagSpec();
                                         }
                                     }
-                                    this.state = 97;
+                                    this.state = 101;
                                     this._errHandler.sync(this);
                                     _la = this._input.LA(1);
                                 }
@@ -527,7 +562,7 @@ class MalloyTagParser extends Parser_1.Parser {
                     default:
                         throw new NoViableAltException_1.NoViableAltException(this);
                 }
-                this.state = 100;
+                this.state = 104;
                 this.match(MalloyTagParser.PR_END);
             }
         }
@@ -567,23 +602,25 @@ MalloyTagParser.COMMA = 10;
 MalloyTagParser.AR_END = 11;
 MalloyTagParser.SQ_STRING = 12;
 MalloyTagParser.DQ_STRING = 13;
-MalloyTagParser.NUMERIC_LITERAL = 14;
-MalloyTagParser.BARE_STRING = 15;
-MalloyTagParser.COMMENT = 16;
-MalloyTagParser.WHITE_SPACE = 17;
-MalloyTagParser.UNEXPECTED_CHAR = 18;
+MalloyTagParser.BQ_STRING = 14;
+MalloyTagParser.NUMERIC_LITERAL = 15;
+MalloyTagParser.BARE_STRING = 16;
+MalloyTagParser.COMMENT = 17;
+MalloyTagParser.WHITE_SPACE = 18;
+MalloyTagParser.UNEXPECTED_CHAR = 19;
 MalloyTagParser.RULE_tagLine = 0;
 MalloyTagParser.RULE_tagSpec = 1;
 MalloyTagParser.RULE_string = 2;
-MalloyTagParser.RULE_propName = 3;
-MalloyTagParser.RULE_eqValue = 4;
-MalloyTagParser.RULE_arrayElement = 5;
-MalloyTagParser.RULE_reference = 6;
-MalloyTagParser.RULE_arrayValue = 7;
-MalloyTagParser.RULE_properties = 8;
+MalloyTagParser.RULE_identifier = 3;
+MalloyTagParser.RULE_propName = 4;
+MalloyTagParser.RULE_eqValue = 5;
+MalloyTagParser.RULE_arrayElement = 6;
+MalloyTagParser.RULE_reference = 7;
+MalloyTagParser.RULE_arrayValue = 8;
+MalloyTagParser.RULE_properties = 9;
 // tslint:disable:no-trailing-whitespace
 MalloyTagParser.ruleNames = [
-    "tagLine", "tagSpec", "string", "propName", "eqValue", "arrayElement",
+    "tagLine", "tagSpec", "string", "identifier", "propName", "eqValue", "arrayElement",
     "reference", "arrayValue", "properties",
 ];
 MalloyTagParser._LITERAL_NAMES = [
@@ -592,53 +629,54 @@ MalloyTagParser._LITERAL_NAMES = [
 ];
 MalloyTagParser._SYMBOLIC_NAMES = [
     undefined, "DOTTY", "DOT", "MINUS", "EQ", "RF_BEG", "RF_END", "PR_BEG",
-    "PR_END", "AR_BEG", "COMMA", "AR_END", "SQ_STRING", "DQ_STRING", "NUMERIC_LITERAL",
-    "BARE_STRING", "COMMENT", "WHITE_SPACE", "UNEXPECTED_CHAR",
+    "PR_END", "AR_BEG", "COMMA", "AR_END", "SQ_STRING", "DQ_STRING", "BQ_STRING",
+    "NUMERIC_LITERAL", "BARE_STRING", "COMMENT", "WHITE_SPACE", "UNEXPECTED_CHAR",
 ];
 MalloyTagParser.VOCABULARY = new VocabularyImpl_1.VocabularyImpl(MalloyTagParser._LITERAL_NAMES, MalloyTagParser._SYMBOLIC_NAMES, []);
-MalloyTagParser._serializedATN = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x14i\x04\x02" +
+MalloyTagParser._serializedATN = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x15m\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\x03\x02\x07\x02\x16\n\x02\f\x02\x0E" +
-    "\x02\x19\v\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x05\x03" +
-    "!\n\x03\x03\x03\x03\x03\x03\x03\x05\x03&\n\x03\x03\x03\x03\x03\x03\x03" +
-    "\x03\x03\x03\x03\x03\x03\x05\x03.\n\x03\x03\x03\x05\x031\n\x03\x03\x04" +
-    "\x03\x04\x03\x05\x03\x05\x03\x05\x07\x058\n\x05\f\x05\x0E\x05;\v\x05\x03" +
-    "\x06\x03\x06\x03\x06\x05\x06@\n\x06\x03\x07\x03\x07\x05\x07D\n\x07\x03" +
-    "\x07\x03\x07\x03\x07\x05\x07I\n\x07\x03\b\x03\b\x03\b\x03\b\x03\t\x03" +
-    "\t\x03\t\x03\t\x07\tS\n\t\f\t\x0E\tV\v\t\x03\t\x05\tY\n\t\x03\t\x03\t" +
-    "\x03\n\x03\n\x03\n\x07\n`\n\n\f\n\x0E\nc\v\n\x05\ne\n\n\x03\n\x03\n\x03" +
-    "\n\x02\x02\x02\v\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02\x10" +
-    "\x02\x12\x02\x02\x03\x03\x02\x0E\x11\x02q\x02\x17\x03\x02\x02\x02\x04" +
-    "0\x03\x02\x02\x02\x062\x03\x02\x02\x02\b4\x03\x02\x02\x02\n?\x03\x02\x02" +
-    "\x02\fH\x03\x02\x02\x02\x0EJ\x03\x02\x02\x02\x10N\x03\x02\x02\x02\x12" +
-    "\\\x03\x02\x02\x02\x14\x16\x05\x04\x03\x02\x15\x14\x03\x02\x02\x02\x16" +
-    "\x19\x03\x02\x02\x02\x17\x15\x03\x02\x02\x02\x17\x18\x03\x02\x02\x02\x18" +
-    "\x1A\x03\x02\x02\x02\x19\x17\x03\x02\x02\x02\x1A\x1B\x07\x02\x02\x03\x1B" +
-    "\x03\x03\x02\x02\x02\x1C\x1D\x05\b\x05\x02\x1D\x1E\x07\x06\x02\x02\x1E" +
-    " \x05\n\x06\x02\x1F!\x05\x12\n\x02 \x1F\x03\x02\x02\x02 !\x03\x02\x02" +
-    "\x02!1\x03\x02\x02\x02\"#\x05\b\x05\x02#%\x07\x06\x02\x02$&\x07\x03\x02" +
-    "\x02%$\x03\x02\x02\x02%&\x03\x02\x02\x02&\'\x03\x02\x02\x02\'(\x05\x12" +
-    "\n\x02(1\x03\x02\x02\x02)*\x05\b\x05\x02*+\x05\x12\n\x02+1\x03\x02\x02" +
-    "\x02,.\x07\x05\x02\x02-,\x03\x02\x02\x02-.\x03\x02\x02\x02./\x03\x02\x02" +
-    "\x02/1\x05\b\x05\x020\x1C\x03\x02\x02\x020\"\x03\x02\x02\x020)\x03\x02" +
-    "\x02\x020-\x03\x02\x02\x021\x05\x03\x02\x02\x0223\t\x02\x02\x023\x07\x03" +
-    "\x02\x02\x0249\x05\x06\x04\x0256\x07\x04\x02\x0268\x05\x06\x04\x0275\x03" +
-    "\x02\x02\x028;\x03\x02\x02\x0297\x03\x02\x02\x029:\x03\x02\x02\x02:\t" +
-    "\x03\x02\x02\x02;9\x03\x02\x02\x02<@\x05\x06\x04\x02=@\x05\x10\t\x02>" +
-    "@\x05\x0E\b\x02?<\x03\x02\x02\x02?=\x03\x02\x02\x02?>\x03\x02\x02\x02" +
-    "@\v\x03\x02\x02\x02AC\x05\x06\x04\x02BD\x05\x12\n\x02CB\x03\x02\x02\x02" +
-    "CD\x03\x02\x02\x02DI\x03\x02\x02\x02EI\x05\x12\n\x02FI\x05\x10\t\x02G" +
-    "I\x05\x0E\b\x02HA\x03\x02\x02\x02HE\x03\x02\x02\x02HF\x03\x02\x02\x02" +
-    "HG\x03\x02\x02\x02I\r\x03\x02\x02\x02JK\x07\x07\x02\x02KL\x05\b\x05\x02" +
-    "LM\x07\b\x02\x02M\x0F\x03\x02\x02\x02NO\x07\v\x02\x02OT\x05\f\x07\x02" +
-    "PQ\x07\f\x02\x02QS\x05\f\x07\x02RP\x03\x02\x02\x02SV\x03\x02\x02\x02T" +
-    "R\x03\x02\x02\x02TU\x03\x02\x02\x02UX\x03\x02\x02\x02VT\x03\x02\x02\x02" +
-    "WY\x07\f\x02\x02XW\x03\x02\x02\x02XY\x03\x02\x02\x02YZ\x03\x02\x02\x02" +
-    "Z[\x07\r\x02\x02[\x11\x03\x02\x02\x02\\d\x07\t\x02\x02]e\x07\x03\x02\x02" +
-    "^`\x05\x04\x03\x02_^\x03\x02\x02\x02`c\x03\x02\x02\x02a_\x03\x02\x02\x02" +
-    "ab\x03\x02\x02\x02be\x03\x02\x02\x02ca\x03\x02\x02\x02d]\x03\x02\x02\x02" +
-    "da\x03\x02\x02\x02ef\x03\x02\x02\x02fg\x07\n\x02\x02g\x13\x03\x02\x02" +
-    "\x02\x0F\x17 %-09?CHTXad";
+    "\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x03\x02\x07\x02\x18\n\x02" +
+    "\f\x02\x0E\x02\x1B\v\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03" +
+    "\x05\x03#\n\x03\x03\x03\x03\x03\x03\x03\x05\x03(\n\x03\x03\x03\x03\x03" +
+    "\x03\x03\x03\x03\x03\x03\x03\x03\x05\x030\n\x03\x03\x03\x05\x033\n\x03" +
+    "\x03\x04\x03\x04\x03\x05\x03\x05\x03\x06\x03\x06\x03\x06\x07\x06<\n\x06" +
+    "\f\x06\x0E\x06?\v\x06\x03\x07\x03\x07\x03\x07\x05\x07D\n\x07\x03\b\x03" +
+    "\b\x05\bH\n\b\x03\b\x03\b\x03\b\x05\bM\n\b\x03\t\x03\t\x03\t\x03\t\x03" +
+    "\n\x03\n\x03\n\x03\n\x07\nW\n\n\f\n\x0E\nZ\v\n\x03\n\x05\n]\n\n\x03\n" +
+    "\x03\n\x03\v\x03\v\x03\v\x07\vd\n\v\f\v\x0E\vg\v\v\x05\vi\n\v\x03\v\x03" +
+    "\v\x03\v\x02\x02\x02\f\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02" +
+    "\x10\x02\x12\x02\x14\x02\x02\x04\x04\x02\x0E\x0F\x11\x12\x04\x02\x10\x10" +
+    "\x12\x12\x02t\x02\x19\x03\x02\x02\x02\x042\x03\x02\x02\x02\x064\x03\x02" +
+    "\x02\x02\b6\x03\x02\x02\x02\n8\x03\x02\x02\x02\fC\x03\x02\x02\x02\x0E" +
+    "L\x03\x02\x02\x02\x10N\x03\x02\x02\x02\x12R\x03\x02\x02\x02\x14`\x03\x02" +
+    "\x02\x02\x16\x18\x05\x04\x03\x02\x17\x16\x03\x02\x02\x02\x18\x1B\x03\x02" +
+    "\x02\x02\x19\x17\x03\x02\x02\x02\x19\x1A\x03\x02\x02\x02\x1A\x1C\x03\x02" +
+    "\x02\x02\x1B\x19\x03\x02\x02\x02\x1C\x1D\x07\x02\x02\x03\x1D\x03\x03\x02" +
+    "\x02\x02\x1E\x1F\x05\n\x06\x02\x1F \x07\x06\x02\x02 \"\x05\f\x07\x02!" +
+    "#\x05\x14\v\x02\"!\x03\x02\x02\x02\"#\x03\x02\x02\x02#3\x03\x02\x02\x02" +
+    "$%\x05\n\x06\x02%\'\x07\x06\x02\x02&(\x07\x03\x02\x02\'&\x03\x02\x02\x02" +
+    "\'(\x03\x02\x02\x02()\x03\x02\x02\x02)*\x05\x14\v\x02*3\x03\x02\x02\x02" +
+    "+,\x05\n\x06\x02,-\x05\x14\v\x02-3\x03\x02\x02\x02.0\x07\x05\x02\x02/" +
+    ".\x03\x02\x02\x02/0\x03\x02\x02\x0201\x03\x02\x02\x0213\x05\n\x06\x02" +
+    "2\x1E\x03\x02\x02\x022$\x03\x02\x02\x022+\x03\x02\x02\x022/\x03\x02\x02" +
+    "\x023\x05\x03\x02\x02\x0245\t\x02\x02\x025\x07\x03\x02\x02\x0267\t\x03" +
+    "\x02\x027\t\x03\x02\x02\x028=\x05\b\x05\x029:\x07\x04\x02\x02:<\x05\b" +
+    "\x05\x02;9\x03\x02\x02\x02<?\x03\x02\x02\x02=;\x03\x02\x02\x02=>\x03\x02" +
+    "\x02\x02>\v\x03\x02\x02\x02?=\x03\x02\x02\x02@D\x05\x06\x04\x02AD\x05" +
+    "\x12\n\x02BD\x05\x10\t\x02C@\x03\x02\x02\x02CA\x03\x02\x02\x02CB\x03\x02" +
+    "\x02\x02D\r\x03\x02\x02\x02EG\x05\x06\x04\x02FH\x05\x14\v\x02GF\x03\x02" +
+    "\x02\x02GH\x03\x02\x02\x02HM\x03\x02\x02\x02IM\x05\x14\v\x02JM\x05\x12" +
+    "\n\x02KM\x05\x10\t\x02LE\x03\x02\x02\x02LI\x03\x02\x02\x02LJ\x03\x02\x02" +
+    "\x02LK\x03\x02\x02\x02M\x0F\x03\x02\x02\x02NO\x07\x07\x02\x02OP\x05\n" +
+    "\x06\x02PQ\x07\b\x02\x02Q\x11\x03\x02\x02\x02RS\x07\v\x02\x02SX\x05\x0E" +
+    "\b\x02TU\x07\f\x02\x02UW\x05\x0E\b\x02VT\x03\x02\x02\x02WZ\x03\x02\x02" +
+    "\x02XV\x03\x02\x02\x02XY\x03\x02\x02\x02Y\\\x03\x02\x02\x02ZX\x03\x02" +
+    "\x02\x02[]\x07\f\x02\x02\\[\x03\x02\x02\x02\\]\x03\x02\x02\x02]^\x03\x02" +
+    "\x02\x02^_\x07\r\x02\x02_\x13\x03\x02\x02\x02`h\x07\t\x02\x02ai\x07\x03" +
+    "\x02\x02bd\x05\x04\x03\x02cb\x03\x02\x02\x02dg\x03\x02\x02\x02ec\x03\x02" +
+    "\x02\x02ef\x03\x02\x02\x02fi\x03\x02\x02\x02ge\x03\x02\x02\x02ha\x03\x02" +
+    "\x02\x02he\x03\x02\x02\x02ij\x03\x02\x02\x02jk\x07\n\x02\x02k\x15\x03" +
+    "\x02\x02\x02\x0F\x19\"\'/2=CGLX\\eh";
 class TagLineContext extends ParserRuleContext_1.ParserRuleContext {
     EOF() { return this.getToken(MalloyTagParser.EOF, 0); }
     tagSpec(i) {
@@ -770,9 +808,9 @@ class TagDefContext extends TagSpecContext {
 exports.TagDefContext = TagDefContext;
 class StringContext extends ParserRuleContext_1.ParserRuleContext {
     SQ_STRING() { return this.tryGetToken(MalloyTagParser.SQ_STRING, 0); }
-    NUMERIC_LITERAL() { return this.tryGetToken(MalloyTagParser.NUMERIC_LITERAL, 0); }
     DQ_STRING() { return this.tryGetToken(MalloyTagParser.DQ_STRING, 0); }
     BARE_STRING() { return this.tryGetToken(MalloyTagParser.BARE_STRING, 0); }
+    NUMERIC_LITERAL() { return this.tryGetToken(MalloyTagParser.NUMERIC_LITERAL, 0); }
     constructor(parent, invokingState) {
         super(parent, invokingState);
     }
@@ -789,13 +827,32 @@ class StringContext extends ParserRuleContext_1.ParserRuleContext {
     }
 }
 exports.StringContext = StringContext;
+class IdentifierContext extends ParserRuleContext_1.ParserRuleContext {
+    BQ_STRING() { return this.tryGetToken(MalloyTagParser.BQ_STRING, 0); }
+    BARE_STRING() { return this.tryGetToken(MalloyTagParser.BARE_STRING, 0); }
+    constructor(parent, invokingState) {
+        super(parent, invokingState);
+    }
+    // @Override
+    get ruleIndex() { return MalloyTagParser.RULE_identifier; }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitIdentifier) {
+            return visitor.visitIdentifier(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.IdentifierContext = IdentifierContext;
 class PropNameContext extends ParserRuleContext_1.ParserRuleContext {
-    string(i) {
+    identifier(i) {
         if (i === undefined) {
-            return this.getRuleContexts(StringContext);
+            return this.getRuleContexts(IdentifierContext);
         }
         else {
-            return this.getRuleContext(i, StringContext);
+            return this.getRuleContext(i, IdentifierContext);
         }
     }
     DOT(i) {

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

@@ -6,6 +6,7 @@ import { TagDefContext } from "./MalloyTagParser";
 import { TagLineContext } from "./MalloyTagParser";
 import { TagSpecContext } from "./MalloyTagParser";
 import { StringContext } from "./MalloyTagParser";
+import { IdentifierContext } from "./MalloyTagParser";
 import { PropNameContext } from "./MalloyTagParser";
 import { EqValueContext } from "./MalloyTagParser";
 import { ArrayElementContext } from "./MalloyTagParser";
@@ -66,6 +67,12 @@ export interface MalloyTagVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitString?: (ctx: StringContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.identifier`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitIdentifier?: (ctx: IdentifierContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyTagParser.propName`.
      * @param ctx the parse tree