Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-22 07:30:43 +00:00
Code Issues Projects Releases Wiki Activity

xvfuncs iterate: typeof -> extended

Browse source
This commit is contained in:
John Kerl 2016-12-04 23:26:02 -05:00
parent 4850352a98
commit 9d8b92e124
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
c/containers/xvfuncs.h
View file

@ -149,7 +149,7 @@ static inline boxed_xval_t b_x_isnonemptymap_xfunc(boxed_xval_t* pbxval1) {
);
}
static inline boxed_xval_t b_x_typeof_xfunc(boxed_xval_t* pbxval1) {
static inline boxed_xval_t s_x_typeof_xfunc(boxed_xval_t* pbxval1) {
return box_ephemeral_val(
mv_from_string(
mlhmmv_xvalue_describe_type_simple(&pbxval1->xval), NO_FREE

10
c/dsl/function_manager.c
View file

@ -1043,7 +1043,6 @@ static rval_evaluator_t* fmgr_alloc_evaluator_from_unary_func_name(char* fnnm, r
} else if (streq(fnnm, "tanh")) { return rval_evaluator_alloc_from_f_f_func(f_f_tanh_func, parg1);
} else if (streq(fnnm, "tolower")) { return rval_evaluator_alloc_from_s_s_func(s_s_tolower_func, parg1);
} else if (streq(fnnm, "toupper")) { return rval_evaluator_alloc_from_s_s_func(s_s_toupper_func, parg1);
} else if (streq(fnnm, "typeof")) { return rval_evaluator_alloc_from_x_x_func(s_x_typeof_func, parg1);
} else if (streq(fnnm, "~")) { return rval_evaluator_alloc_from_i_i_func(i_i_bitwise_not_func, parg1);
} else return NULL;
@ -1224,6 +1223,8 @@ static rxval_evaluator_t* fmgr_alloc_xevaluator_from_unary_func_name(char* fnnm,
} else if (streq(fnnm, "isstring")) {
return rxval_evaluator_alloc_from_x_x_func(b_x_isstring_xfunc, parg1);
} else if (streq(fnnm, "typeof")) {
return rxval_evaluator_alloc_from_x_x_func(s_x_typeof_xfunc, parg1);
} else if (streq(fnnm, "length")) {
return rxval_evaluator_alloc_from_x_x_func(i_x_length_xfunc, parg1);
} else {
@ -1242,13 +1243,6 @@ static rxval_evaluator_t* fmgr_alloc_xevaluator_from_binary_func_name(char* fnnm
}
}
// {FUNC_CLASS_ARITHMETIC, "ismap", 1,0, "xxx temp."},
// {FUNC_CLASS_ARITHMETIC, "isscalar", 1,0, "xxx temp."},
// {FUNC_CLASS_ARITHMETIC, "isemptymap", 1,0, "xxx temp."},
// {FUNC_CLASS_ARITHMETIC, "isnonemptymap", 1,0, "xxx temp."},
// {FUNC_CLASS_ARITHMETIC, "haskey", 1,0, "xxx temp."},
// {FUNC_CLASS_ARITHMETIC, "length", 1,0, "xxx temp."},
// ================================================================
// Return value is in scalar context.
static void resolve_func_callsite(fmgr_t* pfmgr, rval_evaluator_t* pev) {