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

Add isnormal and related, rename *inf

This commit is contained in:
Nicolas Williams
2015-06-17 23:14:26 -05:00
parent b9c2a326ba
commit 164b877bfa
2 changed files with 35 additions and 14 deletions

View File

@ -832,7 +832,7 @@ static jv f_type(jq_state *jq, jv input) {
return out;
}
static jv f_isinf(jq_state *jq, jv input) {
static jv f_isinfinite(jq_state *jq, jv input) {
jv_kind k = jv_get_kind(input);
if (k != JV_KIND_NUMBER) {
jv_free(input);
@ -854,7 +854,18 @@ static jv f_isnan(jq_state *jq, jv input) {
return isnan(n) ? jv_true() : jv_false();
}
static jv f_inf(jq_state *jq, jv input) {
static jv f_isnormal(jq_state *jq, jv input) {
jv_kind k = jv_get_kind(input);
if (k != JV_KIND_NUMBER) {
jv_free(input);
return jv_false();
}
double n = jv_number_value(input);
jv_free(input);
return isnormal(n) ? jv_true() : jv_false();
}
static jv f_infinite(jq_state *jq, jv input) {
jv_free(input);
return jv_number(INFINITY);
}
@ -1216,9 +1227,10 @@ static const struct cfunction function_list[] = {
{(cfunction_ptr)f_contains, "contains", 2},
{(cfunction_ptr)f_length, "length", 1},
{(cfunction_ptr)f_type, "type", 1},
{(cfunction_ptr)f_isinf, "isinf", 1},
{(cfunction_ptr)f_isinfinite, "isinfinite", 1},
{(cfunction_ptr)f_isnan, "isnan", 1},
{(cfunction_ptr)f_inf, "inf", 1},
{(cfunction_ptr)f_isnormal, "isnormal", 1},
{(cfunction_ptr)f_infinite, "infinite", 1},
{(cfunction_ptr)f_nan, "nan", 1},
{(cfunction_ptr)f_sort, "sort", 1},
{(cfunction_ptr)f_sort_by_impl, "_sort_by_impl", 2},
@ -1340,11 +1352,14 @@ static const char* const jq_builtins[] = {
" if .|not then . else empty end)] | length == 0;",
"def all(condition): all(.[]; condition);",
"def all: all(.);",
"def isfinite: type == \"number\" and (isinfinite | not);",
"def arrays: select(type == \"array\");",
"def objects: select(type == \"object\");",
"def iterables: arrays, objects;",
"def booleans: select(type == \"boolean\");",
"def numbers: select(type == \"number\");",
"def normals: select(isnormal);",
"def finites: select(isinfinite|not);",
"def strings: select(type == \"string\");",
"def nulls: select(type == \"null\");",
"def values: select(. != null);",

View File

@ -794,12 +794,13 @@ sections:
output: ['{"id": "second", "val": 2}']
- title: "`arrays`, `objects`, `iterables`, `booleans`, `numbers`, `strings`, `nulls`, `values`, `scalars`"
- title: "`arrays`, `objects`, `iterables`, `booleans`, `numbers`, `normals`, `finites`, `strings`, `nulls`, `values`, `scalars`"
body: |
These built-ins select only inputs that are arrays, objects,
iterables (arrays or objects), booleans, numbers, strings,
null, non-null values, and non-iterables, respectively.
iterables (arrays or objects), booleans, numbers, normal
numbers, finite numbers, strings, null, non-null values, and
non-iterables, respectively.
examples:
- program: '.[]|numbers'
@ -1076,22 +1077,27 @@ sections:
input: '[0, false, [], {}, null, "hello"]'
output: ['["number", "boolean", "array", "object", "null", "string"]']
- title: "`inf`, `nan`, `isinf`, `isnan`"
- title: "`infinite`, `nan`, `isinfinite`, `isnan`, `isfinite`, `isnormal`"
body: |
Some arithmetic operations can yield infinities and "not a
number" (NaN) values. The `isinf` builtin returns `true` if
its input is infinite. The `isnan` builtin returns `true` if
its input is a NaN. The `inf` builtin returns a positive
infinite value. The `nan` builtin returns a NaN.
number" (NaN) values. The `isinfinite` builtin returns `true`
if its input is infinite. The `isnan` builtin returns `true`
if its input is a NaN. The `infinite` builtin returns a
positive infinite value. The `nan` builtin returns a NaN.
The `isnormal` builtin returns true if its input is a normal
number.
Note that division by zero raises an error.
Currently most arithmetic operations operating on infinities,
NaNs, and sub-normals do not raise errors.
examples:
- program: '.[] | (inf * .) < 0'
- program: '.[] | (infinite * .) < 0'
input: '[-1, 1]'
output: ['true', 'false']
- program: 'inf, nan | type'
- program: 'infinite, nan | type'
input: 'null'
output: ['"number"']