fix regression: some instances of divide token were incorrectly parsed as start of regex

Author: andrew-coleman

jsonata.js

@@ -800,7 +800,7 @@ var jsonata = (function() {
                     advance(',');
                 }
             }
-            advance(")");
+            advance(")", true);
             // if the name of the function is 'function' or λ, then this is function definition (lambda function)
             if (left.type === 'name' && (left.value === 'function' || left.value === '\u03BB')) {
                 // all of the args must be VARIABLE tokens
@@ -857,7 +857,7 @@ var jsonata = (function() {
                 }
                 advance(";");
             }
-            advance(")");
+            advance(")", true);
             this.type = 'block';
             this.expressions = expressions;
             return this;
@@ -883,7 +883,7 @@ var jsonata = (function() {
                     advance(",");
                 }
             }
-            advance("]");
+            advance("]", true);
             this.lhs = a;
             this.type = "unary";
             return this;
@@ -904,7 +904,7 @@ var jsonata = (function() {
                 this.lhs = left;
                 this.rhs = expression(operators[']']);
                 this.type = 'binary';
-                advance("]");
+                advance("]", true);
                 return this;
             }
         });
@@ -923,7 +923,7 @@ var jsonata = (function() {
                     advance(",");
                 }
             }
-            advance("}");
+            advance("}", true);
             if(typeof left === 'undefined') {
                 // NUD - unary prefix form
                 this.lhs = a;
@@ -3304,6 +3304,9 @@ var jsonata = (function() {
      */
     function lookupMessage(err) {
         var message = 'Unknown error';
+        if(typeof err.message !== 'undefined') {
+            message = err.message;
+        }
         var template = errorCodes[err.code];
         if(typeof template !== 'undefined') {
             // if there are any handlebars, replace them with the field references

test/jsonata-test.js

@@ -660,6 +660,15 @@ describe('Evaluator - parenthesis', function () {
         });
     });
 
+    describe('(4 + 2) / 2', function () {
+        it('should return result object', function () {
+            var expr = jsonata('(4 + 2) / 2');
+            var result = expr.evaluate(testdata1);
+            var expected = 3;
+            expect(result).to.deep.equal(expected);
+        });
+    });
+
 });
 
 describe('Evaluator - simple array selectors', function () {
@@ -2288,6 +2297,15 @@ describe('Evaluator - functions: count', function () {
             expect(result).to.deep.equal(expected);
         });
     });
+
+    describe('$count([1,2,3,4]) / 2', function () {
+        it('should throw an error', function () {
+            var expr = jsonata('$count([1,2,3,4]) / 2');
+            var result = expr.evaluate();
+            var expected = 2;
+            expect(result).to.deep.equal(expected);
+        });
+    });
 });
 
 describe('Evaluator - functions: max', function () {