Add support for enum variant in types

Add support for enum variants inside static enum types, i.e. types of the form `'<Tag> <Type>`, which were seemingly forgotten during the update of the grammar for enum variants previously.
nickel-lang · May 30, 2024 · 9d5b4c8 · 9d5b4c8
1 parent 0a796f3
commit 9d5b4c8
Show file tree

Hide file tree

Showing 5 changed files with 20,709 additions and 19,260 deletions.
diff --git a/corpus/examples/record-contract.txt b/corpus/examples/record-contract.txt
@@ -303,12 +303,15 @@ let metadata_ = {
                                                     (record_operand
                                                       (atom
                                                         (type_atom
-                                                          (enum_tag
-                                                            (raw_enum_tag))
-                                                          (enum_tag
-                                                            (raw_enum_tag))
-                                                          (enum_tag
-                                                            (raw_enum_tag)))))))))
+                                                          (enum
+                                                            (enum_tag
+                                                              (raw_enum_tag)))
+                                                          (enum
+                                                            (enum_tag
+                                                              (raw_enum_tag)))
+                                                          (enum
+                                                            (enum_tag
+                                                              (raw_enum_tag))))))))))
                                             (annot_atom
                                               (static_string
                                                 (chunk_literal_single

diff --git a/grammar.js b/grammar.js
@@ -432,6 +432,11 @@ module.exports = grammar({
       field("arg", $.record_operand),
     )),
 
+    enum: $ => choice(
+      $.enum_tag,
+      $.enum_variant,
+    ),
+
     //grammar.lalrpop: 503
     //See NOTE[scanner].
     chunk_literal_single: $ => choice(
@@ -613,7 +618,7 @@ module.exports = grammar({
       "_",
       seq(
         "[|",
-        field("rows", commaSep($.enum_tag)),
+        field("rows", commaSep($.enum)),
         field("tail", optional(seq(";", $.ident))),
         "|]",
       ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -1830,6 +1830,19 @@
         ]
       }
     },
+    "enum": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "enum_tag"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "enum_variant"
+        }
+      ]
+    },
     "chunk_literal_single": {
       "type": "CHOICE",
       "members": [
@@ -2558,7 +2571,7 @@
                     "members": [
                       {
                         "type": "SYMBOL",
-                        "name": "enum_tag"
+                        "name": "enum"
                       },
                       {
                         "type": "REPEAT",
@@ -2571,7 +2584,7 @@
                             },
                             {
                               "type": "SYMBOL",
-                              "name": "enum_tag"
+                              "name": "enum"
                             }
                           ]
                         }

diff --git a/src/node-types.json b/src/node-types.json
@@ -391,6 +391,25 @@
       }
     }
   },
+  {
+    "type": "enum",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "enum_tag",
+          "named": true
+        },
+        {
+          "type": "enum_variant",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "enum_pattern",
     "named": true,
@@ -1596,7 +1615,7 @@
             "named": false
           },
           {
-            "type": "enum_tag",
+            "type": "enum",
             "named": true
           }
         ]