fix: remove None as a special rule

Instead parse it as an identifier.
tree-sitter-grammars · Mar 17, 2023 · 1d89837 · 1d89837
1 parent 846ccc3
commit 1d89837
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/grammar.js b/grammar.js
@@ -263,7 +263,6 @@ module.exports = grammar({
       $.viewpoint_type,
       $.lambda_type,
       $.this,
-      $.none,
     ),
 
     base_type: $ => prec.right(seq(
@@ -355,7 +354,6 @@ module.exports = grammar({
       $.identifier,
       $.ffi_identifier,
       $.this,
-      $.none,
       $.error,
       $.compile_intrinsic,
       $.compile_error,
@@ -758,8 +756,6 @@ module.exports = grammar({
 
     this: _ => 'this',
 
-    none: _ => 'None',
-
     comment: _ => token(choice(
       seq('//', /(\\(.|\r?\n)|[^\\\n])*/),
       seq('/*', /[^*]*\*+([^/*][^*]*\*+)*/, '/'),

diff --git a/test/corpus/exprs.txt b/test/corpus/exprs.txt
@@ -371,7 +371,7 @@ primitive Snot
                 (do_block
                   (block
                     (repeat_statement
-                      (block (none))
+                      (block (identifier))
                       (binary_expression
                         left: (identifier)
                         right: (literal (boolean))

diff --git a/test/corpus/lambda.txt b/test/corpus/lambda.txt
@@ -112,7 +112,7 @@ class Lambda
         (lambda_parameters)
       )
       (lambda_expression
-        (block (none))
+        (block (identifier))
         (capability)
       )
     )

diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
@@ -45,7 +45,7 @@ primitive ContainsWith
               )
             )
             (else_block
-              (block (none))
+              (block (identifier))
             )
           )
         )

diff --git a/test/corpus/types.txt b/test/corpus/types.txt
@@ -55,7 +55,7 @@ class Array[A]
           )
         )
       )
-      (block (none))
+      (block (identifier))
     )
   )
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ primitive ContainsWith @@
                   )
                 )
                 (else_block
-                  (block (none))
+                  (block (identifier))
                 )
               )
             )
@@ Expand Down @@