mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Empty arrays join/1 to an empty string, fixes #668 bug introduced by 9760245

Browse Source
This commit is contained in:
Joel Purra
2015-01-14 12:24:27 +01:00
parent aeb52e29d6
commit 4d05dc55a3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin.c
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: 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 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 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: 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 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);", "def range($x): range(0;$x);",

4
tests/all.test
View File

@ -328,8 +328,8 @@ join(",","/")
"a/b/c/d" "a/b/c/d"
[.[]|join("a")] [.[]|join("a")]
[[""],["",""],["","",""]] [[],[""],["",""],["","",""]]
["","a","aa"] ["","","a","aa"]
# Same check for flatten/1 # Same check for flatten/1
flatten(-1,3,2,1) flatten(-1,3,2,1)