metaclass operator *must* be followed by a class name literal

acristoffers · Aug 15, 2024 · f39f91b · f39f91b
1 parent 7b63915
commit f39f91b
Show file tree

Hide file tree

Showing 5 changed files with 21,674 additions and 21,993 deletions.
diff --git a/grammar.js b/grammar.js
@@ -246,7 +246,9 @@ module.exports = grammar({
 
     not_operator: ($) => prec(PREC.not, seq('~', $._expression)),
 
-    metaclass_operator: ($) => prec.left(seq('?', $._expression)),
+    metaclass_operator: ($) => prec.left(seq('?', $.classname)),
+
+    classname: ($) => seq($.identifier,repeat(seq('.',$.identifier))),
 
     handle_operator: ($) =>
       seq('@', seq($.identifier, repeat(seq('.', $.identifier)))),

diff --git a/src/grammar.json b/src/grammar.json
@@ -956,11 +956,36 @@
           },
           {
             "type": "SYMBOL",
-            "name": "_expression"
+            "name": "classname"
           }
         ]
       }
     },
+    "classname": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "."
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
+          }
+        }
+      ]
+    },
     "handle_operator": {
       "type": "SEQ",
       "members": [
@@ -4033,4 +4058,3 @@
   "inline": [],
   "supertypes": []
 }
-
diff --git a/src/node-types.json b/src/node-types.json
@@ -1057,6 +1057,21 @@
       ]
     }
   },
+  {
+    "type": "classname",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "identifier",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "command",
     "named": true,
@@ -2087,79 +2102,7 @@
       "required": true,
       "types": [
         {
-          "type": "binary_operator",
-          "named": true
-        },
-        {
-          "type": "boolean",
-          "named": true
-        },
-        {
-          "type": "boolean_operator",
-          "named": true
-        },
-        {
-          "type": "cell",
-          "named": true
-        },
-        {
-          "type": "comparison_operator",
-          "named": true
-        },
-        {
-          "type": "field_expression",
-          "named": true
-        },
-        {
-          "type": "function_call",
-          "named": true
-        },
-        {
-          "type": "handle_operator",
-          "named": true
-        },
-        {
-          "type": "identifier",
-          "named": true
-        },
-        {
-          "type": "lambda",
-          "named": true
-        },
-        {
-          "type": "matrix",
-          "named": true
-        },
-        {
-          "type": "metaclass_operator",
-          "named": true
-        },
-        {
-          "type": "not_operator",
-          "named": true
-        },
-        {
-          "type": "number",
-          "named": true
-        },
-        {
-          "type": "parenthesis",
-          "named": true
-        },
-        {
-          "type": "postfix_operator",
-          "named": true
-        },
-        {
-          "type": "range",
-          "named": true
-        },
-        {
-          "type": "string",
-          "named": true
-        },
-        {
-          "type": "unary_operator",
+          "type": "classname",
           "named": true
         }
       ]