fix struct definition

tree-sitter · Apr 13, 2018 · 838d5a9 · 838d5a9
1 parent 36b3d61
commit 838d5a9
Show file tree

Hide file tree

Showing 4 changed files with 2,761 additions and 2,708 deletions.
diff --git a/corpus/expressions.txt b/corpus/expressions.txt
@@ -57,41 +57,27 @@ end
 Structs
 =================
 struct Asdf{T}
-end
-
----
-
-(source_file
-  (struct_definition
-    (parameterized_identifier (identifier) (typed_identifier (parameterized_identifier(identifier))))
-  ))
-
-=================
-Structs
-
-
-struct Asdf
   asd::Any
   bsd
 end
 
 mutable struct Foo<:Bar
-  asd::Any
+  asd::Vector{Bar}
 end
 
 ---
 
 (source_file
-  (struct_definition (parameterized_identifier (typed_identifier (identifier)))
-    (parameterized_identifier (typed_identifier))
-    (parameterized_identifier (typed_identifier))
+  (struct_definition
+    (typed_identifier (parameterized_identifier (identifier) (typed_identifier (parameterized_identifier (identifier)))))
+    (typed_identifier (parameterized_identifier (identifier)) (parameterized_identifier (identifier)))
+    (typed_identifier (parameterized_identifier (identifier)))
   )
-  (struct_definition ((parameterized_identifier (typed_identifier (identifier) (identifier)))
-    (parameterized_identifier (typed_identifier (identifier) (identifier)))
-  ))
-=================
-
----
+  (struct_definition
+    (typed_identifier (parameterized_identifier (identifier)) (parameterized_identifier (identifier)))
+    (typed_identifier (parameterized_identifier (identifier)) (parameterized_identifier (identifier) (typed_identifier (parameterized_identifier (identifier)))))
+  )
+)
 
 =================
 Function calls

diff --git a/grammar.js b/grammar.js
@@ -65,8 +65,8 @@ grammar({
     struct_definition: $ => seq(
       optional('mutable'),
       'struct',
-      $.parameterized_identifier,
-      sep($.parameterized_identifier, $._terminator),
+      $.typed_identifier,
+      sep($.typed_identifier, $._terminator),
       'end'
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -154,7 +154,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "parameterized_identifier"
+          "name": "typed_identifier"
         },
         {
           "type": "CHOICE",
@@ -173,7 +173,7 @@
                     "members": [
                       {
                         "type": "SYMBOL",
-                        "name": "parameterized_identifier"
+                        "name": "typed_identifier"
                       },
                       {
                         "type": "SYMBOL",