Merge pull request #11 from msantos/fix-zero-arity-fun

Fix parsing of 0-arity functions
joewalnes · Mar 6, 2015 · 218c5be · 218c5be
2 parents 3e85f75 + c742dc3
commit 218c5be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/filtrex.js b/filtrex.js
@@ -157,6 +157,7 @@ function filtrexParser() {
                 ['NUMBER' , code([1])],
                 ['STRING' , code(['"', 1, '"'])],
                 ['SYMBOL' , code(['data["', 1, '"]'])],
+                ['SYMBOL ( )', code(['(functions.hasOwnProperty("', 1, '") ? functions.', 1, '() : unknown("', 1, '"))'])],
                 ['SYMBOL ( argsList )', code(['(functions.hasOwnProperty("', 1, '") ? functions.', 1, '(', 3, ') : unknown("', 1, '"))'])],
                 ['e in ( inSet )', code([1, ' in (function(o) { ', 4, 'return o; })({})'])],
                 ['e not in ( inSet )', code(['!(', 1, ' in (function(o) { ', 5, 'return o; })({}))'])],

diff --git a/src/filtrex.js b/src/filtrex.js
@@ -157,6 +157,7 @@ function filtrexParser() {
                 ['NUMBER' , code([1])],
                 ['STRING' , code(['"', 1, '"'])],
                 ['SYMBOL' , code(['data["', 1, '"]'])],
+                ['SYMBOL ( )', code(['(functions.hasOwnProperty("', 1, '") ? functions.', 1, '() : unknown("', 1, '"))'])],
                 ['SYMBOL ( argsList )', code(['(functions.hasOwnProperty("', 1, '") ? functions.', 1, '(', 3, ') : unknown("', 1, '"))'])],
                 ['e in ( inSet )', code([1, ' in (function(o) { ', 4, 'return o; })({})'])],
                 ['e not in ( inSet )', code(['!(', 1, ' in (function(o) { ', 5, 'return o; })({}))'])],

diff --git a/test/filtrex-test.html b/test/filtrex-test.html
@@ -33,6 +33,7 @@
     },
 
     'functions with multiple args': function() {
+        eq(1, compileExpression('random() >= 0')());
         eq(2, compileExpression('min(2)')());
         eq(2, compileExpression('max(2)')());
         eq(2, compileExpression('min(2, 5)')());