Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-21 02:23:20 +00:00
Code Issues Projects Releases Wiki Activity

neaten

Browse source
This commit is contained in:
John Kerl 2016-09-10 20:12:09 -04:00
parent ffec5f0bb9
commit 6df2f221aa
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
c/mapping/function_manager.c
View file

@ -434,22 +434,7 @@ static rval_evaluator_t* fmgr_alloc_from_udf_callsite(fmgr_t* pfmgr, udf_defsite
rval_evaluator_t* fmgr_alloc_from_operator_or_function_call(fmgr_t* pfmgr, mlr_dsl_ast_node_t* pnode,
int type_inferencing, int context_flags)
{
if ((pnode->type != MD_AST_NODE_TYPE_NON_SIGIL_NAME) && (pnode->type != MD_AST_NODE_TYPE_OPERATOR)) {
// xxx use error code & let the caller fatal it.
// xxx or move to caller.
if (context_flags & IN_MLR_FILTER) {
fprintf(stderr,
"%s: statements in %s filter should only be single expressions evaluating to boolean.\n",
MLR_GLOBALS.bargv0, MLR_GLOBALS.bargv0);
exit(1);
}
fprintf(stderr, "%s: internal coding error detected in file %s at line %d (node type %s).\n",
MLR_GLOBALS.bargv0, __FILE__, __LINE__, mlr_dsl_ast_node_describe_type(pnode->type));
exit(1);
}
char* function_name = pnode->text;
int user_provided_arity = pnode->pchildren->length;
udf_defsite_state_t* pudf_defsite_state = lhmsv_get(pfmgr->pudf_names_to_defsite_states, function_name);

12
c/mapping/rval_expr_evaluators.c
View file

@ -81,6 +81,18 @@ rval_evaluator_t* rval_evaluator_alloc_from_ast(mlr_dsl_ast_node_t* pnode, fmgr_
return rval_evaluator_alloc_from_environment(pnode, pfmgr, type_inferencing, context_flags);
} else {
if ((pnode->type != MD_AST_NODE_TYPE_NON_SIGIL_NAME) && (pnode->type != MD_AST_NODE_TYPE_OPERATOR)) {
if (context_flags & IN_MLR_FILTER) {
fprintf(stderr,
"%s: statements in %s filter should only be single expressions evaluating to boolean.\n",
MLR_GLOBALS.bargv0, MLR_GLOBALS.bargv0);
exit(1);
}
fprintf(stderr, "%s: internal coding error detected in file %s at line %d (node type %s).\n",
MLR_GLOBALS.bargv0, __FILE__, __LINE__, mlr_dsl_ast_node_describe_type(pnode->type));
exit(1);
}
return fmgr_alloc_from_operator_or_function_call(pfmgr, pnode, type_inferencing, context_flags);
}