Merge pull request #48 from tonyfettes/bitwise-op

Support bitwise op
moonbitlang · Dec 25, 2024 · 299a3b2 · 299a3b2
2 parents ef712bb + b7fec74
commit 299a3b2
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 9 deletions.
diff --git a/grammar.js b/grammar.js
@@ -9,11 +9,13 @@ const
     multiplicative: 16,
     additive: 15,
     comparative: 14,
-    and: 13,
-    or: 12,
-    pipe: 11,
-    orPattern: 10,
-    asPattern: 9,
+    bitwise_and : 13,
+    bitwise_or : 12,
+    and: 11,
+    or: 10,
+    pipe: 9,
+    orPattern: 8,
+    asPattern: 7,
   },
   multiplicative_operators = ['*', '/', '%'],
   additive_operators = ['+', '-'],
@@ -381,6 +383,8 @@ module.exports = grammar({
         [PREC.multiplicative, choice(...multiplicative_operators)],
         [PREC.additive, choice(...additive_operators)],
         [PREC.comparative, choice(...comparative_operators)],
+        [PREC.bitwise_and, '&'],
+        [PREC.bitwise_or, '|'],
         [PREC.and, '&&'],
         [PREC.or, '||'],
         [PREC.pipe, $.pipe_operator],

diff --git a/src/grammar.json b/src/grammar.json
@@ -1945,7 +1945,7 @@
               },
               {
                 "type": "STRING",
-                "value": "&&"
+                "value": "&"
               },
               {
                 "type": "SYMBOL",
@@ -1966,7 +1966,7 @@
               },
               {
                 "type": "STRING",
-                "value": "||"
+                "value": "|"
               },
               {
                 "type": "SYMBOL",
@@ -1978,6 +1978,48 @@
         {
           "type": "PREC_LEFT",
           "value": 11,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "expression"
+              },
+              {
+                "type": "STRING",
+                "value": "&&"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "expression"
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 10,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "expression"
+              },
+              {
+                "type": "STRING",
+                "value": "||"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "expression"
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 9,
           "content": {
             "type": "SEQ",
             "members": [
@@ -4286,7 +4328,7 @@
     },
     "as_pattern": {
       "type": "PREC",
-      "value": 9,
+      "value": 7,
       "content": {
         "type": "SEQ",
         "members": [
@@ -4307,7 +4349,7 @@
     },
     "or_pattern": {
       "type": "PREC_RIGHT",
-      "value": 10,
+      "value": 8,
       "content": {
         "type": "SEQ",
         "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -2581,6 +2581,10 @@
     "type": "%",
     "named": false
   },
+  {
+    "type": "&",
+    "named": false
+  },
   {
     "type": "&&",
     "named": false

diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/expression.txt b/test/corpus/expression.txt
@@ -1001,3 +1001,60 @@ fn init {
                               (atomic_expression
                                 (literal
                                   (integer_literal))))))))))))))))))
+
+================================================================================
+apply expression with labeled argument
+================================================================================
+fn main {
+  let a = 1 | 2 && 3 & 4 || 5
+}
+--------------------------------------------------------------------------------
+
+(structure
+  (structure_item
+    (function_definition
+      (function_identifier
+        (lowercase_identifier))
+      (block_expression
+        (statement_expression
+          (let_expression
+            (pattern
+              (simple_pattern
+                (lowercase_identifier)))
+            (expression
+              (simple_expression
+                (binary_expression
+                  (expression
+                    (simple_expression
+                      (binary_expression
+                        (expression
+                          (simple_expression
+                            (binary_expression
+                              (expression
+                                (simple_expression
+                                  (atomic_expression
+                                    (literal
+                                      (integer_literal)))))
+                              (expression
+                                (simple_expression
+                                  (atomic_expression
+                                    (literal
+                                      (integer_literal))))))))
+                        (expression
+                          (simple_expression
+                            (binary_expression
+                              (expression
+                                (simple_expression
+                                  (atomic_expression
+                                    (literal
+                                      (integer_literal)))))
+                              (expression
+                                (simple_expression
+                                  (atomic_expression
+                                    (literal
+                                      (integer_literal)))))))))))
+                  (expression
+                    (simple_expression
+                      (atomic_expression
+                        (literal
+                          (integer_literal))))))))))))))