Fix Unions accept no field_declaration_list (#79)

GrayJack · web-flow · commit 43293d078f41 · 2020-05-04T10:21:46.000-07:00
diff --git a/grammar.js b/grammar.js
@@ -282,10 +282,7 @@ module.exports = grammar({
       field('name', $._type_identifier),
       field('type_parameters', optional($.type_parameters)),
       optional($.where_clause),
-      choice(
-        field('body', $.field_declaration_list),
-        ';'
-      )
+      field('body', $.field_declaration_list),
     ),
 
     enum_item: $ => seq(
diff --git a/src/grammar.json b/src/grammar.json
@@ -755,7 +755,7 @@
         },
         {
           "type": "PATTERN",
-          "value": "[/_\\-=->,;:::!=?.@*=/=&=#%=^=+<>|~]+"
+          "value": "[\\/_\\-=->,;:::!=?.@*=\\/=&=#%=^=+<>|~]+"
         },
         {
           "type": "STRING",
@@ -1308,21 +1308,12 @@
           ]
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "FIELD",
-              "name": "body",
-              "content": {
-                "type": "SYMBOL",
-                "name": "field_declaration_list"
-              }
-            },
-            {
-              "type": "STRING",
-              "value": ";"
-            }
-          ]
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "field_declaration_list"
+          }
         }
       ]
     },
diff --git a/src/node-types.json b/src/node-types.json
@@ -4004,7 +4004,7 @@
     "fields": {
       "body": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
             "type": "field_declaration_list",
diff --git a/src/parser.c b/src/parser.c

Original file line number	Diff line number	Diff line change
`@@ -4004,7 +4004,7 @@`
`4004`	`4004`	`"fields": {`
`4005`	`4005`	`"body": {`
`4006`	`4006`	`"multiple": false,`
`4007`		`- "required": false,`
	`4007`	`+ "required": true,`
`4008`	`4008`	`"types": [`
`4009`	`4009`	`{`
`4010`	`4010`	`"type": "field_declaration_list",`