BUG#29795595: allow leading and trailing whitespaces in expressions

The X DevAPI expression parser is pretty strict when it comes to leading
and trailing whitespaces in an expression string.

These extra characters do not have any special meaning and do not cause
any particular harm.

This patch relaxes this behavior and updates the expression parser to
allow extra leading and trailing whitespaces in expression strings.

Change-Id: I74d279e5db323c420c8cb4ff42b5831842c1b4a1

Author: ruiquelhas

lib/ExprParser/index.js

@@ -33,7 +33,10 @@
 const Parser = require('./lib/index.js');
 
 function parse (expr, options) {
-    return Parser(Object.assign({}, options, { input: expr })).tryParse(expr);
+    return Parser(Object.assign({}, options, { input: expr }))
+        // We can drop any leading or trailing whitespace from the input
+        // expression string.
+        .tryParse(expr.trim());
 }
 
 module.exports = { parse, Mode: Parser.Mode, Type: Parser.Type };

test/unit/ExprParser/expr.js

@@ -43,58 +43,47 @@ const assertIgnoredWhitespaces = (expr) => {
 
 describe('ExprParser', () => {
     context('expr', () => {
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in an intervalExpr', () => {
+        it('ignores any leading or trailing whitespace in an intervalExpr', () => {
             return assertIgnoredWhitespaces('CURTIME() + INTERVAL 2 HOUR');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in a mulDivExpr', () => {
+        it('ignores any leading or trailing whitespace in a mulDivExpr', () => {
             return assertIgnoredWhitespaces('2 * 4');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in a addSubExpr', () => {
+        it('ignores any leading or trailing whitespace in a addSubExpr', () => {
             return assertIgnoredWhitespaces('1 + 1');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in a shiftExpr', () => {
+        it('ignores any leading or trailing whitespace in a shiftExpr', () => {
             return assertIgnoredWhitespaces('2 >> 1');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in a bitExpr', () => {
+        it('ignores any leading or trailing whitespace in a bitExpr', () => {
             return assertIgnoredWhitespaces('1 ^ 1');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in a shiftExpr', () => {
+        it('ignores any leading or trailing whitespace in a shiftExpr', () => {
             return assertIgnoredWhitespaces('2 >> 1');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in a compExpr', () => {
+        it('ignores any leading or trailing whitespace in a compExpr', () => {
             return assertIgnoredWhitespaces('foo = :v');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in a shiftExpr', () => {
+        it('ignores any leading or trailing whitespace in a shiftExpr', () => {
             return assertIgnoredWhitespaces('2 >> 1');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in an ilriExpr', () => {
+        it('ignores any leading or trailing whitespace in an ilriExpr', () => {
             return assertIgnoredWhitespaces('TRUE IS NOT FALSE');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in an andExpr', () => {
+        it('ignores any leading or trailing whitespace in an andExpr', () => {
             return assertIgnoredWhitespaces('foo = "bar" AND baz = "qux"');
         });
 
-        // TODO(Rui): BUG#29795595
-        it.skip('ignores any leading or trailing whitespace in an orExpr', () => {
+        it('ignores any leading or trailing whitespace in an orExpr', () => {
             return assertIgnoredWhitespaces('foo = "bar" OR baz = "qux"');
         });