made exponentiation right-assoc #43

m93a · Jun 23, 2021 · 6709e73 · 6709e73
1 parent a493047
commit 6709e73
Show file tree

Hide file tree

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

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
@@ -796,7 +796,7 @@ var _parser = (function() {
             8: [2, 8],
             9: [2, 8],
             10: [2, 8],
-            11: [2, 8],
+            11: [1, 17],
             12: [2, 8],
             13: [2, 8],
             16: [2, 8],

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

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

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

diff --git a/test/arithmetics.js b/test/arithmetics.js
@@ -118,4 +118,8 @@ describe('Arithmetics', () => {
         expect( eval('-x^2', {x:2}) ).equals(-4)
     })
 
+    it('exponentiation is right-associative', () => {
+        expect( eval('5^3^2') ).equals(5**(3**2))
+    })
+
 });