tagset-parser 0.0.0 → 1.0.0

package/lib/cjs/bitmask.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calcBitmask = calcBitmask;
 function calcBitmask(pattern, sets) {
-    const tokens = pattern.split('&');
+    const tokens = pattern.split(',');
     let mask = 0;
     for (const token of tokens) {
         const t = token.trim();

package/lib/cjs/generated/TagSetLexer.js

@@ -5,28 +5,28 @@ const antlr = require("antlr4ng");
 class TagSetLexer extends antlr.Lexer {
     static SET = 1;
     static ITEM = 2;
-    static AMP = 3;
-    static COMMA = 4;
-    static COLON = 5;
-    static QUOTED_STRING = 6;
-    static WORD = 7;
+    static COMMA = 3;
+    static COLON = 4;
+    static QUOTED_STRING = 5;
+    static WORD = 6;
+    static COMMENT = 7;
     static NL = 8;
     static WS = 9;
     static channelNames = [
         "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
     ];
     static literalNames = [
-        null, "'set'", "'item'", "'&'", "','", "':'"
+        null, "'set'", "'item'", "','", "':'"
     ];
     static symbolicNames = [
-        null, "SET", "ITEM", "AMP", "COMMA", "COLON", "QUOTED_STRING", "WORD",
-        "NL", "WS"
+        null, "SET", "ITEM", "COMMA", "COLON", "QUOTED_STRING", "WORD",
+        "COMMENT", "NL", "WS"
     ];
     static modeNames = [
         "DEFAULT_MODE",
     ];
     static ruleNames = [
-        "SET", "ITEM", "AMP", "COMMA", "COLON", "QUOTED_STRING", "WORD",
+        "SET", "ITEM", "COMMA", "COLON", "QUOTED_STRING", "WORD", "COMMENT",
         "NL", "WS",
     ];
     constructor(input) {
@@ -41,27 +41,29 @@ class TagSetLexer extends antlr.Lexer {
     get channelNames() { return TagSetLexer.channelNames; }
     get modeNames() { return TagSetLexer.modeNames; }
     static _serializedATN = [
-        4, 0, 9, 60, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2,
+        4, 0, 9, 67, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2,
         6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1,
-        2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 5, 5, 37, 8, 5, 10, 5, 12, 5, 40, 9, 5, 1, 5, 1, 5, 1,
-        6, 4, 6, 45, 8, 6, 11, 6, 12, 6, 46, 1, 7, 4, 7, 50, 8, 7, 11, 7, 12, 7, 51, 1, 8, 4, 8, 55,
-        8, 8, 11, 8, 12, 8, 56, 1, 8, 1, 8, 0, 0, 9, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15,
-        8, 17, 9, 1, 0, 4, 3, 0, 10, 10, 13, 13, 34, 34, 7, 0, 9, 10, 13, 13, 32, 32, 34, 34, 38,
-        38, 44, 44, 58, 58, 2, 0, 10, 10, 13, 13, 2, 0, 9, 9, 32, 32, 63, 0, 1, 1, 0, 0, 0, 0, 3,
-        1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1,
-        0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 1, 19, 1, 0, 0, 0, 3, 23, 1, 0, 0, 0, 5, 28, 1,
-        0, 0, 0, 7, 30, 1, 0, 0, 0, 9, 32, 1, 0, 0, 0, 11, 34, 1, 0, 0, 0, 13, 44, 1, 0, 0, 0, 15, 49,
-        1, 0, 0, 0, 17, 54, 1, 0, 0, 0, 19, 20, 5, 115, 0, 0, 20, 21, 5, 101, 0, 0, 21, 22, 5, 116,
-        0, 0, 22, 2, 1, 0, 0, 0, 23, 24, 5, 105, 0, 0, 24, 25, 5, 116, 0, 0, 25, 26, 5, 101, 0, 0,
-        26, 27, 5, 109, 0, 0, 27, 4, 1, 0, 0, 0, 28, 29, 5, 38, 0, 0, 29, 6, 1, 0, 0, 0, 30, 31, 5,
-        44, 0, 0, 31, 8, 1, 0, 0, 0, 32, 33, 5, 58, 0, 0, 33, 10, 1, 0, 0, 0, 34, 38, 5, 34, 0, 0,
-        35, 37, 8, 0, 0, 0, 36, 35, 1, 0, 0, 0, 37, 40, 1, 0, 0, 0, 38, 36, 1, 0, 0, 0, 38, 39, 1,
-        0, 0, 0, 39, 41, 1, 0, 0, 0, 40, 38, 1, 0, 0, 0, 41, 42, 5, 34, 0, 0, 42, 12, 1, 0, 0, 0, 43,
-        45, 8, 1, 0, 0, 44, 43, 1, 0, 0, 0, 45, 46, 1, 0, 0, 0, 46, 44, 1, 0, 0, 0, 46, 47, 1, 0, 0,
-        0, 47, 14, 1, 0, 0, 0, 48, 50, 7, 2, 0, 0, 49, 48, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 49,
-        1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 16, 1, 0, 0, 0, 53, 55, 7, 3, 0, 0, 54, 53, 1, 0, 0, 0,
-        55, 56, 1, 0, 0, 0, 56, 54, 1, 0, 0, 0, 56, 57, 1, 0, 0, 0, 57, 58, 1, 0, 0, 0, 58, 59, 6,
-        8, 0, 0, 59, 18, 1, 0, 0, 0, 5, 0, 38, 46, 51, 56, 1, 6, 0, 0
+        2, 1, 3, 1, 3, 1, 4, 1, 4, 5, 4, 35, 8, 4, 10, 4, 12, 4, 38, 9, 4, 1, 4, 1, 4, 1, 5, 4, 5, 43,
+        8, 5, 11, 5, 12, 5, 44, 1, 6, 1, 6, 5, 6, 49, 8, 6, 10, 6, 12, 6, 52, 9, 6, 1, 6, 1, 6, 1, 7,
+        4, 7, 57, 8, 7, 11, 7, 12, 7, 58, 1, 8, 4, 8, 62, 8, 8, 11, 8, 12, 8, 63, 1, 8, 1, 8, 0, 0,
+        9, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 1, 0, 4, 3, 0, 10, 10, 13, 13,
+        34, 34, 6, 0, 9, 10, 13, 13, 32, 32, 34, 34, 44, 44, 58, 58, 2, 0, 10, 10, 13, 13, 2, 0,
+        9, 9, 32, 32, 71, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9,
+        1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 1, 19,
+        1, 0, 0, 0, 3, 23, 1, 0, 0, 0, 5, 28, 1, 0, 0, 0, 7, 30, 1, 0, 0, 0, 9, 32, 1, 0, 0, 0, 11, 42,
+        1, 0, 0, 0, 13, 46, 1, 0, 0, 0, 15, 56, 1, 0, 0, 0, 17, 61, 1, 0, 0, 0, 19, 20, 5, 115, 0,
+        0, 20, 21, 5, 101, 0, 0, 21, 22, 5, 116, 0, 0, 22, 2, 1, 0, 0, 0, 23, 24, 5, 105, 0, 0, 24,
+        25, 5, 116, 0, 0, 25, 26, 5, 101, 0, 0, 26, 27, 5, 109, 0, 0, 27, 4, 1, 0, 0, 0, 28, 29,
+        5, 44, 0, 0, 29, 6, 1, 0, 0, 0, 30, 31, 5, 58, 0, 0, 31, 8, 1, 0, 0, 0, 32, 36, 5, 34, 0, 0,
+        33, 35, 8, 0, 0, 0, 34, 33, 1, 0, 0, 0, 35, 38, 1, 0, 0, 0, 36, 34, 1, 0, 0, 0, 36, 37, 1,
+        0, 0, 0, 37, 39, 1, 0, 0, 0, 38, 36, 1, 0, 0, 0, 39, 40, 5, 34, 0, 0, 40, 10, 1, 0, 0, 0, 41,
+        43, 8, 1, 0, 0, 42, 41, 1, 0, 0, 0, 43, 44, 1, 0, 0, 0, 44, 42, 1, 0, 0, 0, 44, 45, 1, 0, 0,
+        0, 45, 12, 1, 0, 0, 0, 46, 50, 5, 35, 0, 0, 47, 49, 8, 2, 0, 0, 48, 47, 1, 0, 0, 0, 49, 52,
+        1, 0, 0, 0, 50, 48, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 53, 1, 0, 0, 0, 52, 50, 1, 0, 0, 0,
+        53, 54, 6, 6, 0, 0, 54, 14, 1, 0, 0, 0, 55, 57, 7, 2, 0, 0, 56, 55, 1, 0, 0, 0, 57, 58, 1,
+        0, 0, 0, 58, 56, 1, 0, 0, 0, 58, 59, 1, 0, 0, 0, 59, 16, 1, 0, 0, 0, 60, 62, 7, 3, 0, 0, 61,
+        60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 61, 1, 0, 0, 0, 63, 64, 1, 0, 0, 0, 64, 65, 1, 0, 0,
+        0, 65, 66, 6, 8, 0, 0, 66, 18, 1, 0, 0, 0, 6, 0, 36, 44, 50, 58, 63, 1, 6, 0, 0
     ];
     static __ATN;
     static get _ATN() {

package/lib/cjs/generated/TagSetListener.js

@@ -66,16 +66,6 @@ class TagSetListener {
      * @param ctx the parse tree
      */
     exitSugarDecl;
-    /**
-     * Enter a parse tree produced by `TagSetParser.pattern`.
-     * @param ctx the parse tree
-     */
-    enterPattern;
-    /**
-     * Exit a parse tree produced by `TagSetParser.pattern`.
-     * @param ctx the parse tree
-     */
-    exitPattern;
     /**
      * Enter a parse tree produced by `TagSetParser.valueList`.
      * @param ctx the parse tree

package/lib/cjs/generated/TagSetParser.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValueItemContext = exports.ValueListContext = exports.PatternContext = exports.SugarDeclContext = exports.ItemDeclContext = exports.LabelPartContext = exports.SetDeclContext = exports.LineContext = exports.ProgramContext = exports.TagSetParser = void 0;
+exports.ValueItemContext = exports.ValueListContext = exports.SugarDeclContext = exports.ItemDeclContext = exports.LabelPartContext = exports.SetDeclContext = exports.LineContext = exports.ProgramContext = exports.TagSetParser = void 0;
 const antlr = require("antlr4ng");
 class TagSetParser extends antlr.Parser {
     static SET = 1;
     static ITEM = 2;
-    static AMP = 3;
-    static COMMA = 4;
-    static COLON = 5;
-    static QUOTED_STRING = 6;
-    static WORD = 7;
+    static COMMA = 3;
+    static COLON = 4;
+    static QUOTED_STRING = 5;
+    static WORD = 6;
+    static COMMENT = 7;
     static NL = 8;
     static WS = 9;
     static RULE_program = 0;
@@ -18,19 +18,18 @@ class TagSetParser extends antlr.Parser {
     static RULE_labelPart = 3;
     static RULE_itemDecl = 4;
     static RULE_sugarDecl = 5;
-    static RULE_pattern = 6;
-    static RULE_valueList = 7;
-    static RULE_valueItem = 8;
+    static RULE_valueList = 6;
+    static RULE_valueItem = 7;
     static literalNames = [
-        null, "'set'", "'item'", "'&'", "','", "':'"
+        null, "'set'", "'item'", "','", "':'"
     ];
     static symbolicNames = [
-        null, "SET", "ITEM", "AMP", "COMMA", "COLON", "QUOTED_STRING", "WORD",
-        "NL", "WS"
+        null, "SET", "ITEM", "COMMA", "COLON", "QUOTED_STRING", "WORD",
+        "COMMENT", "NL", "WS"
     ];
     static ruleNames = [
         "program", "line", "setDecl", "labelPart", "itemDecl", "sugarDecl",
-        "pattern", "valueList", "valueItem",
+        "valueList", "valueItem",
     ];
     get grammarFileName() { return "TagSet.g4"; }
     get literalNames() { return TagSetParser.literalNames; }
@@ -51,17 +50,17 @@ class TagSetParser extends antlr.Parser {
         try {
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 22;
+                this.state = 20;
                 this.errorHandler.sync(this);
                 _la = this.tokenStream.LA(1);
-                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & 390) !== 0)) {
+                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & 326) !== 0)) {
                     {
-                        this.state = 20;
+                        this.state = 18;
                         this.errorHandler.sync(this);
                         switch (this.tokenStream.LA(1)) {
                             case TagSetParser.NL:
                                 {
-                                    this.state = 18;
+                                    this.state = 16;
                                     this.match(TagSetParser.NL);
                                 }
                                 break;
@@ -69,7 +68,7 @@ class TagSetParser extends antlr.Parser {
                             case TagSetParser.ITEM:
                             case TagSetParser.WORD:
                                 {
-                                    this.state = 19;
+                                    this.state = 17;
                                     this.line();
                                 }
                                 break;
@@ -77,11 +76,11 @@ class TagSetParser extends antlr.Parser {
                                 throw new antlr.NoViableAltException(this);
                         }
                     }
-                    this.state = 24;
+                    this.state = 22;
                     this.errorHandler.sync(this);
                     _la = this.tokenStream.LA(1);
                 }
-                this.state = 25;
+                this.state = 23;
                 this.match(TagSetParser.EOF);
             }
         }
@@ -105,36 +104,36 @@ class TagSetParser extends antlr.Parser {
         try {
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 30;
+                this.state = 28;
                 this.errorHandler.sync(this);
                 switch (this.tokenStream.LA(1)) {
                     case TagSetParser.SET:
                         {
-                            this.state = 27;
+                            this.state = 25;
                             this.setDecl();
                         }
                         break;
                     case TagSetParser.ITEM:
                         {
-                            this.state = 28;
+                            this.state = 26;
                             this.itemDecl();
                         }
                         break;
                     case TagSetParser.WORD:
                         {
-                            this.state = 29;
+                            this.state = 27;
                             this.sugarDecl();
                         }
                         break;
                     default:
                         throw new antlr.NoViableAltException(this);
                 }
-                this.state = 33;
+                this.state = 31;
                 this.errorHandler.sync(this);
                 switch (this.interpreter.adaptivePredict(this.tokenStream, 3, this.context)) {
                     case 1:
                         {
-                            this.state = 32;
+                            this.state = 30;
                             this.match(TagSetParser.NL);
                         }
                         break;
@@ -162,11 +161,11 @@ class TagSetParser extends antlr.Parser {
             let alternative;
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 35;
+                this.state = 33;
                 this.match(TagSetParser.SET);
-                this.state = 36;
+                this.state = 34;
                 this.match(TagSetParser.WORD);
-                this.state = 38;
+                this.state = 36;
                 this.errorHandler.sync(this);
                 alternative = 1;
                 do {
@@ -174,7 +173,7 @@ class TagSetParser extends antlr.Parser {
                         case 1:
                             {
                                 {
-                                    this.state = 37;
+                                    this.state = 35;
                                     this.labelPart();
                                 }
                             }
@@ -182,7 +181,7 @@ class TagSetParser extends antlr.Parser {
                         default:
                             throw new antlr.NoViableAltException(this);
                     }
-                    this.state = 40;
+                    this.state = 38;
                     this.errorHandler.sync(this);
                     alternative = this.interpreter.adaptivePredict(this.tokenStream, 4, this.context);
                 } while (alternative !== 2 && alternative !== antlr.ATN.INVALID_ALT_NUMBER);
@@ -209,9 +208,9 @@ class TagSetParser extends antlr.Parser {
         try {
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 42;
+                this.state = 40;
                 _la = this.tokenStream.LA(1);
-                if (!(_la === 6 || _la === 7)) {
+                if (!(_la === 5 || _la === 6)) {
                     this.errorHandler.recoverInline(this);
                 }
                 else {
@@ -240,11 +239,11 @@ class TagSetParser extends antlr.Parser {
         try {
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 44;
+                this.state = 42;
                 this.match(TagSetParser.ITEM);
-                this.state = 45;
-                this.pattern();
-                this.state = 46;
+                this.state = 43;
+                this.match(TagSetParser.WORD);
+                this.state = 44;
                 this.valueList();
             }
         }
@@ -269,27 +268,27 @@ class TagSetParser extends antlr.Parser {
         try {
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 48;
+                this.state = 46;
                 this.match(TagSetParser.WORD);
-                this.state = 53;
+                this.state = 51;
                 this.errorHandler.sync(this);
                 _la = this.tokenStream.LA(1);
-                while (_la === 4) {
+                while (_la === 3) {
                     {
                         {
-                            this.state = 49;
+                            this.state = 47;
                             this.match(TagSetParser.COMMA);
-                            this.state = 50;
+                            this.state = 48;
                             this.match(TagSetParser.WORD);
                         }
                     }
-                    this.state = 55;
+                    this.state = 53;
                     this.errorHandler.sync(this);
                     _la = this.tokenStream.LA(1);
                 }
-                this.state = 56;
+                this.state = 54;
                 this.match(TagSetParser.COLON);
-                this.state = 57;
+                this.state = 55;
                 this.valueList();
             }
         }
@@ -307,69 +306,28 @@ class TagSetParser extends antlr.Parser {
         }
         return localContext;
     }
-    pattern() {
-        let localContext = new PatternContext(this.context, this.state);
-        this.enterRule(localContext, 12, TagSetParser.RULE_pattern);
-        let _la;
-        try {
-            this.enterOuterAlt(localContext, 1);
-            {
-                this.state = 59;
-                this.match(TagSetParser.WORD);
-                this.state = 64;
-                this.errorHandler.sync(this);
-                _la = this.tokenStream.LA(1);
-                while (_la === 3) {
-                    {
-                        {
-                            this.state = 60;
-                            this.match(TagSetParser.AMP);
-                            this.state = 61;
-                            this.match(TagSetParser.WORD);
-                        }
-                    }
-                    this.state = 66;
-                    this.errorHandler.sync(this);
-                    _la = this.tokenStream.LA(1);
-                }
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr.RecognitionException) {
-                this.errorHandler.reportError(this, re);
-                this.errorHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localContext;
-    }
     valueList() {
         let localContext = new ValueListContext(this.context, this.state);
-        this.enterRule(localContext, 14, TagSetParser.RULE_valueList);
+        this.enterRule(localContext, 12, TagSetParser.RULE_valueList);
         let _la;
         try {
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 67;
+                this.state = 57;
                 this.valueItem();
-                this.state = 72;
+                this.state = 62;
                 this.errorHandler.sync(this);
                 _la = this.tokenStream.LA(1);
-                while (_la === 4) {
+                while (_la === 3) {
                     {
                         {
-                            this.state = 68;
+                            this.state = 58;
                             this.match(TagSetParser.COMMA);
-                            this.state = 69;
+                            this.state = 59;
                             this.valueItem();
                         }
                     }
-                    this.state = 74;
+                    this.state = 64;
                     this.errorHandler.sync(this);
                     _la = this.tokenStream.LA(1);
                 }
@@ -391,13 +349,13 @@ class TagSetParser extends antlr.Parser {
     }
     valueItem() {
         let localContext = new ValueItemContext(this.context, this.state);
-        this.enterRule(localContext, 16, TagSetParser.RULE_valueItem);
+        this.enterRule(localContext, 14, TagSetParser.RULE_valueItem);
         let _la;
         try {
             let alternative;
             this.enterOuterAlt(localContext, 1);
             {
-                this.state = 76;
+                this.state = 66;
                 this.errorHandler.sync(this);
                 alternative = 1;
                 do {
@@ -405,9 +363,9 @@ class TagSetParser extends antlr.Parser {
                         case 1:
                             {
                                 {
-                                    this.state = 75;
+                                    this.state = 65;
                                     _la = this.tokenStream.LA(1);
-                                    if (!(_la === 6 || _la === 7)) {
+                                    if (!(_la === 5 || _la === 6)) {
                                         this.errorHandler.recoverInline(this);
                                     }
                                     else {
@@ -420,9 +378,9 @@ class TagSetParser extends antlr.Parser {
                         default:
                             throw new antlr.NoViableAltException(this);
                     }
-                    this.state = 78;
+                    this.state = 68;
                     this.errorHandler.sync(this);
-                    alternative = this.interpreter.adaptivePredict(this.tokenStream, 8, this.context);
+                    alternative = this.interpreter.adaptivePredict(this.tokenStream, 7, this.context);
                 } while (alternative !== 2 && alternative !== antlr.ATN.INVALID_ALT_NUMBER);
             }
         }
@@ -441,31 +399,28 @@ class TagSetParser extends antlr.Parser {
         return localContext;
     }
     static _serializedATN = [
-        4, 1, 9, 81, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6,
-        2, 7, 7, 7, 2, 8, 7, 8, 1, 0, 1, 0, 5, 0, 21, 8, 0, 10, 0, 12, 0, 24, 9, 0, 1, 0, 1, 0, 1, 1,
-        1, 1, 1, 1, 3, 1, 31, 8, 1, 1, 1, 3, 1, 34, 8, 1, 1, 2, 1, 2, 1, 2, 4, 2, 39, 8, 2, 11, 2, 12,
-        2, 40, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 5, 5, 52, 8, 5, 10, 5, 12, 5, 55,
-        9, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 5, 6, 63, 8, 6, 10, 6, 12, 6, 66, 9, 6, 1, 7, 1, 7,
-        1, 7, 5, 7, 71, 8, 7, 10, 7, 12, 7, 74, 9, 7, 1, 8, 4, 8, 77, 8, 8, 11, 8, 12, 8, 78, 1, 8,
-        0, 0, 9, 0, 2, 4, 6, 8, 10, 12, 14, 16, 0, 1, 1, 0, 6, 7, 81, 0, 22, 1, 0, 0, 0, 2, 30, 1, 0,
-        0, 0, 4, 35, 1, 0, 0, 0, 6, 42, 1, 0, 0, 0, 8, 44, 1, 0, 0, 0, 10, 48, 1, 0, 0, 0, 12, 59, 1,
-        0, 0, 0, 14, 67, 1, 0, 0, 0, 16, 76, 1, 0, 0, 0, 18, 21, 5, 8, 0, 0, 19, 21, 3, 2, 1, 0, 20,
-        18, 1, 0, 0, 0, 20, 19, 1, 0, 0, 0, 21, 24, 1, 0, 0, 0, 22, 20, 1, 0, 0, 0, 22, 23, 1, 0, 0,
-        0, 23, 25, 1, 0, 0, 0, 24, 22, 1, 0, 0, 0, 25, 26, 5, 0, 0, 1, 26, 1, 1, 0, 0, 0, 27, 31, 3,
-        4, 2, 0, 28, 31, 3, 8, 4, 0, 29, 31, 3, 10, 5, 0, 30, 27, 1, 0, 0, 0, 30, 28, 1, 0, 0, 0, 30,
-        29, 1, 0, 0, 0, 31, 33, 1, 0, 0, 0, 32, 34, 5, 8, 0, 0, 33, 32, 1, 0, 0, 0, 33, 34, 1, 0, 0,
-        0, 34, 3, 1, 0, 0, 0, 35, 36, 5, 1, 0, 0, 36, 38, 5, 7, 0, 0, 37, 39, 3, 6, 3, 0, 38, 37, 1,
-        0, 0, 0, 39, 40, 1, 0, 0, 0, 40, 38, 1, 0, 0, 0, 40, 41, 1, 0, 0, 0, 41, 5, 1, 0, 0, 0, 42,
-        43, 7, 0, 0, 0, 43, 7, 1, 0, 0, 0, 44, 45, 5, 2, 0, 0, 45, 46, 3, 12, 6, 0, 46, 47, 3, 14,
-        7, 0, 47, 9, 1, 0, 0, 0, 48, 53, 5, 7, 0, 0, 49, 50, 5, 4, 0, 0, 50, 52, 5, 7, 0, 0, 51, 49,
-        1, 0, 0, 0, 52, 55, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 53, 54, 1, 0, 0, 0, 54, 56, 1, 0, 0, 0,
-        55, 53, 1, 0, 0, 0, 56, 57, 5, 5, 0, 0, 57, 58, 3, 14, 7, 0, 58, 11, 1, 0, 0, 0, 59, 64, 5,
-        7, 0, 0, 60, 61, 5, 3, 0, 0, 61, 63, 5, 7, 0, 0, 62, 60, 1, 0, 0, 0, 63, 66, 1, 0, 0, 0, 64,
-        62, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 13, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 67, 72, 3, 16,
-        8, 0, 68, 69, 5, 4, 0, 0, 69, 71, 3, 16, 8, 0, 70, 68, 1, 0, 0, 0, 71, 74, 1, 0, 0, 0, 72,
-        70, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 15, 1, 0, 0, 0, 74, 72, 1, 0, 0, 0, 75, 77, 7, 0, 0,
-        0, 76, 75, 1, 0, 0, 0, 77, 78, 1, 0, 0, 0, 78, 76, 1, 0, 0, 0, 78, 79, 1, 0, 0, 0, 79, 17,
-        1, 0, 0, 0, 9, 20, 22, 30, 33, 40, 53, 64, 72, 78
+        4, 1, 9, 71, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6,
+        2, 7, 7, 7, 1, 0, 1, 0, 5, 0, 19, 8, 0, 10, 0, 12, 0, 22, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1,
+        3, 1, 29, 8, 1, 1, 1, 3, 1, 32, 8, 1, 1, 2, 1, 2, 1, 2, 4, 2, 37, 8, 2, 11, 2, 12, 2, 38, 1,
+        3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 5, 5, 50, 8, 5, 10, 5, 12, 5, 53, 9, 5, 1,
+        5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 5, 6, 61, 8, 6, 10, 6, 12, 6, 64, 9, 6, 1, 7, 4, 7, 67, 8, 7,
+        11, 7, 12, 7, 68, 1, 7, 0, 0, 8, 0, 2, 4, 6, 8, 10, 12, 14, 0, 1, 1, 0, 5, 6, 71, 0, 20, 1,
+        0, 0, 0, 2, 28, 1, 0, 0, 0, 4, 33, 1, 0, 0, 0, 6, 40, 1, 0, 0, 0, 8, 42, 1, 0, 0, 0, 10, 46,
+        1, 0, 0, 0, 12, 57, 1, 0, 0, 0, 14, 66, 1, 0, 0, 0, 16, 19, 5, 8, 0, 0, 17, 19, 3, 2, 1, 0,
+        18, 16, 1, 0, 0, 0, 18, 17, 1, 0, 0, 0, 19, 22, 1, 0, 0, 0, 20, 18, 1, 0, 0, 0, 20, 21, 1,
+        0, 0, 0, 21, 23, 1, 0, 0, 0, 22, 20, 1, 0, 0, 0, 23, 24, 5, 0, 0, 1, 24, 1, 1, 0, 0, 0, 25,
+        29, 3, 4, 2, 0, 26, 29, 3, 8, 4, 0, 27, 29, 3, 10, 5, 0, 28, 25, 1, 0, 0, 0, 28, 26, 1, 0,
+        0, 0, 28, 27, 1, 0, 0, 0, 29, 31, 1, 0, 0, 0, 30, 32, 5, 8, 0, 0, 31, 30, 1, 0, 0, 0, 31, 32,
+        1, 0, 0, 0, 32, 3, 1, 0, 0, 0, 33, 34, 5, 1, 0, 0, 34, 36, 5, 6, 0, 0, 35, 37, 3, 6, 3, 0, 36,
+        35, 1, 0, 0, 0, 37, 38, 1, 0, 0, 0, 38, 36, 1, 0, 0, 0, 38, 39, 1, 0, 0, 0, 39, 5, 1, 0, 0,
+        0, 40, 41, 7, 0, 0, 0, 41, 7, 1, 0, 0, 0, 42, 43, 5, 2, 0, 0, 43, 44, 5, 6, 0, 0, 44, 45, 3,
+        12, 6, 0, 45, 9, 1, 0, 0, 0, 46, 51, 5, 6, 0, 0, 47, 48, 5, 3, 0, 0, 48, 50, 5, 6, 0, 0, 49,
+        47, 1, 0, 0, 0, 50, 53, 1, 0, 0, 0, 51, 49, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 54, 1, 0, 0,
+        0, 53, 51, 1, 0, 0, 0, 54, 55, 5, 4, 0, 0, 55, 56, 3, 12, 6, 0, 56, 11, 1, 0, 0, 0, 57, 62,
+        3, 14, 7, 0, 58, 59, 5, 3, 0, 0, 59, 61, 3, 14, 7, 0, 60, 58, 1, 0, 0, 0, 61, 64, 1, 0, 0,
+        0, 62, 60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 13, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 65, 67,
+        7, 0, 0, 0, 66, 65, 1, 0, 0, 0, 67, 68, 1, 0, 0, 0, 68, 66, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0,
+        69, 15, 1, 0, 0, 0, 8, 18, 20, 28, 31, 38, 51, 62, 68
     ];
     static __ATN;
     static get _ATN() {
@@ -643,8 +598,8 @@ class ItemDeclContext extends antlr.ParserRuleContext {
     ITEM() {
         return this.getToken(TagSetParser.ITEM, 0);
     }
-    pattern() {
-        return this.getRuleContext(0, PatternContext);
+    WORD() {
+        return this.getToken(TagSetParser.WORD, 0);
     }
     valueList() {
         return this.getRuleContext(0, ValueListContext);
@@ -721,49 +676,6 @@ class SugarDeclContext extends antlr.ParserRuleContext {
     }
 }
 exports.SugarDeclContext = SugarDeclContext;
-class PatternContext extends antlr.ParserRuleContext {
-    constructor(parent, invokingState) {
-        super(parent, invokingState);
-    }
-    WORD(i) {
-        if (i === undefined) {
-            return this.getTokens(TagSetParser.WORD);
-        }
-        else {
-            return this.getToken(TagSetParser.WORD, i);
-        }
-    }
-    AMP(i) {
-        if (i === undefined) {
-            return this.getTokens(TagSetParser.AMP);
-        }
-        else {
-            return this.getToken(TagSetParser.AMP, i);
-        }
-    }
-    get ruleIndex() {
-        return TagSetParser.RULE_pattern;
-    }
-    enterRule(listener) {
-        if (listener.enterPattern) {
-            listener.enterPattern(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitPattern) {
-            listener.exitPattern(this);
-        }
-    }
-    accept(visitor) {
-        if (visitor.visitPattern) {
-            return visitor.visitPattern(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.PatternContext = PatternContext;
 class ValueListContext extends antlr.ParserRuleContext {
     constructor(parent, invokingState) {
         super(parent, invokingState);

package/lib/cjs/generated/TagSetVisitor.js

@@ -46,12 +46,6 @@ class TagSetVisitor extends antlr4ng_1.AbstractParseTreeVisitor {
      * @return the visitor result
      */
     visitSugarDecl;
-    /**
-     * Visit a parse tree produced by `TagSetParser.pattern`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitPattern;
     /**
      * Visit a parse tree produced by `TagSetParser.valueList`.
      * @param ctx the parse tree

package/lib/cjs/visitor.js

@@ -3,12 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagSetASTVisitor = void 0;
 const TagSetVisitor_js_1 = require("./generated/TagSetVisitor.js");
 const bitmask_js_1 = require("./bitmask.js");
-function extractPatternIds(ctx) {
-    return ctx
-        .WORD()
-        .map((w) => w.getText())
-        .filter((t) => t !== '_');
-}
 function extractValues(ctx) {
     return ctx.valueItem().map((vi) => {
         const parts = [
@@ -59,8 +53,8 @@ class TagSetASTVisitor extends TagSetVisitor_js_1.TagSetVisitor {
         this.explicitSets.push({ id, label, index: this.setIndex++ });
     };
     visitItemDecl = (ctx) => {
-        const patternCtx = ctx.pattern();
-        const patternIds = extractPatternIds(patternCtx);
+        const id = ctx.WORD().getText();
+        const patternIds = id === '_' ? [] : [id];
         const values = extractValues(ctx.valueList());
         this.rawItems.push({ patternIds, values });
     };
@@ -75,7 +69,7 @@ class TagSetASTVisitor extends TagSetVisitor_js_1.TagSetVisitor {
     buildAST() {
         const sets = autoDetectSets(this.explicitSets, this.rawItems);
         const items = this.rawItems.map((raw) => {
-            const pattern = raw.patternIds.join('&');
+            const pattern = raw.patternIds.join(',');
             const bitmask = (0, bitmask_js_1.calcBitmask)(pattern, sets);
             return { pattern, bitmask, values: raw.values };
         });

package/lib/esm/bitmask.js

@@ -1,5 +1,5 @@
 export function calcBitmask(pattern, sets) {
-    const tokens = pattern.split('&');
+    const tokens = pattern.split(',');
     let mask = 0;
     for (const token of tokens) {
         const t = token.trim();