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

neaten

Browse source
This commit is contained in:
John Kerl 2016-11-16 22:30:06 -05:00
parent 3a2d7f9da7
commit 997990d5d2
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
c/mapping/mlr_dsl_cst_assignment_statements.c
View file

@ -199,7 +199,7 @@ mlr_dsl_cst_statement_t* alloc_local_variable_definition(
mlr_dsl_cst_statement_handler_t* pstatement_handler = NULL;
mlr_dsl_ast_node_t* prhs_node = pnode->pchildren->phead->pnext->pvvalue;
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_astx( // xxx rename
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_ast( // xxx rename
prhs_node, pcst->pfmgr, type_inferencing, context_flags);
pstatement_handler = handle_local_variable_definition_from_xval;
@ -271,7 +271,7 @@ mlr_dsl_cst_statement_t* alloc_nonindexed_local_variable_assignment(mlr_dsl_cst_
mlr_dsl_cst_statement_handler_t* pstatement_handler = NULL;
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_astx( // xxx rename
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_ast( // xxx rename
prhs_node, pcst->pfmgr, type_inferencing, context_flags);
pstatement_handler = handle_nonindexed_local_variable_assignment_from_xval;
@ -349,7 +349,7 @@ mlr_dsl_cst_statement_t* alloc_indexed_local_variable_assignment(mlr_dsl_cst_t*
mlr_dsl_cst_statement_handler_t* pstatement_handler = NULL;
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_astx(
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_ast(
prhs_node, pcst->pfmgr, type_inferencing, context_flags);
pstatement_handler = handle_indexed_local_variable_assignment_from_xval;
@ -436,7 +436,7 @@ mlr_dsl_cst_statement_t* alloc_oosvar_assignment(mlr_dsl_cst_t* pcst, mlr_dsl_as
mlr_dsl_cst_statement_handler_t* pstatement_handler = NULL;
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_astx(
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_ast(
prhs_node, pcst->pfmgr, type_inferencing, context_flags);
if (pstate->prhs_xevaluator != NULL) {
pstatement_handler = handle_oosvar_assignment_from_xval;
@ -633,7 +633,7 @@ mlr_dsl_cst_statement_t* alloc_full_srec_assignment(mlr_dsl_cst_t* pcst, mlr_dsl
pstate->prhs_xevaluator = NULL;
phandler = handle_full_srec_assignment_nop;
} else {
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_astx(
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_ast(
prhs_node, pcst->pfmgr, type_inferencing, context_flags);
phandler = handle_full_srec_assignment;
}

4
c/mapping/mlr_dsl_cst_for_map_statements.c
View file

@ -817,7 +817,7 @@ mlr_dsl_cst_statement_t* alloc_for_map_literal(mlr_dsl_cst_t* pcst, mlr_dsl_ast_
pstate->v_type_mask = mlr_dsl_ast_node_type_to_type_mask(psubright->type);
// xxx comment liberally
pstate->ptarget_xevaluator = rxval_evaluator_alloc_from_astx(
pstate->ptarget_xevaluator = rxval_evaluator_alloc_from_ast(
pmiddle, pcst->pfmgr, type_inferencing, context_flags);
MLR_INTERNAL_CODING_ERROR_IF(pnode->subframe_var_count == MD_UNUSED_INDEX);
@ -1000,7 +1000,7 @@ mlr_dsl_cst_statement_t* alloc_for_map_literal_key_only(mlr_dsl_cst_t* pcst, mlr
pstate->k_frame_relative_index = pleft->vardef_frame_relative_index;
pstate->k_type_mask = mlr_dsl_ast_node_type_to_type_mask(pleft->type);
pstate->ptarget_xevaluator = rxval_evaluator_alloc_from_astx(
pstate->ptarget_xevaluator = rxval_evaluator_alloc_from_ast(
pmiddle, pcst->pfmgr, type_inferencing, context_flags);
MLR_INTERNAL_CODING_ERROR_IF(pnode->subframe_var_count == MD_UNUSED_INDEX);

6
c/mapping/mlr_dsl_cst_output_statements.c
View file

@ -572,7 +572,7 @@ mlr_dsl_cst_statement_t* alloc_emit(
} else if (pkeylist_node->type == MD_AST_NODE_TYPE_MAP_LITERAL) {
pstate->precord_emitter = record_emitter_from_map_literal;
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_astx(
pstate->prhs_xevaluator = rxval_evaluator_alloc_from_ast(
pkeylist_node, pcst->pfmgr, type_inferencing, context_flags);
} else {
@ -1089,7 +1089,7 @@ mlr_dsl_cst_statement_t* alloc_emit_lashed(mlr_dsl_cst_t* pcst, mlr_dsl_ast_node
pitem->pemit_lashed_item_freer = map_literal_emit_lashed_item_free;
pitem->pemit_keylist_evaluators = sllv_alloc();
sllv_push(pitem->pemit_keylist_evaluators, rval_evaluator_alloc_from_string("_"));
pitem->prhs_xevaluator = rxval_evaluator_alloc_from_astx(
pitem->prhs_xevaluator = rxval_evaluator_alloc_from_ast(
pkeylist_node, pcst->pfmgr, type_inferencing, context_flags);
break;
@ -1485,7 +1485,7 @@ mlr_dsl_cst_statement_t* alloc_dump(mlr_dsl_cst_t* pcst, mlr_dsl_ast_node_t* pno
} else {
pstate->pdump_target_getter = ephemeral_target_getter;
pstate->pdump_target_freer = dump_target_free;
pstate->pephemeral_target_xevaluator = rxval_evaluator_alloc_from_astx(
pstate->pephemeral_target_xevaluator = rxval_evaluator_alloc_from_ast(
ptarget_node, pcst->pfmgr, type_inferencing, context_flags);
}

2
c/mapping/rval_evaluators.h
View file

@ -159,7 +159,7 @@ mv_t get_srec_value_string_float_int_aux(lrece_t* pentry, lhmsmv_t* ptyped_overl
// Topmost functions:
// Wraps mv_t evaluator in an mlhmmv_value_t evaluator.
rxval_evaluator_t* rxval_evaluator_alloc_from_astx(
rxval_evaluator_t* rxval_evaluator_alloc_from_ast(
mlr_dsl_ast_node_t* past, fmgr_t* pfmgr, int type_inferencing, int context_flags);
// Next level:

4
c/mapping/rxval_expr_evaluators.c
View file

@ -17,7 +17,7 @@
// ================================================================
// ----------------------------------------------------------------
rxval_evaluator_t* rxval_evaluator_alloc_from_astx(mlr_dsl_ast_node_t* pnode, fmgr_t* pfmgr,
rxval_evaluator_t* rxval_evaluator_alloc_from_ast(mlr_dsl_ast_node_t* pnode, fmgr_t* pfmgr,
int type_inferencing, int context_flags)
{
switch(pnode->type) {
@ -143,7 +143,7 @@ static map_literal_list_evaluator_t* allocate_map_literal_evaluator_from_ast(
mlr_dsl_ast_node_t* pright = pchild->pchildren->phead->pnext->pvvalue;
mlr_dsl_ast_node_t* pvalnode = pright->pchildren->phead->pvvalue;
if (pright->type == MD_AST_NODE_TYPE_MAP_LITERAL_VALUE) {
ppair->pxval_evaluator = rxval_evaluator_alloc_from_astx(pvalnode, pfmgr, type_inferencing, context_flags);
ppair->pxval_evaluator = rxval_evaluator_alloc_from_ast(pvalnode, pfmgr, type_inferencing, context_flags);
} else if (pright->type == MD_AST_NODE_TYPE_MAP_LITERAL) {
ppair->is_terminal = FALSE;
ppair->plist_evaluator = allocate_map_literal_evaluator_from_ast(