Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-25 17:04:01 +00:00
Code Issues Projects Releases Wiki Activity

name-neatens

Browse source
This commit is contained in:
John Kerl 2016-11-06 14:49:00 -05:00
parent 4e943e33c3
commit a91ecf7d93
4 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
c/mapping/mlr_dsl_cst.h
View file

@ -343,7 +343,7 @@ mlr_dsl_cst_statement_t* alloc_local_variable_definition(
int type_mask);
mlr_dsl_cst_statement_allocator_t alloc_nonindexed_local_variable_assignment;
mlr_dsl_cst_statement_allocator_t alloc_local_map_variable_assignment;
mlr_dsl_cst_statement_allocator_t alloc_indexed_local_variable_assignment;
mlr_dsl_cst_statement_allocator_t alloc_oosvar_assignment;
mlr_dsl_cst_statement_allocator_t alloc_oosvar_from_full_srec_assignment;
mlr_dsl_cst_statement_allocator_t alloc_full_srec_from_oosvar_assignment;

32
c/mapping/mlr_dsl_cst_assignment_statements.c
View file

@ -242,22 +242,22 @@ static void handle_nonindexed_local_variable_assignment(
}
// ================================================================
typedef struct _local_map_variable_assignment_state_t {
typedef struct _indexed_local_variable_assignment_state_t {
char* lhs_variable_name; // For error messages only: stack-index is computed by stack-allocator:
int lhs_frame_relative_index;
sllv_t* plhs_keylist_evaluators;
rval_evaluator_t* prhs_evaluator;
} local_map_variable_assignment_state_t;
} indexed_local_variable_assignment_state_t;
static mlr_dsl_cst_statement_handler_t handle_local_map_variable_assignment;
static mlr_dsl_cst_statement_freer_t free_local_map_variable_assignment;
static mlr_dsl_cst_statement_handler_t handle_indexed_local_variable_assignment;
static mlr_dsl_cst_statement_freer_t free_indexed_local_variable_assignment;
// ----------------------------------------------------------------
mlr_dsl_cst_statement_t* alloc_local_map_variable_assignment(mlr_dsl_cst_t* pcst, mlr_dsl_ast_node_t* pnode,
mlr_dsl_cst_statement_t* alloc_indexed_local_variable_assignment(mlr_dsl_cst_t* pcst, mlr_dsl_ast_node_t* pnode,
int type_inferencing, int context_flags)
{
local_map_variable_assignment_state_t* pstate = mlr_malloc_or_die(sizeof(
local_map_variable_assignment_state_t));
indexed_local_variable_assignment_state_t* pstate = mlr_malloc_or_die(sizeof(
indexed_local_variable_assignment_state_t));
mlr_dsl_ast_node_t* pleft = pnode->pchildren->phead->pvvalue;
mlr_dsl_ast_node_t* pright = pnode->pchildren->phead->pnext->pvvalue;
@ -285,14 +285,14 @@ mlr_dsl_cst_statement_t* alloc_local_map_variable_assignment(mlr_dsl_cst_t* pcst
return mlr_dsl_cst_statement_valloc(
pnode,
handle_local_map_variable_assignment,
free_local_map_variable_assignment,
handle_indexed_local_variable_assignment,
free_indexed_local_variable_assignment,
pstate);
}
// ----------------------------------------------------------------
static void free_local_map_variable_assignment(mlr_dsl_cst_statement_t* pstatement) {
local_map_variable_assignment_state_t* pstate = pstatement->pvstate;
static void free_indexed_local_variable_assignment(mlr_dsl_cst_statement_t* pstatement) {
indexed_local_variable_assignment_state_t* pstate = pstatement->pvstate;
for (sllve_t* pe = pstate->plhs_keylist_evaluators->phead; pe != NULL; pe = pe->pnext) {
rval_evaluator_t* pev = pe->pvvalue;
@ -304,12 +304,12 @@ static void free_local_map_variable_assignment(mlr_dsl_cst_statement_t* pstateme
}
// ----------------------------------------------------------------
static void handle_local_map_variable_assignment(
static void handle_indexed_local_variable_assignment(
mlr_dsl_cst_statement_t* pstatement,
variables_t* pvars,
cst_outputs_t* pcst_outputs)
{
local_map_variable_assignment_state_t* pstate = pstatement->pvstate;
indexed_local_variable_assignment_state_t* pstate = pstatement->pvstate;
rval_evaluator_t* prhs_evaluator = pstate->prhs_evaluator;
mv_t rhs_value = prhs_evaluator->pprocess_func(prhs_evaluator->pvstate, pvars);
@ -697,7 +697,7 @@ typedef struct _local_variable_definition_state_t {
} local_variable_definition_state_t;
static mlr_dsl_cst_statement_handler_t handle_nonindexed_local_variable_definition;
static mlr_dsl_cst_statement_handler_t handle_local_map_variable_declaration;
static mlr_dsl_cst_statement_handler_t handle_indexed_local_variable_declaration;
static mlr_dsl_cst_statement_freer_t free_local_variable_definition;
// ----------------------------------------------------------------
@ -726,7 +726,7 @@ mlr_dsl_cst_statement_t* alloc_local_variable_definition(
pstatement_handler = handle_nonindexed_local_variable_definition;
} else {
pstate->prhs_evaluator = NULL;
pstatement_handler = handle_local_map_variable_declaration;
pstatement_handler = handle_indexed_local_variable_declaration;
}
return mlr_dsl_cst_statement_valloc(
@ -768,7 +768,7 @@ static void handle_nonindexed_local_variable_definition( // xxx mapvar
}
// ----------------------------------------------------------------
static void handle_local_map_variable_declaration( // xxx mapvar
static void handle_indexed_local_variable_declaration( // xxx mapvar
mlr_dsl_cst_statement_t* pstatement,
variables_t* pvars,
cst_outputs_t* pcst_outputs)

32
c/mapping/mlr_dsl_cst_return_statements.c
View file

@ -34,7 +34,7 @@ static void free_return_void(mlr_dsl_cst_statement_t* pstatement) {
// ================================================================
static mlr_dsl_cst_statement_allocator_t alloc_return_value_from_map_literal;
static mlr_dsl_cst_statement_allocator_t alloc_return_value_from_local_non_map_variable;
static mlr_dsl_cst_statement_allocator_t alloc_return_value_from_local_map_variable;
static mlr_dsl_cst_statement_allocator_t alloc_return_value_from_indexed_local_variable;
static mlr_dsl_cst_statement_allocator_t alloc_return_value_from_oosvar;
static mlr_dsl_cst_statement_allocator_t alloc_return_value_from_full_oosvar;
static mlr_dsl_cst_statement_allocator_t alloc_return_value_from_full_srec; // xxx needs grammar support
@ -73,7 +73,7 @@ mlr_dsl_cst_statement_t* alloc_return_value(
break;
case MD_AST_NODE_TYPE_INDEXED_LOCAL_VARIABLE:
return alloc_return_value_from_local_map_variable(pcst, pnode, type_inferencing, context_flags);
return alloc_return_value_from_indexed_local_variable(pcst, pnode, type_inferencing, context_flags);
break;
case MD_AST_NODE_TYPE_OOSVAR_KEYLIST:
@ -101,7 +101,7 @@ mlr_dsl_cst_statement_t* alloc_return_value(
// ----------------------------------------------------------------
static mlr_dsl_cst_statement_handler_t handle_return_value_from_local_non_map_variable;
static mlr_dsl_cst_statement_handler_t handle_return_value_from_local_map_variable;
static mlr_dsl_cst_statement_handler_t handle_return_value_from_indexed_local_variable;
static mlr_dsl_cst_statement_handler_t handle_return_value_from_oosvar;
static mlr_dsl_cst_statement_handler_t handle_return_value_from_full_oosvar;
static mlr_dsl_cst_statement_handler_t handle_return_value_from_full_srec; // xxx needs grammar support
@ -185,27 +185,27 @@ static void free_return_value_from_local_non_map_variable(mlr_dsl_cst_statement_
}
// ================================================================
typedef struct _return_value_from_local_map_variable_state_t {
typedef struct _return_value_from_indexed_local_variable_state_t {
// For error messages only: stack-index is computed by stack-allocator:
char* rhs_variable_name;
int rhs_frame_relative_index;
sllv_t* prhs_keylist_evaluators;
} return_value_from_local_map_variable_state_t;
} return_value_from_indexed_local_variable_state_t;
static mlr_dsl_cst_statement_handler_t handle_return_value_from_local_map_variable;
static mlr_dsl_cst_statement_freer_t free_return_value_from_local_map_variable;
static mlr_dsl_cst_statement_handler_t handle_return_value_from_indexed_local_variable;
static mlr_dsl_cst_statement_freer_t free_return_value_from_indexed_local_variable;
// ----------------------------------------------------------------
mlr_dsl_cst_statement_t* alloc_return_value_from_local_map_variable(
mlr_dsl_cst_statement_t* alloc_return_value_from_indexed_local_variable(
mlr_dsl_cst_t* pcst,
mlr_dsl_ast_node_t* pnode,
int type_inferencing,
int context_flags)
{
return_value_from_local_map_variable_state_t* pstate =
mlr_malloc_or_die(sizeof(return_value_from_local_map_variable_state_t));
return_value_from_indexed_local_variable_state_t* pstate =
mlr_malloc_or_die(sizeof(return_value_from_indexed_local_variable_state_t));
mlr_dsl_ast_node_t* prhs_node = pnode->pchildren->phead->pvvalue;
@ -219,18 +219,18 @@ mlr_dsl_cst_statement_t* alloc_return_value_from_local_map_variable(
return mlr_dsl_cst_statement_valloc(
pnode,
handle_return_value_from_local_map_variable,
free_return_value_from_local_map_variable,
handle_return_value_from_indexed_local_variable,
free_return_value_from_indexed_local_variable,
pstate);
}
// ----------------------------------------------------------------
static void handle_return_value_from_local_map_variable(
static void handle_return_value_from_indexed_local_variable(
mlr_dsl_cst_statement_t* pstatement,
variables_t* pvars,
cst_outputs_t* pcst_outputs)
{
return_value_from_local_map_variable_state_t* pstate = pstatement->pvstate;
return_value_from_indexed_local_variable_state_t* pstate = pstatement->pvstate;
int all_non_null_or_error = TRUE;
sllmv_t* pmvkeys = evaluate_list(pstate->prhs_keylist_evaluators, pvars,
@ -256,8 +256,8 @@ static void handle_return_value_from_local_map_variable(
pvars->return_state.returned = TRUE;
}
static void free_return_value_from_local_map_variable(mlr_dsl_cst_statement_t* pstatement) {
return_value_from_local_map_variable_state_t* pstate = pstatement->pvstate;
static void free_return_value_from_indexed_local_variable(mlr_dsl_cst_statement_t* pstatement) {
return_value_from_indexed_local_variable_state_t* pstate = pstatement->pvstate;
for (sllve_t* pe = pstate->prhs_keylist_evaluators->phead; pe != NULL; pe = pe->pnext) {
rval_evaluator_t* pev = pe->pvvalue;

2
c/mapping/mlr_dsl_cst_statements.c
View file

@ -214,7 +214,7 @@ mlr_dsl_cst_statement_t* mlr_dsl_cst_alloc_statement(mlr_dsl_cst_t* pcst, mlr_ds
break;
case MD_AST_NODE_TYPE_INDEXED_LOCAL_ASSIGNMENT:
return alloc_local_map_variable_assignment(pcst, pnode, type_inferencing, context_flags);
return alloc_indexed_local_variable_assignment(pcst, pnode, type_inferencing, context_flags);
break;
case MD_AST_NODE_TYPE_SREC_ASSIGNMENT: