Cover function expressions as function parameters

cts.json

@@ -2397,6 +2397,32 @@
         }
       ]
     },
+    {
+      "name": "filter, equals, special nothing",
+      "selector": "$.values[?length(@.a) == value($..c)]",
+      "document": {
+        "c": "cd",
+        "values": [
+          {
+            "a": "ab"
+          },
+          {
+            "c": "d"
+          },
+          {
+            "a": null
+          }
+        ]
+      },
+      "result": [
+        {
+          "c": "d"
+        },
+        {
+          "a": null
+        }
+      ]
+    },
     {
       "name": "index selector, first element",
       "selector": "$[0]",
@@ -4085,6 +4111,51 @@
       "selector": "$[?length(@.a,@.b)==1]",
       "invalid_selector": true
     },
+    {
+      "name": "functions, length, non-singular query arg",
+      "selector": "$[?length(@.*)<3]",
+      "invalid_selector": true
+    },
+    {
+      "name": "functions, length, arg is a function expression",
+      "selector": "$.values[?length(@.a)==length(value($..c))]",
+      "document": {
+        "c": "cd",
+        "values": [
+          {
+            "a": "ab"
+          },
+          {
+            "a": "d"
+          }
+        ]
+      },
+      "result": [
+        {
+          "a": "ab"
+        }
+      ]
+    },
+    {
+      "name": "functions, length, arg is special nothing",
+      "selector": "$[?length(value(@.a))>0]",
+      "document": [
+        {
+          "a": "ab"
+        },
+        {
+          "c": "d"
+        },
+        {
+          "a": null
+        }
+      ],
+      "result": [
+        {
+          "a": "ab"
+        }
+      ]
+    },
     {
       "name": "functions, match, found match",
       "selector": "$[?match(@.a, 'a.*')]",
@@ -4250,6 +4321,26 @@
       "selector": "$[?match(@.a,@.b,@.c)==1]",
       "invalid_selector": true
     },
+    {
+      "name": "functions, match, arg is a function expression",
+      "selector": "$.values[?match(@.a, value($..['regex']))]",
+      "document": {
+        "regex": "a.*",
+        "values": [
+          {
+            "a": "ab"
+          },
+          {
+            "a": "ba"
+          }
+        ]
+      },
+      "result": [
+        {
+          "a": "ab"
+        }
+      ]
+    },
     {
       "name": "functions, search, at the end",
       "selector": "$[?search(@.a, 'a.*')]",
@@ -4446,6 +4537,29 @@
       "selector": "$[?search(@.a,@.b,@.c)]",
       "invalid_selector": true
     },
+    {
+      "name": "functions, search, arg is a function expression",
+      "selector": "$.values[?search(@, value($..['regex']))]",
+      "document": {
+        "regex": "b.?b",
+        "values": [
+          "abc",
+          "bcd",
+          "bab",
+          "bba",
+          "bbab",
+          "b",
+          true,
+          [],
+          {}
+        ]
+      },
+      "result": [
+        "bab",
+        "bba",
+        "bbab"
+      ]
+    },
     {
       "name": "functions, value, single-value nodelist",
       "selector": "$[?value(@.*)==4]",

tests/filter.json

@@ -770,6 +770,22 @@
       "result": [
         {"a": 0.011, "d": "e"}
       ]
+    },
+    {
+      "name": "equals, special nothing",
+      "selector" : "$.values[?length(@.a) == value($..c)]",
+      "document" : {
+        "c": "cd",
+        "values": [
+          {"a": "ab"},
+          {"c": "d"},
+          {"a": null}
+        ]
+      },
+      "result": [
+        {"c": "d"},
+        {"a": null}
+      ]
     }
   ]
 }

tests/functions/length.json

@@ -66,6 +66,34 @@
       "name": "too many params",
       "selector" : "$[?length(@.a,@.b)==1]",
       "invalid_selector": true
+    },
+    {
+      "name": "non-singular query arg",
+      "selector": "$[?length(@.*)<3]",
+      "invalid_selector": true
+    },
+    {
+      "name": "arg is a function expression",
+      "selector" : "$.values[?length(@.a)==length(value($..c))]",
+      "document" : {
+        "c": "cd",
+        "values": [{"a": "ab"}, {"a": "d"}]
+      },
+      "result": [
+        {"a": "ab"}
+      ]
+    },
+    {
+      "name": "arg is special nothing",
+      "selector" : "$[?length(value(@.a))>0]",
+      "document" : [
+          {"a": "ab"},
+          {"c": "d"},
+          {"a": null}
+      ],
+      "result": [
+        {"a": "ab"}
+      ]
     }
   ]
 }

tests/functions/match.json

@@ -85,6 +85,26 @@
       "name": "too many params",
       "selector" : "$[?match(@.a,@.b,@.c)==1]",
       "invalid_selector": true
+    },
+    {
+      "name": "arg is a function expression",
+      "selector": "$.values[?match(@.a, value($..['regex']))]",
+      "document": {
+        "regex": "a.*",
+        "values": [
+          {
+            "a": "ab"
+          },
+          {
+            "a": "ba"
+          }
+        ]
+      },
+      "result": [
+        {
+          "a": "ab"
+        }
+      ]
     }
   ]
 }

tests/functions/search.json

@@ -100,6 +100,25 @@
       "name": "too many params",
       "selector" : "$[?search(@.a,@.b,@.c)]",
       "invalid_selector": true
+    },
+    {
+      "name": "arg is a function expression",
+      "selector" : "$.values[?search(@, value($..['regex']))]",
+      "document" : {
+        "regex": "b.?b",
+        "values": [
+          "abc",
+          "bcd",
+          "bab",
+          "bba",
+          "bbab",
+          "b",
+          true,
+          [],
+          {}
+        ]
+      },
+      "result": ["bab", "bba", "bbab"]
     }
   ]
 }