Merge pull request #29 from kawaz/support_float

Add suport float value

Author: mtdowling

src/TreeCompiler.php

@@ -401,8 +401,8 @@ private function visit_comparator(array $node)
             $this->write('$value = !Utils::isEqual(%s, %s);', $a, $b);
         } else {
             $this->write(
-                '$value = is_int(%s) && is_int(%s) && %s %s %s;',
-                $a, $b, $a, $node['value'], $b
+                '$value = (is_int(%s) || is_float(%s)) && (is_int(%s) || is_float(%s)) && %s %s %s;',
+                $a, $a, $b, $b, $a, $node['value'], $b
             );
         }
 

src/TreeInterpreter.php

@@ -220,7 +220,7 @@ private function dispatch(array $node, $value)
      */
     private static function relativeCmp($left, $right, $cmp)
     {
-        if (!is_int($left) || !is_int($right)) {
+        if (!(is_int($left) || is_float($left)) || !(is_int($right) || is_float($right))) {
             return false;
         }
 

tests/compliance/filters.json

@@ -80,6 +80,50 @@
       }
     ]
   },
+  {
+    "given": {"foo": [{"weight": 33.3},
+      {"weight": 44.4},
+      {"weight": 55.5}]},
+    "cases": [
+      {
+        "comment": "Greater than with a number",
+        "expression": "foo[?weight > `44.4`]",
+        "result": [{"weight": 55.5}]
+      },
+      {
+        "expression": "foo[?weight >= `44.4`]",
+        "result": [{"weight": 44.4}, {"weight": 55.5}]
+      },
+      {
+        "comment": "Greater than with a number",
+        "expression": "foo[?weight > `55.5`]",
+        "result": []
+      },
+      {
+        "comment": "Greater than with a number",
+        "expression": "foo[?weight < `44.4`]",
+        "result": [{"weight": 33.3}]
+      },
+      {
+        "comment": "Greater than with a number",
+        "expression": "foo[?weight <= `44.4`]",
+        "result": [{"weight": 33.3}, {"weight": 44.4}]
+      },
+      {
+        "comment": "Greater than with a number",
+        "expression": "foo[?weight < `33.3`]",
+        "result": []
+      },
+      {
+        "expression": "foo[?weight == `33.3`]",
+        "result": [{"weight": 33.3}]
+      },
+      {
+        "expression": "foo[?weight != `33.3`]",
+        "result": [{"weight": 44.4}, {"weight": 55.5}]
+      }
+    ]
+  },
   {
     "given": {"foo": [{"top": {"name": "a"}},
       {"top": {"name": "b"}}]},