Add missing macro fragment specifiers (#69)

GrayJack · web-flow · commit 79635081340d · 2020-03-15T20:02:15.000-07:00
diff --git a/grammar.js b/grammar.js
@@ -167,7 +167,8 @@ module.exports = grammar({
     ),
 
     fragment_specifier: $ => choice(
-      'ident', 'path', 'expr', 'ty', 'pat', 'stmt', 'block', 'item', 'meta', 'tt'
+      'block', 'expr', 'ident', 'item', 'lifetime', 'literal', 'meta', 'pat',
+      'path', 'stmt', 'tt', 'ty', 'vis'
     ),
 
     _tokens: $ => choice(
diff --git a/src/grammar.json b/src/grammar.json
@@ -455,45 +455,57 @@
     "fragment_specifier": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "STRING",
+          "value": "block"
+        },
+        {
+          "type": "STRING",
+          "value": "expr"
+        },
         {
           "type": "STRING",
           "value": "ident"
         },
         {
           "type": "STRING",
-          "value": "path"
+          "value": "item"
         },
         {
           "type": "STRING",
-          "value": "expr"
+          "value": "lifetime"
         },
         {
           "type": "STRING",
-          "value": "ty"
+          "value": "literal"
+        },
+        {
+          "type": "STRING",
+          "value": "meta"
         },
         {
           "type": "STRING",
           "value": "pat"
         },
         {
           "type": "STRING",
-          "value": "stmt"
+          "value": "path"
         },
         {
           "type": "STRING",
-          "value": "block"
+          "value": "stmt"
         },
         {
           "type": "STRING",
-          "value": "item"
+          "value": "tt"
         },
         {
           "type": "STRING",
-          "value": "meta"
+          "value": "ty"
         },
         {
           "type": "STRING",
-          "value": "tt"
+          "value": "vis"
         }
       ]
     },
@@ -743,7 +755,7 @@
         },
         {
           "type": "PATTERN",
-          "value": "[\\/_\\-=->,;:::!=?.@*=\\/='&=#%=^=+<>|~]+"
+          "value": "[/_\\-=->,;:::!=?.@*=/='&=#%=^=+<>|~]+"
         },
         {
           "type": "STRING",
diff --git a/src/node-types.json b/src/node-types.json
@@ -4766,10 +4766,18 @@
     "type": "let",
     "named": false
   },
+  {
+    "type": "lifetime",
+    "named": false
+  },
   {
     "type": "line_comment",
     "named": true
   },
+  {
+    "type": "literal",
+    "named": false
+  },
   {
     "type": "loop",
     "named": false
@@ -4890,6 +4898,10 @@
     "type": "use",
     "named": false
   },
+  {
+    "type": "vis",
+    "named": false
+  },
   {
     "type": "where",
     "named": false
diff --git a/src/parser.c b/src/parser.c

Original file line number	Diff line number	Diff line change
`@@ -455,45 +455,57 @@`
`455`	`455`	`"fragment_specifier": {`
`456`	`456`	`"type": "CHOICE",`
`457`	`457`	`"members": [`
	`458`	`+ {`
	`459`	`+ "type": "STRING",`
	`460`	`+ "value": "block"`
	`461`	`+ },`
	`462`	`+ {`
	`463`	`+ "type": "STRING",`
	`464`	`+ "value": "expr"`
	`465`	`+ },`
`458`	`466`	`{`
`459`	`467`	`"type": "STRING",`
`460`	`468`	`"value": "ident"`
`461`	`469`	`},`
`462`	`470`	`{`
`463`	`471`	`"type": "STRING",`
`464`		`- "value": "path"`
	`472`	`+ "value": "item"`
`465`	`473`	`},`
`466`	`474`	`{`
`467`	`475`	`"type": "STRING",`
`468`		`- "value": "expr"`
	`476`	`+ "value": "lifetime"`
`469`	`477`	`},`
`470`	`478`	`{`
`471`	`479`	`"type": "STRING",`
`472`		`- "value": "ty"`
	`480`	`+ "value": "literal"`
	`481`	`+ },`
	`482`	`+ {`
	`483`	`+ "type": "STRING",`
	`484`	`+ "value": "meta"`
`473`	`485`	`},`
`474`	`486`	`{`
`475`	`487`	`"type": "STRING",`
`476`	`488`	`"value": "pat"`
`477`	`489`	`},`
`478`	`490`	`{`
`479`	`491`	`"type": "STRING",`
`480`		`- "value": "stmt"`
	`492`	`+ "value": "path"`
`481`	`493`	`},`
`482`	`494`	`{`
`483`	`495`	`"type": "STRING",`
`484`		`- "value": "block"`
	`496`	`+ "value": "stmt"`
`485`	`497`	`},`
`486`	`498`	`{`
`487`	`499`	`"type": "STRING",`
`488`		`- "value": "item"`
	`500`	`+ "value": "tt"`
`489`	`501`	`},`
`490`	`502`	`{`
`491`	`503`	`"type": "STRING",`
`492`		`- "value": "meta"`
	`504`	`+ "value": "ty"`
`493`	`505`	`},`
`494`	`506`	`{`
`495`	`507`	`"type": "STRING",`
`496`		`- "value": "tt"`
	`508`	`+ "value": "vis"`
`497`	`509`	`}`
`498`	`510`	`]`
`499`	`511`	`},`
`@@ -743,7 +755,7 @@`
`743`	`755`	`},`
`744`	`756`	`{`
`745`	`757`	`"type": "PATTERN",`
`746`		`- "value": "[\\/_\\-=->,;:::!=?.@*=\\/='&=#%=^=+<>\|~]+"`
	`758`	`+ "value": "[/_\\-=->,;:::!=?.@*=/='&=#%=^=+<>\|~]+"`
`747`	`759`	`},`
`748`	`760`	`{`
`749`	`761`	`"type": "STRING",`