Where clause can contain primitive types #49

Co-Authored-By: calixteman <[email protected]>

Author: maxbrunsfeld

corpus/declarations.txt

@@ -1022,6 +1022,10 @@ pub trait A<B> where B: C,
 {
 }
 
+fn foo<A>() where A: B + As<f64>, f64: As<A>
+{
+}
+
 ---
 
 (source_file
@@ -1133,11 +1137,28 @@ pub trait A<B> where B: C,
     (visibility_modifier)
     name: (type_identifier)
     type_parameters: (type_parameters (type_identifier))
+    (where_clause (where_predicate
+      left: (type_identifier)
+      bounds: (trait_bounds (type_identifier))))
+    body: (declaration_list))
+  (function_item
+    name: (identifier)
+    type_parameters: (type_parameters (type_identifier))
+    parameters: (parameters)
     (where_clause
       (where_predicate
         left: (type_identifier)
-        bounds: (trait_bounds (type_identifier))))
-    body: (declaration_list)))
+        bounds: (trait_bounds
+          (type_identifier)
+          (generic_type
+            type: (type_identifier)
+            type_arguments: (type_arguments (primitive_type)))))
+      (where_predicate
+        left: (primitive_type)
+        bounds: (trait_bounds (generic_type
+          type: (type_identifier)
+          type_arguments: (type_arguments (type_identifier))))))
+    body: (block)))
 
 ===================================
 External Modules

grammar.js

@@ -441,6 +441,7 @@ module.exports = grammar({
         $.reference_type,
         $.tuple_type,
         $.higher_ranked_trait_bound,
+        alias(choice(...primitive_types), $.primitive_type)
       )),
       field('bounds', $.trait_bounds)
     ),

src/grammar.json

@@ -2388,6 +2388,84 @@
               {
                 "type": "SYMBOL",
                 "name": "higher_ranked_trait_bound"
+              },
+              {
+                "type": "ALIAS",
+                "content": {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "u8"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "i8"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "u16"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "i16"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "u32"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "i32"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "u64"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "i64"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "u128"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "i128"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "isize"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "usize"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "f32"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "f64"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "bool"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "str"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "char"
+                    }
+                  ]
+                },
+                "named": true,
+                "value": "primitive_type"
               }
             ]
           }

src/node-types.json

@@ -4348,6 +4348,10 @@
             "type": "lifetime",
             "named": true
           },
+          {
+            "type": "primitive_type",
+            "named": true
+          },
           {
             "type": "reference_type",
             "named": true