Merge pull request #2 from MarkMcCulloh/sync

winglang · Apr 14, 2024 · 5ce7e00 · 5ce7e00
2 parents 86ecf36 + e0e8a5f
commit 5ce7e00
Show file tree

Hide file tree

Showing 6 changed files with 22,497 additions and 22,426 deletions.
diff --git a/grammar.js b/grammar.js
@@ -40,7 +40,7 @@ module.exports = grammar({
 
     // These modifier conflicts should be solved through GLR parsing
     [$.field_modifiers, $.method_modifiers],
-    [$.class_modifiers, $.closure_modifiers],
+    [$.class_modifiers, $.closure_modifiers, $.interface_modifiers],
     [$.inflight_method_signature, $.field_modifiers],
   ],
 
@@ -225,14 +225,20 @@ module.exports = grammar({
         $._semicolon
       ),
 
+    /// Interfaces
+
+    interface_modifiers: ($) =>
+      repeat1(choice($.access_modifier, $.inflight_specifier)),
+
     interface_definition: ($) =>
       seq(
-        optional(field("access_modifier", $.access_modifier)),
+        optional(field("modifiers", $.interface_modifiers)),
         "interface",
         field("name", $.identifier),
         optional(seq("extends", field("extends", commaSep1($.custom_type)))),
         field("implementation", $.interface_implementation)
       ),
+
     interface_implementation: ($) =>
       braced(
         repeat(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@winglang/tree-sitter-wing",
-  "version": "0.69.1",
+  "version": "0.70.6",
   "description": "winglang grammar for tree-sitter",
   "main": "bindings/node",
   "keywords": [

diff --git a/src/grammar.json b/src/grammar.json
@@ -1125,6 +1125,22 @@
         }
       ]
     },
+    "interface_modifiers": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "access_modifier"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "inflight_specifier"
+          }
+        ]
+      }
+    },
     "interface_definition": {
       "type": "SEQ",
       "members": [
@@ -1133,10 +1149,10 @@
           "members": [
             {
               "type": "FIELD",
-              "name": "access_modifier",
+              "name": "modifiers",
               "content": {
                 "type": "SYMBOL",
-                "name": "access_modifier"
+                "name": "interface_modifiers"
               }
             },
             {
@@ -4515,7 +4531,8 @@
     ],
     [
       "class_modifiers",
-      "closure_modifiers"
+      "closure_modifiers",
+      "interface_modifiers"
     ],
     [
       "inflight_method_signature",

diff --git a/src/node-types.json b/src/node-types.json
@@ -1481,16 +1481,6 @@
     "type": "interface_definition",
     "named": true,
     "fields": {
-      "access_modifier": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "access_modifier",
-            "named": true
-          }
-        ]
-      },
       "extends": {
         "multiple": true,
         "required": false,
@@ -1515,6 +1505,16 @@
           }
         ]
       },
+      "modifiers": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "interface_modifiers",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,
@@ -1550,6 +1550,25 @@
       ]
     }
   },
+  {
+    "type": "interface_modifiers",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "access_modifier",
+          "named": true
+        },
+        {
+          "type": "inflight_specifier",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "json_container_type",
     "named": true,