diff options
| author | Nicolas Williams <nico@cryptonector.com> | 2017-03-15 01:07:37 -0500 |
|---|---|---|
| committer | Nicolas Williams <nico@cryptonector.com> | 2017-03-15 01:07:37 -0500 |
| commit | b142d484d58696e7e5be33b196d131169a032a76 (patch) | |
| tree | 1f153e5b286fa991948cfba1716110e7a7b5a15f | |
| parent | 674e9fb7c29584f6591340a26e2e6156b1ed2c99 (diff) | |
Conditional exprs are not path exprs (fix #1368)
The conditional expression in if-then-elif-else-end cannot contribute to
path expressions because it doesn't change the input to any of the then/
elif/else expressions. These must be generated via gen_subexp().
See also #1366.
| -rw-r--r-- | src/compile.c | 2 | ||||
| -rw-r--r-- | tests/jq.test | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/compile.c b/src/compile.c index e0bd1406..8ab26af1 100644 --- a/src/compile.c +++ b/src/compile.c @@ -905,7 +905,7 @@ static block gen_wildvar_binding(block var, const char* name, block body) { } block gen_cond(block cond, block iftrue, block iffalse) { - return BLOCK(gen_op_simple(DUP), cond, + return BLOCK(gen_op_simple(DUP), BLOCK(gen_subexp(cond), gen_op_simple(POP)), gen_condbranch(BLOCK(gen_op_simple(POP), iftrue), BLOCK(gen_op_simple(POP), iffalse))); } diff --git a/tests/jq.test b/tests/jq.test index 963595b0..ac784ef8 100644 --- a/tests/jq.test +++ b/tests/jq.test @@ -1382,4 +1382,9 @@ true {"a":null,"b":null} {"a":null,"b":"b"} +# Regression test for #1368 +(.. | select(type == "object" and has("b") and (.b | type) == "array")|.b) |= .[0] +{"a": {"b": [1, {"b": 3}]}} +{"a": {"b": 1}} + |