fix: field and expose all operators, remove test_operator from arithm…

…etic expansions
tree-sitter · Aug 24, 2023 · 9c62d8c · 9c62d8c
1 parent 309307b
commit 9c62d8c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/grammar.js b/grammar.js
@@ -203,24 +203,24 @@ module.exports = grammar({
       $._c_expression,
     ),
     _c_unary_expression: $ => prec.left(seq(
-      choice('++', '--'),
+      field('operator', choice('++', '--')),
       $._c_expression_not_assignment,
     )),
     _c_binary_expression: $ => prec.right(seq(
       $._c_expression_not_assignment,
-      choice(
+      field('operator', choice(
         '+=', '-=', '*=', '/=', '%=', '**=',
         '<<=', '>>=', '&=', '^=', '|=',
         '==', '!=', '<=', '>=', '&&', '||',
         '<<', '>>',
         '+', '-', '*', '/', '%', '**',
         '<', '>',
-      ),
+      )),
       $._c_expression_not_assignment,
     )),
     _c_postfix_expression: $ => seq(
       $._c_expression_not_assignment,
-      choice('++', '--'),
+      field('operator', choice('++', '--')),
     ),
     _c_parenthesized_expression: $ => seq(
       '(',
@@ -525,7 +525,7 @@ module.exports = grammar({
 
     unary_expression: $ => choice(
       prec(1, seq(
-        token(prec(1, choice('-', '+', '~', '++', '--'))),
+        field('operator', tokenLiterals(1, '-', '+', '~', '++', '--')),
         $._expression,
       )),
       prec.right(1, seq(
@@ -536,7 +536,7 @@ module.exports = grammar({
 
     postfix_expression: $ => seq(
       $._expression,
-      choice('++', '--'),
+      field('operator', choice('++', '--')),
     ),
 
     parenthesized_expression: $ => seq(
@@ -590,7 +590,6 @@ module.exports = grammar({
 
     _arithmetic_literal: $ => prec(1, choice(
       $.number,
-      $.test_operator,
       $.subscript,
       $.simple_expansion,
       $.expansion,
@@ -611,7 +610,6 @@ module.exports = grammar({
           '<<', '>>', '<<=', '>>=',
           '&', '|', '^',
           '&=', '|=', '^=',
-          $.test_operator,
         )),
         field('right', $._arithmetic_expression),
       ),
@@ -968,3 +966,17 @@ function commaSep1(rule) {
 function immediateLiterals(...literals) {
   return choice(...literals.map(l => token.immediate(l)));
 }
+
+/**
+ *
+ * Turns a list of rules into a choice of aliased token rules
+ *
+ * @param {number} precedence
+ *
+ * @param {(RegExp|String)[]} literals
+ *
+ * @return {ChoiceRule}
+ */
+function tokenLiterals(precedence, ...literals) {
+  return choice(...literals.map(l => token(prec(precedence, l))));
+}
diff --git a/test/corpus/literals.txt b/test/corpus/literals.txt
@@ -1115,7 +1115,8 @@ echo $((foo-- || bar++))
         (binary_expression
           (binary_expression
             (unary_expression
-              (test_operator))
+              (unary_expression
+                (variable_name)))
             (unary_expression
               (unary_expression
                 (variable_name))))