Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/builtin.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ static jv f_length(jq_state *jq, jv input) {
} else if (jv_get_kind(input) == JV_KIND_STRING) {
return jv_number(jv_string_length_codepoints(input));
} else if (jv_get_kind(input) == JV_KIND_NUMBER) {
jv r = jv_number(fabs(jv_number_value(input)));
jv r = jv_number_abs(input);
jv_free(input);
return r;
} else if (jv_get_kind(input) == JV_KIND_NULL) {
Expand Down
15 changes: 15 additions & 0 deletions src/jv.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,21 @@ int jvp_number_is_nan(jv n) {
return isnan(n.u.number);
}

jv jv_number_abs(jv n) {
assert(JVP_HAS_KIND(n, JV_KIND_NUMBER));

#ifdef USE_DECNUM
if (JVP_HAS_FLAGS(n, JVP_FLAGS_NUMBER_LITERAL)) {
jvp_literal_number* m = jvp_literal_number_alloc(jvp_dec_number_ptr(n)->digits);

decNumberAbs(&m->num_decimal, jvp_dec_number_ptr(n), DEC_CONTEXT());
jv r = {JVP_FLAGS_NUMBER_LITERAL, 0, 0, 0, {&m->refcnt}};
return r;
}
#endif
return jv_number(fabs(jv_number_value(n)));
}

jv jv_number_negate(jv n) {
assert(JVP_HAS_KIND(n, JV_KIND_NUMBER));

Expand Down
1 change: 1 addition & 0 deletions src/jv.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jv jv_number(double);
jv jv_number_with_literal(const char*);
double jv_number_value(jv);
int jv_is_integer(jv);
jv jv_number_abs(jv);
jv jv_number_negate(jv);

int jv_number_has_literal(jv);
Expand Down
14 changes: 13 additions & 1 deletion tests/jq.test
Original file line number Diff line number Diff line change
Expand Up @@ -2033,7 +2033,11 @@ map(abs)
[-0, 0, -10, -1.1]
[0,0,10,1.1]

map(fabs == length) | unique
map(fabs)
[-0, 0, -10, -1.1]
[0,0,10,1.1]

map(abs == length) | unique
[-10, -1.1, -1e-1, 1000000000000000002]
[true]

Expand All @@ -2042,6 +2046,14 @@ map(abs)
[0.1,1000000000000000002]
[1e-1, 1000000000000000002]

[1E+1000,-1E+1000 | abs | tojson] | unique == if have_decnum then ["1E+1000"] else ["1.7976931348623157e+308"] end
null
true

[1E+1000,-1E+1000 | length | tojson] | unique == if have_decnum then ["1E+1000"] else ["1.7976931348623157e+308"] end
null
true

# Using a keyword as variable/label name

123 as $label | $label
Expand Down
Loading