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

neaten

Browse source
This commit is contained in:
John Kerl 2016-11-25 10:59:07 -05:00
parent a1e6e544aa
commit 3cb8cddec6
2 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
c/containers/local_stack.h
View file

@ -83,10 +83,10 @@ void local_stack_bounds_check(local_stack_frame_t* pframe, char* op, int set, in
local_stack_frame_t* local_stack_frame_enter(local_stack_frame_t* pframe);
void local_stack_frame_exit(local_stack_frame_t* pframe);
void local_stack_frame_throw_type_mismatch(local_stack_frame_entry_t* pentry, mv_t* pval);
void local_stack_frame_throw_type_xmismatch(local_stack_frame_entry_t* pentry, mlhmmv_xvalue_t* pxval); // xxx temp
void local_stack_frame_throw_type_xmismatch(local_stack_frame_entry_t* pentry, mlhmmv_xvalue_t* pxval);
// ----------------------------------------------------------------
static inline mv_t local_stack_frame_get_terminal_from_nonindexed(local_stack_frame_t* pframe,
static inline mv_t local_stack_frame_get_terminal_from_nonindexed(local_stack_frame_t* pframe, // move to reference semantics
int vardef_frame_relative_index)
{
LOCAL_STACK_TRACE(printf("LOCAL STACK FRAME %p GET %d\n", pframe, vardef_frame_relative_index));

40
c/mapping/mlr_dsl_cst_output_statements.c
View file

@ -367,7 +367,6 @@ mlr_dsl_cst_statement_t* alloc_emitf(mlr_dsl_cst_t* pcst, mlr_dsl_ast_node_t* pn
MLR_INTERNAL_CODING_ERROR();
break;
}
// This could be enforced in the lemon parser but it's easier to do it here. // xxx rm cmt x all
sllv_append(pstate->pemitf_items,
alloc_emitf_item(
name,
@ -1051,6 +1050,11 @@ typedef struct _emit_lashed_state_t {
emit_lashed_item_t** ppitems;
sllv_t* pemit_namelist_evaluators;
// Used per-call but allocated once in the constructor:
mv_t* pbasenames;
boxed_xval_t* pboxed_xvals;
mlhmmv_xvalue_t** ptop_values;
rval_evaluator_t* poutput_filename_evaluator;
FILE* stdfp;
file_output_mode_t file_output_mode;
@ -1128,6 +1132,10 @@ mlr_dsl_cst_statement_t* alloc_emit_lashed(mlr_dsl_cst_t* pcst, mlr_dsl_ast_node
}
pstate->pemit_namelist_evaluators = pemit_namelist_evaluators;
pstate->pbasenames = mlr_malloc_or_die(pstate->num_emit_lashed_items * sizeof(mv_t));
pstate->pboxed_xvals = mlr_malloc_or_die(pstate->num_emit_lashed_items * sizeof(boxed_xval_t));
pstate->ptop_values = mlr_malloc_or_die(pstate->num_emit_lashed_items * sizeof(mlhmmv_level_entry_t*));
mlr_dsl_cst_statement_handler_t* phandler = NULL;
pstate->do_full_prefixing = do_full_prefixing;
mlr_dsl_ast_node_t* pfilename_node = poutput_node->pchildren == NULL
@ -1179,6 +1187,10 @@ static void free_emit_lashed(mlr_dsl_cst_statement_t* pstatement) {
sllv_free(pstate->pemit_namelist_evaluators);
}
free(pstate->pbasenames);
free(pstate->pboxed_xvals);
free(pstate->ptop_values);
if (pstate->psingle_lrec_writer != NULL) {
pstate->psingle_lrec_writer->pfree_func(pstate->psingle_lrec_writer);
}
@ -1261,11 +1273,9 @@ static void handle_emit_lashed_common(
sllv_t* poutrecs,
char* oosvar_flatten_separator)
{
// xxx alloc array in ctor, free in dtor, reuse here
mv_t* pbasenames = mlr_malloc_or_die(pstate->num_emit_lashed_items * sizeof(mv_t));
for (int i = 0; i < pstate->num_emit_lashed_items; i++) {
rval_evaluator_t* pev = pstate->ppitems[i]->pbasename_evaluator;
pbasenames[i] = pev->pprocess_func(pev->pvstate, pvars);
pstate->pbasenames[i] = pev->pprocess_func(pev->pvstate, pvars);
}
int names_all_non_null_or_error = TRUE;
@ -1274,36 +1284,28 @@ static void handle_emit_lashed_common(
if (names_all_non_null_or_error) {
// xxx alloc array in ctor, free in dtor, reuse here
boxed_xval_t* pboxed_xvals = mlr_malloc_or_die(
pstate->num_emit_lashed_items * sizeof(boxed_xval_t));
// xxx comment
mlhmmv_xvalue_t** ptop_values = mlr_malloc_or_die(
pstate->num_emit_lashed_items * sizeof(mlhmmv_level_entry_t*));
for (int i = 0; i < pstate->num_emit_lashed_items; i++) {
emit_lashed_item_t* pitem = pstate->ppitems[i];
pboxed_xvals[i] = pitem->pitem_xevaluator->pprocess_func(
pstate->pboxed_xvals[i] = pitem->pitem_xevaluator->pprocess_func(
pitem->pitem_xevaluator->pvstate, pvars);
ptop_values[i] = &pboxed_xvals[i].xval;
pstate->ptop_values[i] = &pstate->pboxed_xvals[i].xval;
}
mlhmmv_xvalues_to_lrecs_lashed(ptop_values, pstate->num_emit_lashed_items, pbasenames, pmvnames,
poutrecs, pstate->do_full_prefixing, oosvar_flatten_separator);
mlhmmv_xvalues_to_lrecs_lashed(pstate->ptop_values, pstate->num_emit_lashed_items,
pstate->pbasenames, pmvnames, poutrecs, pstate->do_full_prefixing, oosvar_flatten_separator);
for (int i = 0; i < pstate->num_emit_lashed_items; i++) {
if (pboxed_xvals[i].is_ephemeral) {
mlhmmv_xvalue_free(&pboxed_xvals[i].xval);
if (pstate->pboxed_xvals[i].is_ephemeral) {
mlhmmv_xvalue_free(&pstate->pboxed_xvals[i].xval);
}
}
free(ptop_values);
free(pboxed_xvals);
}
sllmv_free(pmvnames);
for (int i = 0; i < pstate->num_emit_lashed_items; i++) {
mv_free(&pbasenames[i]);
mv_free(&pstate->pbasenames[i]);
}
free(pbasenames);
}
// ================================================================