Macro name can be qualified with a path (#72)

Author: calixteman

corpus/macros.txt

@@ -5,13 +5,17 @@ Macro invocation - no arguments
 a!();
 b![];
 c!{};
+d::e!();
+f::g::h!{};
 
 ---
 
 (source_file
   (macro_invocation (identifier) (token_tree))
   (macro_invocation (identifier) (token_tree))
-  (macro_invocation (identifier) (token_tree)))
+  (macro_invocation (identifier) (token_tree))
+  (macro_invocation (scoped_identifier (identifier) (identifier)) (token_tree))
+  (macro_invocation (scoped_identifier (scoped_identifier (identifier) (identifier)) (identifier)) (token_tree)))
 
 ============================================
 Macro invocation - arbitrary tokens

grammar.js

@@ -875,7 +875,10 @@ module.exports = grammar({
     ),
 
     macro_invocation: $ => seq(
-      field('macro', $.identifier),
+      field('macro', choice(
+        $.scoped_identifier,
+        $.identifier
+      )),
       '!',
       $.token_tree
     ),

src/grammar.json

@@ -755,7 +755,7 @@
         },
         {
           "type": "PATTERN",
-          "value": "[/_\\-=->,;:::!=?.@*=/='&=#%=^=+<>|~]+"
+          "value": "[\\/_\\-=->,;:::!=?.@*=\\/='&=#%=^=+<>|~]+"
         },
         {
           "type": "STRING",
@@ -4829,8 +4829,17 @@
           "type": "FIELD",
           "name": "macro",
           "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "scoped_identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
           }
         },
         {

src/node-types.json

@@ -2305,6 +2305,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "scoped_identifier",
+            "named": true
           }
         ]
       }