Add failing tests and change tokenprio for unary

silentmatt · Jul 19, 2016 · 8265f06 · 8265f06
1 parent 4df3380
commit 8265f06
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/parser.js b/parser.js
@@ -585,7 +585,7 @@ var Parser = (function (scope) {
 				if (this.isOperator()) {
 					if (this.isSign() && (expected & SIGN)) {
 						if (this.isNegativeSign()) {
-							this.tokenprio = 2;
+							this.tokenprio = 5;
 							this.tokenindex = "-";
 							noperators++;
 							this.addfunc(tokenstack, operstack, TOP1);

diff --git a/test/parserSpec.js b/test/parserSpec.js
@@ -34,6 +34,38 @@ describe("Parser", function() {
         it("2 + 3 * foo.bar.baz", function() {
             expect(Parser.evaluate("2 + 3 * foo.bar.baz", {foo: {bar: {baz: 4}}})).to.equal(14);
         });
+
+        it('10/-1', function () {
+          expect(Parser.evaluate('10/-1')).to.equal(-10);
+        });
+
+        it('10*-1', function () {
+          expect(Parser.evaluate('10*-1')).to.equal(-10);
+        });
+
+        it('10*-x', function () {
+          expect(Parser.evaluate('10*-x', {x: 1})).to.equal(-10);
+        });
+
+        it('10+-1', function () {
+          expect(Parser.evaluate('10+-1')).to.equal(9);
+        });
+
+        it('10/+1', function () {
+          expect(Parser.evaluate('10/+1')).to.equal(10);
+        });
+
+        it('10*+1', function () {
+          expect(Parser.evaluate('10*+1')).to.equal(10);
+        });
+
+        it('10*+x', function () {
+          expect(Parser.evaluate('10*+x', {x: 1})).to.equal(10);
+        });
+
+        it('10+ +1', function () {
+          expect(Parser.evaluate('10+ +1')).to.equal(11);
+        });
     });
     describe("#substitute()", function() {
         var expr = Parser.parse("2 * x + 1");