Fix wrong number system converation of negation numbers

5anthosh · Nov 14, 2019 · 1c734a2 · 1c734a2
1 parent 15f8448
commit 1c734a2
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 46 deletions.
diff --git a/dist/fcal.js b/dist/fcal.js
@@ -1373,7 +1373,7 @@ var ASTPrinter = /** @class */ (function () {
         this.depth += ASTPrinter.tab;
         var value = this.evaluate(expr.value);
         this.depth -= ASTPrinter.tab;
-        return ASTPrinter.createPrefix(this.depth, 'ASSIGN') + " \n|\n" + value;
+        return ASTPrinter.createPrefix(this.depth, 'ASSIGN') + " " + expr.name + " \n|\n" + value;
     };
     ASTPrinter.prototype.visitVariableExpr = function (expr) {
         return ASTPrinter.createPrefix(this.depth, 'VARIABLE') + " " + expr.name + "\n|\n";
@@ -1663,33 +1663,16 @@ var Parser = /** @class */ (function () {
         return expr;
     };
     Parser.prototype.multiply = function () {
-        var expr = this.unary();
-        while (this.match([token_1.TT.TIMES, token_1.TT.SLASH, token_1.TT.MOD, token_1.TT.OF])) {
-            var operator = this.previous();
-            var right = this.unary();
-            expr = new expr_1.Expr.Binary(expr, operator, right, expr.start, right.end);
-        }
-        return expr;
-    };
-    Parser.prototype.unary = function () {
-        if (this.match([token_1.TT.PLUS, token_1.TT.MINUS])) {
-            var operator = this.previous();
-            var right = this.unary();
-            return new expr_1.Expr.Unary(operator, right, operator.start, right.end);
-        }
-        return this.exponent();
-    };
-    Parser.prototype.exponent = function () {
         var expr = this.unitConvert();
-        while (this.match([token_1.TT.CAP])) {
+        while (this.match([token_1.TT.TIMES, token_1.TT.SLASH, token_1.TT.MOD, token_1.TT.OF])) {
             var operator = this.previous();
-            var right = this.unary();
+            var right = this.unitConvert();
             expr = new expr_1.Expr.Binary(expr, operator, right, expr.start, right.end);
         }
         return expr;
     };
     Parser.prototype.unitConvert = function () {
-        var expr = this.suffix();
+        var expr = this.unary();
         if (this.match([token_1.TT.IN])) {
             if (this.match([token_1.TT.UNIT])) {
                 var unit = this.previous();
@@ -1709,6 +1692,23 @@ var Parser = /** @class */ (function () {
         }
         return expr;
     };
+    Parser.prototype.unary = function () {
+        if (this.match([token_1.TT.PLUS, token_1.TT.MINUS])) {
+            var operator = this.previous();
+            var right = this.unary();
+            return new expr_1.Expr.Unary(operator, right, operator.start, right.end);
+        }
+        return this.exponent();
+    };
+    Parser.prototype.exponent = function () {
+        var expr = this.suffix();
+        while (this.match([token_1.TT.CAP])) {
+            var operator = this.previous();
+            var right = this.unary();
+            expr = new expr_1.Expr.Binary(expr, operator, right, expr.start, right.end);
+        }
+        return expr;
+    };
     Parser.prototype.suffix = function () {
         var expr = this.call();
         if (this.match([token_1.TT.PERCENTAGE])) {

diff --git a/dist/fcal.min.js b/dist/fcal.min.js
diff --git a/src/__test__/fcal.test.ts b/src/__test__/fcal.test.ts
@@ -190,7 +190,7 @@ test('Infinity', () => {
 test('AST print()', () => {
   const expr = new Fcal().expression('y = PI * radius cm ^ 2 + sinh(8) as cm + log(23) in hex + (--100)%');
   expect(expr.getAST()).toStrictEqual(`\
-+ (0)ASSIGN 
++ (0)ASSIGN y 
 |
 +---- (1)BINARY  < + +  (56, 57)> 
 |

diff --git a/src/parser/astPrinter.ts b/src/parser/astPrinter.ts
@@ -29,7 +29,7 @@ class ASTPrinter implements Expr.IVisitor<string> {
     this.depth += ASTPrinter.tab;
     const value = this.evaluate(expr.value);
     this.depth -= ASTPrinter.tab;
-    return `${ASTPrinter.createPrefix(this.depth, 'ASSIGN')} \n|\n${value}`;
+    return `${ASTPrinter.createPrefix(this.depth, 'ASSIGN')} ${expr.name} \n|\n${value}`;
   }
 
   public visitVariableExpr(expr: Expr.Variable): string {

diff --git a/src/parser/parser.ts b/src/parser/parser.ts
@@ -66,36 +66,17 @@ class Parser {
   }
 
   private multiply(): Expr {
-    let expr = this.unary();
+    let expr = this.unitConvert();
     while (this.match([TT.TIMES, TT.SLASH, TT.MOD, TT.OF])) {
       const operator = this.previous();
-      const right = this.unary();
-      expr = new Expr.Binary(expr, operator, right, expr.start, right.end);
-    }
-    return expr;
-  }
-
-  private unary(): Expr {
-    if (this.match([TT.PLUS, TT.MINUS])) {
-      const operator = this.previous();
-      const right = this.unary();
-      return new Expr.Unary(operator, right, operator.start, right.end);
-    }
-    return this.exponent();
-  }
-
-  private exponent(): Expr {
-    let expr = this.unitConvert();
-    while (this.match([TT.CAP])) {
-      const operator = this.previous();
-      const right = this.unary();
+      const right = this.unitConvert();
       expr = new Expr.Binary(expr, operator, right, expr.start, right.end);
     }
     return expr;
   }
 
   private unitConvert(): Expr {
-    const expr = this.suffix();
+    const expr = this.unary();
     if (this.match([TT.IN])) {
       if (this.match([TT.UNIT])) {
         const unit = this.previous();
@@ -116,6 +97,25 @@ class Parser {
     return expr;
   }
 
+  private unary(): Expr {
+    if (this.match([TT.PLUS, TT.MINUS])) {
+      const operator = this.previous();
+      const right = this.unary();
+      return new Expr.Unary(operator, right, operator.start, right.end);
+    }
+    return this.exponent();
+  }
+
+  private exponent(): Expr {
+    let expr = this.suffix();
+    while (this.match([TT.CAP])) {
+      const operator = this.previous();
+      const right = this.unary();
+      expr = new Expr.Binary(expr, operator, right, expr.start, right.end);
+    }
+    return expr;
+  }
+
   private suffix(): Expr {
     const expr = this.call();
     if (this.match([TT.PERCENTAGE])) {