summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Dolan <mu@netsoc.tcd.ie>2012-12-04 22:45:03 +0000
committerStephen Dolan <mu@netsoc.tcd.ie>2012-12-04 22:45:03 +0000
commitc0a2f1ab470595d85fd20a643325a16737433a2a (patch)
treefdc5da6cb28fef74cba8e6bf76bef4bd2c019fec
parent616e8f9924ad9df22acf58c79c5d49ef6030fcb8 (diff)
Add min, max, min_by, max_by functions.
-rw-r--r--builtin.c59
-rw-r--r--docs/content/3.manual/manual.yml16
-rw-r--r--testdata8
3 files changed, 82 insertions, 1 deletions
diff --git a/builtin.c b/builtin.c
index 2c5787da..b572dfaf 100644
--- a/builtin.c
+++ b/builtin.c
@@ -241,6 +241,56 @@ static jv f_group_by_impl(jv input, jv keys) {
}
}
+static jv minmax_by(jv values, jv keys, int is_min) {
+ if (jv_get_kind(values) != JV_KIND_ARRAY)
+ return type_error2(values, keys, "cannot be iterated over");
+ if (jv_get_kind(keys) != JV_KIND_ARRAY)
+ return type_error2(values, keys, "cannot be iterated over");
+ if (jv_array_length(jv_copy(values)) != jv_array_length(jv_copy(keys)))
+ return type_error2(values, keys, "have wrong length");
+
+ if (jv_array_length(jv_copy(values)) == 0) {
+ jv_free(values);
+ jv_free(keys);
+ return jv_null();
+ }
+ jv ret = jv_array_get(jv_copy(values), 0);
+ jv retkey = jv_array_get(jv_copy(keys), 0);
+ for (int i=1; i<jv_array_length(jv_copy(values)); i++) {
+ jv item = jv_array_get(jv_copy(keys), i);
+ int cmp = jv_cmp(jv_copy(item), jv_copy(retkey));
+ if ((cmp < 0) == (is_min == 1)) {
+ jv_free(retkey);
+ retkey = item;
+ jv_free(ret);
+ ret = jv_array_get(jv_copy(values), i);
+ } else {
+ jv_free(item);
+ }
+ }
+ jv_free(values);
+ jv_free(keys);
+ jv_free(retkey);
+ return ret;
+}
+
+static jv f_min(jv x) {
+ return minmax_by(x, jv_copy(x), 1);
+}
+
+static jv f_max(jv x) {
+ return minmax_by(x, jv_copy(x), 0);
+}
+
+static jv f_min_by_impl(jv x, jv y) {
+ return minmax_by(x, y, 1);
+}
+
+static jv f_max_by_impl(jv x, jv y) {
+ return minmax_by(x, y, 0);
+}
+
+
static jv f_type(jv input) {
jv out = jv_string(jv_kind_name(jv_get_kind(input)));
jv_free(input);
@@ -268,9 +318,14 @@ static struct cfunction function_list[] = {
{(cfunction_ptr)f_sort, "sort", 1},
{(cfunction_ptr)f_sort_by_impl, "_sort_by_impl", 2},
{(cfunction_ptr)f_group_by_impl, "_group_by_impl", 2},
+ {(cfunction_ptr)f_min, "min", 1},
+ {(cfunction_ptr)f_max, "max", 1},
+ {(cfunction_ptr)f_min_by_impl, "_min_by_impl", 2},
+ {(cfunction_ptr)f_max_by_impl, "_max_by_impl", 2},
};
-static struct symbol_table cbuiltins = {function_list, sizeof(function_list)/sizeof(function_list[0])};
+static struct symbol_table cbuiltins =
+ {function_list, sizeof(function_list)/sizeof(function_list[0])};
typedef block (*bytecoded_builtin)();
struct bytecoded_builtin { const char* name; block code; };
@@ -297,6 +352,8 @@ static const char* jq_builtins[] = {
"def sort_by(f): _sort_by_impl(map([f]));",
"def group_by(f): _group_by_impl(map([f]));",
"def unique: group_by(.) | map(.[0]);",
+ "def max_by(f): _max_by_impl(map([f]));",
+ "def min_by(f): _min_by_impl(map([f]));",
};
diff --git a/docs/content/3.manual/manual.yml b/docs/content/3.manual/manual.yml
index 2e616e14..15dcb489 100644
--- a/docs/content/3.manual/manual.yml
+++ b/docs/content/3.manual/manual.yml
@@ -542,6 +542,22 @@ sections:
input: '[{"foo":1, "bar":10}, {"foo":3, "bar":100}, {"foo":1, "bar":1}]'
output: ['[[{"foo":1, "bar":10}, {"foo":1, "bar":1}], [{"foo":3, "bar":100}]]']
+ - title: `min`, `max`, `min_by`, `max_by`
+ body: |
+
+ Find the minimum or maximum element of the input array. The
+ `_by` versions allow you to specify a particular field or
+ property to examine, e.g. `min_by(.foo)` finds the object
+ with the smallest `foo` field.
+
+ examples:
+ - program: 'min'
+ input: '[5,4,2,7]'
+ output: ['2']
+ - program: 'max_by(.foo)'
+ input: '[{"foo":1, "bar":14}, {"foo":2, "bar":3}]'
+ output: ['{"foo":2, "bar":3}']
+
- title: `unique`
body: |
diff --git a/testdata b/testdata
index 088d255d..a3e2e49b 100644
--- a/testdata
+++ b/testdata
@@ -456,3 +456,11 @@ sort
unique
[1,2,5,3,5,3,1,3]
[1,2,3,5]
+
+[min, max, min_by(.[1]), max_by(.[1]), min_by(.[2]), max_by(.[2])]
+[[4,2,"a"],[3,1,"a"],[2,4,"a"],[1,3,"a"]]
+[[1,3,"a"],[4,2,"a"],[3,1,"a"],[2,4,"a"],[4,2,"a"],[1,3,"a"]]
+
+[min,max,min_by(.),max_by(.)]
+[]
+[null,null,null,null]