fix: remove unnecessary conflicts

tree-sitter · Jul 27, 2023 · 39bea7d · 39bea7d
1 parent 28d910c
commit 39bea7d
Show file tree

Hide file tree

Showing 3 changed files with 3,646 additions and 3,758 deletions.
diff --git a/grammar.js b/grammar.js
@@ -57,13 +57,10 @@ module.exports = grammar({
   conflicts: $ => [
     [$._type_specifier, $._declarator],
     [$._type_specifier, $._declarator, $.macro_type_specifier],
-    [$._type_specifier, $._expression],
-    [$._type_specifier, $._expression, $.macro_type_specifier],
     [$._type_specifier, $._expression_not_binary],
     [$._type_specifier, $._expression_not_binary, $.macro_type_specifier],
     [$._type_specifier, $.macro_type_specifier],
     [$.sized_type_specifier],
-    [$._type_specifier, $.sized_type_specifier],
     [$.attributed_statement],
     [$._declaration_modifiers, $.attributed_statement],
     [$.enum_specifier],

diff --git a/src/grammar.json b/src/grammar.json
@@ -7765,15 +7765,6 @@
       "_declarator",
       "macro_type_specifier"
     ],
-    [
-      "_type_specifier",
-      "_expression"
-    ],
-    [
-      "_type_specifier",
-      "_expression",
-      "macro_type_specifier"
-    ],
     [
       "_type_specifier",
       "_expression_not_binary"
@@ -7790,10 +7781,6 @@
     [
       "sized_type_specifier"
     ],
-    [
-      "_type_specifier",
-      "sized_type_specifier"
-    ],
     [
       "attributed_statement"
     ],