Fix Type parameters and type arguments (#81)

* Const_parameter should receive any type * Type_argument should accept blocks to support expression on const generics
tree-sitter · Apr 6, 2020 · 3e5ec5a · 3e5ec5a
1 parent ec25830
commit 3e5ec5a
Show file tree

Hide file tree

Showing 5 changed files with 55,467 additions and 55,295 deletions.
diff --git a/corpus/declarations.txt b/corpus/declarations.txt
@@ -68,6 +68,8 @@ fn foo(x: impl FnOnce() -> result::Result<T, E>) {}
 
 fn foo(#[attr] x: i32, #[attr] x: i64) {}
 
+fn accumulate(self) -> Machine<{State::Accumulate}> {}
+
 ---
 
 (source_file
@@ -162,6 +164,19 @@ fn foo(#[attr] x: i32, #[attr] x: i64) {}
       (parameter
         pattern: (identifier)
         type: (primitive_type)))
+    body: (block))
+  (function_item
+    name: (identifier)
+    parameters: (parameters
+      (self_parameter
+        (self)))
+    return_type: (generic_type
+      type: (type_identifier)
+      type_arguments: (type_arguments
+        (block
+          (scoped_identifier
+            path: (identifier)
+            name: (identifier)))))
     body: (block)))
 
 ============================================
@@ -445,7 +460,7 @@ struct D<const SIZE: usize> {}
     type_parameters: (type_parameters
       (const_parameter
         name: (identifier)
-        type: (type_identifier)))
+        type: (primitive_type)))
     body: (field_declaration_list)))
 
 ============================================
@@ -562,7 +577,7 @@ pub fn uninit_array<const LEN: usize>() -> [Self; LEN] {}
     type_parameters: (type_parameters
       (const_parameter
         name: (identifier)
-        type: (type_identifier)))
+        type: (primitive_type)))
     parameters: (parameters)
     return_type: (array_type
       element: (type_identifier)
@@ -854,15 +869,55 @@ impl Person {
   fn talk_mut(&'a mut self) {}
 }
 
+impl Machine<{State::Init}> {}
+
 ---
 
 (source_file
-  (impl_item (type_identifier) (declaration_list
-    (const_item (identifier) (primitive_type) (integer_literal))
-    (function_item (identifier) (parameters (self_parameter (self))) (block))
-    (function_item (identifier) (parameters (self_parameter (mutable_specifier) (self))) (block))
-    (function_item (identifier) (parameters (self_parameter (self))) (block))
-    (function_item (identifier) (parameters (self_parameter (lifetime (identifier)) (mutable_specifier) (self))) (block)))))
+  (impl_item
+    type: (type_identifier)
+    body: (declaration_list
+      (const_item
+        name: (identifier)
+        type: (primitive_type)
+        value: (integer_literal))
+      (function_item
+        name: (identifier)
+        parameters: (parameters
+          (self_parameter
+            (self)))
+        body: (block))
+      (function_item
+        name: (identifier)
+        parameters: (parameters
+          (self_parameter
+            (mutable_specifier)
+            (self)))
+        body: (block))
+      (function_item
+        name: (identifier)
+        parameters: (parameters
+          (self_parameter
+            (self)))
+        body: (block))
+      (function_item
+        name: (identifier)
+        parameters: (parameters
+          (self_parameter
+            (lifetime
+              (identifier))
+            (mutable_specifier)
+            (self)))
+        body: (block))))
+  (impl_item
+    type: (generic_type
+      type: (type_identifier)
+      type_arguments: (type_arguments
+        (block
+          (scoped_identifier
+            path: (identifier)
+            name: (identifier)))))
+    body: (declaration_list)))
 
 ===========================================
 Trait impls

diff --git a/grammar.js b/grammar.js
@@ -524,7 +524,7 @@ module.exports = grammar({
       'const',
       field('name', $.identifier),
       ':',
-      field('type', $._type_identifier),
+      field('type', $._type),
     ),
 
     constrained_type_parameter: $ => seq(
@@ -778,6 +778,7 @@ module.exports = grammar({
         $.type_binding,
         $.lifetime,
         $._literal,
+        $.block,
       )),
       optional(','),
       '>'

diff --git a/src/grammar.json b/src/grammar.json
@@ -755,7 +755,7 @@
         },
         {
           "type": "PATTERN",
-          "value": "[\\/_\\-=->,;:::!=?.@*=\\/=&=#%=^=+<>|~]+"
+          "value": "[/_\\-=->,;:::!=?.@*=/=&=#%=^=+<>|~]+"
         },
         {
           "type": "STRING",
@@ -2975,7 +2975,7 @@
           "name": "type",
           "content": {
             "type": "SYMBOL",
-            "name": "_type_identifier"
+            "name": "_type"
           }
         }
       ]
@@ -4345,6 +4345,10 @@
                 {
                   "type": "SYMBOL",
                   "name": "_literal"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "block"
                 }
               ]
             },
@@ -4375,6 +4379,10 @@
                       {
                         "type": "SYMBOL",
                         "name": "_literal"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "block"
                       }
                     ]
                   }

diff --git a/src/node-types.json b/src/node-types.json
@@ -1076,7 +1076,7 @@
         "required": true,
         "types": [
           {
-            "type": "type_identifier",
+            "type": "_type",
             "named": true
           }
         ]
@@ -3835,6 +3835,10 @@
           "type": "_type",
           "named": true
         },
+        {
+          "type": "block",
+          "named": true
+        },
         {
           "type": "lifetime",
           "named": true