Grammar improvements

nois-lang · Jun 4, 2023 · a0b700e · a0b700e
1 parent bd964ba
commit a0b700e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/src/grammar.bnf b/src/grammar.bnf
@@ -26,12 +26,9 @@ expr            ::= sub-expr infix-operator sub-expr
                 | sub-expr
                 ;
 
-sub-expr        ::= unary-expr
-                | operand
-                ;
-
-unary-expr      ::= prefix-op operand
+sub-expr        ::= prefix-op operand
                 | operand postfix-op
+                | operand
                 ;
 
 operand         ::= STRING

diff --git a/src/grammar.json b/src/grammar.json
@@ -98,17 +98,6 @@
     },
     {
       "name": "sub-expr",
-      "branches": [
-        [
-          "unary-expr"
-        ],
-        [
-          "operand"
-        ]
-      ]
-    },
-    {
-      "name": "unary-expr",
       "branches": [
         [
           "prefix-op",
@@ -117,6 +106,9 @@
         [
           "operand",
           "postfix-op"
+        ],
+        [
+          "operand"
         ]
       ]
     },

diff --git a/src/parser/parser.spec.ts b/src/parser/parser.spec.ts
@@ -63,22 +63,24 @@ describe('parser', () => {
     })
 
     it('parse unary-expr', () => {
-        const rule = parse('-3', 'unary-expr')
+        const rule = parse('-3', 'expr')
         expect(compactToken(rule!)).toEqual({
-            'name': 'unary-expr',
-            'nodes': [
-                {
-                    'name': 'prefix-op',
-                    'nodes': [{
-                        'name': 'minus', 'value': '-'
-                    }]
-                },
-                {
-                    'name': 'operand',
-                    'nodes': [{
-                        'name': 'number', 'value': '3'
+            'name': 'expr',
+            'nodes': [{
+                'name': 'sub-expr', 'nodes': [
+                    {
+                        'name': 'prefix-op',
+                        'nodes': [{
+                            'name': 'minus', 'value': '-'
+                        }]
+                    },
+                    {
+                        'name': 'operand',
+                        'nodes': [{
+                            'name': 'number', 'value': '3'
+                        }]
                     }]
-                }]
+            }]
         })
     })