Add support for alternative operators 'and, or, not' (tree-sitter#94)

mliszcz · Sep 15, 2022 · dc2b15e · dc2b15e
1 parent 7f313ba
commit dc2b15e
Show file tree

Hide file tree

Showing 6 changed files with 262,368 additions and 251,908 deletions.
diff --git a/grammar.js b/grammar.js
@@ -823,6 +823,8 @@ module.exports = grammar(C, {
       $.this,
       $.raw_string_literal,
       $.user_defined_literal,
+      $.alternative_unary,
+      $.alternative_binary,
       $.fold_expression
     ),
 
@@ -1152,6 +1154,25 @@ module.exports = grammar(C, {
       $.literal_suffix
     ),
 
+    alternative_unary: $ => prec.left(PREC.UNARY, seq(
+      field('operator', 'not'),
+      field('argument', $._expression)
+    )),
+
+    alternative_binary: $ => {
+      const table = [
+        ['or',  PREC.LOGICAL_OR],
+        ['and', PREC.LOGICAL_AND],
+      ];
+      return choice(...table.map(([operator, precedence]) => {
+        return prec.left(precedence, seq(
+          field('left', $._expression),
+          field('operator', operator),
+          field('right', $._expression)
+        ))
+      }));
+    },
+
     _namespace_identifier: $ => alias($.identifier, $.namespace_identifier)
   }
 });

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -72,3 +72,11 @@
 ; Strings
 
 (raw_string_literal) @string
+
+; Operators
+
+[
+ "and"
+ "or"
+ "not"
+] @operator
diff --git a/src/grammar.json b/src/grammar.json
@@ -5200,6 +5200,14 @@
           "type": "SYMBOL",
           "name": "user_defined_literal"
         },
+        {
+          "type": "SYMBOL",
+          "name": "alternative_unary"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "alternative_binary"
+        },
         {
           "type": "SYMBOL",
           "name": "fold_expression"
@@ -12352,6 +12360,102 @@
         }
       ]
     },
+    "alternative_unary": {
+      "type": "PREC_LEFT",
+      "value": 13,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "operator",
+            "content": {
+              "type": "STRING",
+              "value": "not"
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "argument",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_expression"
+            }
+          }
+        ]
+      }
+    },
+    "alternative_binary": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "PREC_LEFT",
+          "value": 1,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "operator",
+                "content": {
+                  "type": "STRING",
+                  "value": "or"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 2,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "operator",
+                "content": {
+                  "type": "STRING",
+                  "value": "and"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_expression"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    },
     "_namespace_identifier": {
       "type": "ALIAS",
       "content": {

diff --git a/src/node-types.json b/src/node-types.json
@@ -83,6 +83,14 @@
     "type": "_expression",
     "named": true,
     "subtypes": [
+      {
+        "type": "alternative_binary",
+        "named": true
+      },
+      {
+        "type": "alternative_unary",
+        "named": true
+      },
       {
         "type": "assignment_expression",
         "named": true
@@ -612,6 +620,72 @@
       }
     }
   },
+  {
+    "type": "alternative_binary",
+    "named": true,
+    "fields": {
+      "left": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_expression",
+            "named": true
+          }
+        ]
+      },
+      "operator": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "and",
+            "named": false
+          },
+          {
+            "type": "or",
+            "named": false
+          }
+        ]
+      },
+      "right": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_expression",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
+  {
+    "type": "alternative_unary",
+    "named": true,
+    "fields": {
+      "argument": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_expression",
+            "named": true
+          }
+        ]
+      },
+      "operator": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "not",
+            "named": false
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "argument_list",
     "named": true,
@@ -6361,6 +6435,10 @@
     "type": "_unaligned",
     "named": false
   },
+  {
+    "type": "and",
+    "named": false
+  },
   {
     "type": "auto",
     "named": true
@@ -6537,6 +6615,10 @@
     "type": "noexcept",
     "named": false
   },
+  {
+    "type": "not",
+    "named": false
+  },
   {
     "type": "null",
     "named": true
@@ -6553,6 +6635,10 @@
     "type": "operator",
     "named": false
   },
+  {
+    "type": "or",
+    "named": false
+  },
   {
     "type": "override",
     "named": false