fix: allow expressions in enum values

tree-sitter · Oct 15, 2024 · d58d957 · d58d957
1 parent 69af07e
commit d58d957
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -281,7 +281,7 @@ module.exports = function defineGrammar(dialect) {
         optional(field('attributes', $.attribute_list)),
         keyword('case'),
         field('name', $.name),
-        optional(seq('=', field('value', choice($._string, $.integer)))),
+        optional(seq('=', field('value', $.expression))),
         $._semicolon,
       ),
 

diff --git a/test/corpus/declarations.txt b/test/corpus/declarations.txt
@@ -872,6 +872,18 @@ enum Suit: string
   }
 }
 
+enum D: int
+{
+    case Minus_1 = -1;
+    case Zero = 0;
+    case Plus_1 = +1;
+}
+
+enum E: string
+{
+    case StringConcat = 'Hello ' . "World";
+}
+
 ---
 
 (program
@@ -944,4 +956,30 @@ enum Suit: string
                       (name)
                       (name)))
                   (string
-                    (string_content)))))))))))
+                    (string_content))))))))))
+  (enum_declaration
+    (name)
+    (primitive_type)
+    (enum_declaration_list
+      (enum_case
+        (name)
+        (unary_op_expression
+          (integer)))
+      (enum_case
+        (name)
+        (integer))
+      (enum_case
+        (name)
+        (unary_op_expression
+          (integer)))))
+  (enum_declaration
+    (name)
+    (primitive_type)
+    (enum_declaration_list
+      (enum_case
+        (name)
+        (binary_expression
+          (string
+            (string_content))
+          (encapsed_string
+            (string_content)))))))