Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

builtin.c: typecheck builtin cfunctions in function_list #3209

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

builtin.c: typecheck builtin cfunctions in function_list #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
750ef29
builtin.c: typecheck builtin cfunctions in function_list
emanuele6 Nov 25, 2024
ab3173a
jq_next: simplify CALL_BUILTIN implementation
emanuele6 Nov 25, 2024
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
131 changes: 67 additions & 64 deletions src/builtin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,85 +1790,88 @@ static jv f_have_decnum(jq_state *jq, jv a) {
#endif
}

#define CFUNC(func, name, arity) \
{.fptr = { .a ## arity = func }, name, arity}

#define LIBM_DD(name) \
{f_ ## name, #name, 1},
CFUNC(f_ ## name, #name, 1),
#define LIBM_DD_NO(name) LIBM_DD(name)
#define LIBM_DA(name, type) LIBM_DD(name)
#define LIBM_DA_NO(name, type) LIBM_DD(name)

#define LIBM_DDD(name) \
{f_ ## name, #name, 3},
CFUNC(f_ ## name, #name, 3),
#define LIBM_DDD_NO(name) LIBM_DDD(name)

#define LIBM_DDDD(name) \
{f_ ## name, #name, 4},
CFUNC(f_ ## name, #name, 4),
#define LIBM_DDDD_NO(name) LIBM_DDDD(name)

static const struct cfunction function_list[] = {
#include "libm.h"
{f_negate, "_negate", 1},
#define BINOP(name) {f_ ## name, "_" #name, 3},
CFUNC(f_negate, "_negate", 1),
#define BINOP(name) CFUNC(f_ ## name, "_" #name, 3),
BINOPS
#undef BINOP
{f_dump, "tojson", 1},
{f_json_parse, "fromjson", 1},
{f_tonumber, "tonumber", 1},
{f_tostring, "tostring", 1},
{f_keys, "keys", 1},
{f_keys_unsorted, "keys_unsorted", 1},
{f_startswith, "startswith", 2},
{f_endswith, "endswith", 2},
{f_string_split, "split", 2},
{f_string_explode, "explode", 1},
{f_string_implode, "implode", 1},
{f_string_indexes, "_strindices", 2},
{f_string_trim, "trim", 1},
{f_string_ltrim, "ltrim", 1},
{f_string_rtrim, "rtrim", 1},
{f_setpath, "setpath", 3}, // FIXME typechecking
{f_getpath, "getpath", 2},
{f_delpaths, "delpaths", 2},
{f_has, "has", 2},
{f_contains, "contains", 2},
{f_length, "length", 1},
{f_utf8bytelength, "utf8bytelength", 1},
{f_type, "type", 1},
{f_isinfinite, "isinfinite", 1},
{f_isnan, "isnan", 1},
{f_isnormal, "isnormal", 1},
{f_infinite, "infinite", 1},
{f_nan, "nan", 1},
{f_sort, "sort", 1},
{f_sort_by_impl, "_sort_by_impl", 2},
{f_group_by_impl, "_group_by_impl", 2},
{f_min, "min", 1},
{f_max, "max", 1},
{f_min_by_impl, "_min_by_impl", 2},
{f_max_by_impl, "_max_by_impl", 2},
{f_error, "error", 1},
{f_format, "format", 2},
{f_env, "env", 1},
{f_halt, "halt", 1},
{f_halt_error, "halt_error", 2},
{f_get_search_list, "get_search_list", 1},
{f_get_prog_origin, "get_prog_origin", 1},
{f_get_jq_origin, "get_jq_origin", 1},
{f_match, "_match_impl", 4},
{f_modulemeta, "modulemeta", 1},
{f_input, "input", 1},
{f_debug, "debug", 1},
{f_stderr, "stderr", 1},
{f_strptime, "strptime", 2},
{f_strftime, "strftime", 2},
{f_strflocaltime, "strflocaltime", 2},
{f_mktime, "mktime", 1},
{f_gmtime, "gmtime", 1},
{f_localtime, "localtime", 1},
{f_now, "now", 1},
{f_current_filename, "input_filename", 1},
{f_current_line, "input_line_number", 1},
{f_have_decnum, "have_decnum", 1},
{f_have_decnum, "have_literal_numbers", 1},
CFUNC(f_dump, "tojson", 1),
CFUNC(f_json_parse, "fromjson", 1),
CFUNC(f_tonumber, "tonumber", 1),
CFUNC(f_tostring, "tostring", 1),
CFUNC(f_keys, "keys", 1),
CFUNC(f_keys_unsorted, "keys_unsorted", 1),
CFUNC(f_startswith, "startswith", 2),
CFUNC(f_endswith, "endswith", 2),
CFUNC(f_string_split, "split", 2),
CFUNC(f_string_explode, "explode", 1),
CFUNC(f_string_implode, "implode", 1),
CFUNC(f_string_indexes, "_strindices", 2),
CFUNC(f_string_trim, "trim", 1),
CFUNC(f_string_ltrim, "ltrim", 1),
CFUNC(f_string_rtrim, "rtrim", 1),
CFUNC(f_setpath, "setpath", 3),
CFUNC(f_getpath, "getpath", 2),
CFUNC(f_delpaths, "delpaths", 2),
CFUNC(f_has, "has", 2),
CFUNC(f_contains, "contains", 2),
CFUNC(f_length, "length", 1),
CFUNC(f_utf8bytelength, "utf8bytelength", 1),
CFUNC(f_type, "type", 1),
CFUNC(f_isinfinite, "isinfinite", 1),
CFUNC(f_isnan, "isnan", 1),
CFUNC(f_isnormal, "isnormal", 1),
CFUNC(f_infinite, "infinite", 1),
CFUNC(f_nan, "nan", 1),
CFUNC(f_sort, "sort", 1),
CFUNC(f_sort_by_impl, "_sort_by_impl", 2),
CFUNC(f_group_by_impl, "_group_by_impl", 2),
CFUNC(f_min, "min", 1),
CFUNC(f_max, "max", 1),
CFUNC(f_min_by_impl, "_min_by_impl", 2),
CFUNC(f_max_by_impl, "_max_by_impl", 2),
CFUNC(f_error, "error", 1),
CFUNC(f_format, "format", 2),
CFUNC(f_env, "env", 1),
CFUNC(f_halt, "halt", 1),
CFUNC(f_halt_error, "halt_error", 2),
CFUNC(f_get_search_list, "get_search_list", 1),
CFUNC(f_get_prog_origin, "get_prog_origin", 1),
CFUNC(f_get_jq_origin, "get_jq_origin", 1),
CFUNC(f_match, "_match_impl", 4),
CFUNC(f_modulemeta, "modulemeta", 1),
CFUNC(f_input, "input", 1),
CFUNC(f_debug, "debug", 1),
CFUNC(f_stderr, "stderr", 1),
CFUNC(f_strptime, "strptime", 2),
CFUNC(f_strftime, "strftime", 2),
CFUNC(f_strflocaltime, "strflocaltime", 2),
CFUNC(f_mktime, "mktime", 1),
CFUNC(f_gmtime, "gmtime", 1),
CFUNC(f_localtime, "localtime", 1),
CFUNC(f_now, "now", 1),
CFUNC(f_current_filename, "input_filename", 1),
CFUNC(f_current_line, "input_line_number", 1),
CFUNC(f_have_decnum, "have_decnum", 1),
CFUNC(f_have_decnum, "have_literal_numbers", 1),
};
#undef LIBM_DDDD_NO
#undef LIBM_DDD_NO
Expand Down
11 changes: 8 additions & 3 deletions src/bytecode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define BYTECODE_H
#include <stdint.h>

#include "jv.h"
#include "jq.h"

typedef enum {
#define OP(name, imm, in, out) name,
Expand Down Expand Up @@ -44,9 +44,14 @@ struct opcode_description {
const struct opcode_description* opcode_describe(opcode op);


#define MAX_CFUNCTION_ARGS 10
#define MAX_CFUNCTION_ARGS 4
struct cfunction {
jv (*fptr)();
union {
jv (*a1)(jq_state *, jv);
jv (*a2)(jq_state *, jv, jv);
jv (*a3)(jq_state *, jv, jv, jv);
jv (*a4)(jq_state *, jv, jv, jv, jv);
} fptr;
const char* name;
int nargs;
};
Expand Down
39 changes: 15 additions & 24 deletions src/execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,6 @@ static void set_error(jq_state *jq, jv value) {
#define ON_BACKTRACK(op) ((op)+NUM_OPCODES)

jv jq_next(jq_state *jq) {
jv cfunc_input[MAX_CFUNCTION_ARGS];

jv_nomem_handler(jq->nomem_handler, jq->nomem_handler_data);

uint16_t* pc = stack_restore(jq);
Expand Down Expand Up @@ -909,34 +907,27 @@ jv jq_next(jq_state *jq) {

case CALL_BUILTIN: {
int nargs = *pc++;
jv top = stack_pop(jq);
jv* in = cfunc_input;
in[0] = top;
for (int i = 1; i < nargs; i++) {
in[i] = stack_pop(jq);
}
struct cfunction* function = &frame_current(jq)->bc->globals->cfunctions[*pc++];
jv in[MAX_CFUNCTION_ARGS];
for (int i = 0; i < nargs; ++i)
in[i] = stack_pop(jq);

jv top;
switch (function->nargs) {
case 1: top = ((jv (*)(jq_state *, jv))function->fptr)(jq, in[0]); break;
case 2: top = ((jv (*)(jq_state *, jv, jv))function->fptr)(jq, in[0], in[1]); break;
case 3: top = ((jv (*)(jq_state *, jv, jv, jv))function->fptr)(jq, in[0], in[1], in[2]); break;
case 4: top = ((jv (*)(jq_state *, jv, jv, jv, jv))function->fptr)(jq, in[0], in[1], in[2], in[3]); break;
case 5: top = ((jv (*)(jq_state *, jv, jv, jv, jv, jv))function->fptr)(jq, in[0], in[1], in[2], in[3], in[4]); break;
// FIXME: a) up to 7 arguments (input + 6), b) should assert
// because the compiler should not generate this error.
default: return jv_invalid_with_msg(jv_string("Function takes too many arguments"));
case 1: top = function->fptr.a1(jq, in[0]); break;
case 2: top = function->fptr.a2(jq, in[0], in[1]); break;
case 3: top = function->fptr.a3(jq, in[0], in[1], in[2]); break;
case 4: top = function->fptr.a4(jq, in[0], in[1], in[2], in[3]); break;
default: assert(0 && "Invalid number of arguments");
}

if (jv_is_valid(top)) {
stack_push(jq, top);
} else if (jv_invalid_has_msg(jv_copy(top))) {
set_error(jq, top);
goto do_backtrack;
} else {
// C-coded function returns invalid w/o msg? -> backtrack, as if
// it had returned `empty`
if (!jv_is_valid(top)) {
if (jv_invalid_has_msg(jv_copy(top)))
set_error(jq, top);
goto do_backtrack;
}

stack_push(jq, top);
break;
}

Expand Down
Loading