diff --git a/c/mapping/mlr_dsl_cst_assignment_statements.c b/c/mapping/mlr_dsl_cst_assignment_statements.c index 105156fb1..e069ed836 100644 --- a/c/mapping/mlr_dsl_cst_assignment_statements.c +++ b/c/mapping/mlr_dsl_cst_assignment_statements.c @@ -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; } diff --git a/c/mapping/mlr_dsl_cst_for_map_statements.c b/c/mapping/mlr_dsl_cst_for_map_statements.c index 94d05c857..b8f5cce09 100644 --- a/c/mapping/mlr_dsl_cst_for_map_statements.c +++ b/c/mapping/mlr_dsl_cst_for_map_statements.c @@ -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); diff --git a/c/mapping/mlr_dsl_cst_output_statements.c b/c/mapping/mlr_dsl_cst_output_statements.c index 2382e72de..84a7d4a21 100644 --- a/c/mapping/mlr_dsl_cst_output_statements.c +++ b/c/mapping/mlr_dsl_cst_output_statements.c @@ -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); } diff --git a/c/mapping/rval_evaluators.h b/c/mapping/rval_evaluators.h index e093b42f8..de4025cf7 100644 --- a/c/mapping/rval_evaluators.h +++ b/c/mapping/rval_evaluators.h @@ -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: diff --git a/c/mapping/rxval_expr_evaluators.c b/c/mapping/rxval_expr_evaluators.c index 645127401..9420b3fba 100644 --- a/c/mapping/rxval_expr_evaluators.c +++ b/c/mapping/rxval_expr_evaluators.c @@ -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(