Merge pull request #669 from joelpurra/join-empty-array-668

Empty arrays join/1 to an empty string, fixes #668 bug introduced by 9760245
This commit is contained in:
Nico Williams committed 2015-01-14 15:50:15 -06:00
commit cca3e92854
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -1072,7 +1072,7 @@ static const char* const jq_builtins[] = {
"def scalars: select(. == null or . == true or . == false or type == \"number\" or type == \"string\");",
"def scalars_or_empty: select(. == null or . == true or . == false or type == \"number\" or type == \"string\" or ((type==\"array\" or type==\"object\") and length==0));",
"def leaf_paths: paths(scalars);",
"def join($x): reduce .[] as $i (null; (.//\"\") + (if . == null then $i else $x + $i end));",
"def join($x): reduce .[] as $i (null; (.//\"\") + (if . == null then $i else $x + $i end))//\"\";",
"def flatten: reduce .[] as $i ([]; if $i | type == \"array\" then . + ($i | flatten) else . + [$i] end);",
"def flatten($x): reduce .[] as $i ([]; if $i | type == \"array\" and $x > 0 then . + ($i | flatten($x-1)) else . + [$i] end);",
"def range($x): range(0;$x);",
+2 -2
View File
@@ -328,8 +328,8 @@ join(",","/")
"a/b/c/d"
[.[]|join("a")]
[[""],["",""],["","",""]]
["","a","aa"]
[[],[""],["",""],["","",""]]
["","","a","aa"]
# Same check for flatten/1
flatten(-1,3,2,1)