fixed unary minus vs exp precedence, see #41

cshaa · Jun 23, 2021 · 6e168bf · 6e168bf
1 parent e788b57
commit 6e168bf
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/dist/browser/filtrex.js b/dist/browser/filtrex.js
@@ -552,7 +552,7 @@ var filtrex = (function (exports) {
                 8: [2, 2],
                 9: [2, 2],
                 10: [2, 2],
-                11: [2, 2],
+                11: [1, 17],
                 12: [2, 2],
                 13: [2, 2],
                 14: [2, 2],
@@ -576,7 +576,7 @@ var filtrex = (function (exports) {
                 8: [2, 11],
                 9: [2, 11],
                 10: [2, 11],
-                11: [2, 11],
+                11: [1, 17],
                 12: [2, 11],
                 13: [2, 11],
                 14: [2, 11],
@@ -788,7 +788,7 @@ var filtrex = (function (exports) {
                 11: [2, 8],
                 12: [2, 8],
                 13: [2, 8],
-                14: [1, 21],
+                14: [2, 8],
                 16: [2, 8],
                 17: [2, 8],
                 18: [2, 8],
@@ -1052,7 +1052,7 @@ var filtrex = (function (exports) {
                 8: [2, 14],
                 9: [2, 14],
                 10: [2, 14],
-                11: [2, 14],
+                11: [1, 17],
                 12: [2, 14],
                 13: [2, 14],
                 14: [2, 14],

diff --git a/dist/browser/filtrex.min.js b/dist/browser/filtrex.min.js
diff --git a/dist/cjs/filtrex.js b/dist/cjs/filtrex.js
@@ -553,7 +553,7 @@ var _parser = (function() {
             8: [2, 2],
             9: [2, 2],
             10: [2, 2],
-            11: [2, 2],
+            11: [1, 17],
             12: [2, 2],
             13: [2, 2],
             14: [2, 2],
@@ -577,7 +577,7 @@ var _parser = (function() {
             8: [2, 11],
             9: [2, 11],
             10: [2, 11],
-            11: [2, 11],
+            11: [1, 17],
             12: [2, 11],
             13: [2, 11],
             14: [2, 11],
@@ -789,7 +789,7 @@ var _parser = (function() {
             11: [2, 8],
             12: [2, 8],
             13: [2, 8],
-            14: [1, 21],
+            14: [2, 8],
             16: [2, 8],
             17: [2, 8],
             18: [2, 8],
@@ -1053,7 +1053,7 @@ var _parser = (function() {
             8: [2, 14],
             9: [2, 14],
             10: [2, 14],
-            11: [2, 14],
+            11: [1, 17],
             12: [2, 14],
             13: [2, 14],
             14: [2, 14],

diff --git a/dist/esm/generateParser.mjs b/dist/esm/generateParser.mjs
@@ -72,9 +72,8 @@ const grammar = {
         ['left', 'CHAINEDREL'],
         ['left', '+', '-'],
         ['left', '*', '/', '%'],
+        ['left', 'not', 'UMINUS'],
         ['left', '^'],
-        ['left', 'not'],
-        ['left', 'UMINUS'],
         ['left', 'of'],
     ],
     // Grammar

diff --git a/dist/esm/parser.mjs b/dist/esm/parser.mjs
@@ -550,7 +550,7 @@ var _parser = (function() {
             8: [2, 2],
             9: [2, 2],
             10: [2, 2],
-            11: [2, 2],
+            11: [1, 17],
             12: [2, 2],
             13: [2, 2],
             14: [2, 2],
@@ -574,7 +574,7 @@ var _parser = (function() {
             8: [2, 11],
             9: [2, 11],
             10: [2, 11],
-            11: [2, 11],
+            11: [1, 17],
             12: [2, 11],
             13: [2, 11],
             14: [2, 11],
@@ -786,7 +786,7 @@ var _parser = (function() {
             11: [2, 8],
             12: [2, 8],
             13: [2, 8],
-            14: [1, 21],
+            14: [2, 8],
             16: [2, 8],
             17: [2, 8],
             18: [2, 8],
@@ -1050,7 +1050,7 @@ var _parser = (function() {
             8: [2, 14],
             9: [2, 14],
             10: [2, 14],
-            11: [2, 14],
+            11: [1, 17],
             12: [2, 14],
             13: [2, 14],
             14: [2, 14],

diff --git a/src/generateParser.mjs b/src/generateParser.mjs
@@ -72,9 +72,8 @@ const grammar = {
         ['left', 'CHAINEDREL'],
         ['left', '+', '-'],
         ['left', '*', '/', '%'],
+        ['left', 'not', 'UMINUS'],
         ['left', '^'],
-        ['left', 'not'],
-        ['left', 'UMINUS'],
         ['left', 'of'],
     ],
     // Grammar

diff --git a/test/arithmetics.js b/test/arithmetics.js
@@ -113,4 +113,9 @@ describe('Arithmetics', () => {
         expect( eval('-0.1 % 5') ).equals(4.9)
     })
 
+
+    it('exponentiation has precedence over unary minus', () => {
+        expect( eval('-x^2', {x:2}) ).equals(-4)
+    })
+
 });