analyzed-AST verbosity iterate

This commit is contained in:
John Kerl 2016-10-03 19:17:45 -04:00
parent ccbc842b83
commit 8f82ea0149
3 changed files with 6 additions and 4 deletions

View file

@ -53,6 +53,7 @@ static mapper_t* shared_parse_cli(int* pargi, int argc, char** argv,
static mapper_t* mapper_put_or_filter_alloc(
char* mlr_dsl_expression,
int print_ast,
char* comment_stripped_mlr_dsl_expression,
mlr_dsl_ast_t* past,
int put_output_disabled, // mlr put -q
@ -353,7 +354,7 @@ static mapper_t* shared_parse_cli(int* pargi, int argc, char** argv,
mlr_dsl_ast_print(past);
*pargi = argi;
return mapper_put_or_filter_alloc(mlr_dsl_expression, comment_stripped_mlr_dsl_expression,
return mapper_put_or_filter_alloc(mlr_dsl_expression, print_ast, comment_stripped_mlr_dsl_expression,
past, put_output_disabled, do_final_filter, negate_final_filter,
type_inferencing, oosvar_flatten_separator, flush_every_record,
pwriter_opts, pmain_writer_opts);
@ -362,6 +363,7 @@ static mapper_t* shared_parse_cli(int* pargi, int argc, char** argv,
// ----------------------------------------------------------------
static mapper_t* mapper_put_or_filter_alloc(
char* mlr_dsl_expression,
int print_ast,
char* comment_stripped_mlr_dsl_expression,
mlr_dsl_ast_t* past,
int put_output_disabled, // mlr put -q
@ -378,7 +380,7 @@ static mapper_t* mapper_put_or_filter_alloc(
pstate->mlr_dsl_expression = mlr_dsl_expression;
pstate->comment_stripped_mlr_dsl_expression = comment_stripped_mlr_dsl_expression;
pstate->past = past;
pstate->pcst = mlr_dsl_cst_alloc(past, type_inferencing,
pstate->pcst = mlr_dsl_cst_alloc(past, print_ast, type_inferencing,
flush_every_record, do_final_filter, negate_final_filter);
pstate->at_begin = TRUE;
pstate->put_output_disabled = put_output_disabled;

View file

@ -55,7 +55,7 @@ static void mlr_dsl_cst_resolve_subr_callsites(mlr_dsl_cst_t* pcst);
// text="z", type=string_literal.
// text="6", type=strnum_literal.
mlr_dsl_cst_t* mlr_dsl_cst_alloc(mlr_dsl_ast_t* ptop, int type_inferencing, int flush_every_record,
mlr_dsl_cst_t* mlr_dsl_cst_alloc(mlr_dsl_ast_t* ptop, int print_ast, int type_inferencing, int flush_every_record,
int do_final_filter, int negate_final_filter) // for mlr filter
{
int context_flags = do_final_filter ? IN_MLR_FILTER : 0;

View file

@ -251,7 +251,7 @@ typedef struct _mlr_dsl_cst_t {
// * negate_final_filter is TRUE for mlr filter -x.
// * The CST object strips nodes off the raw AST, constructed by the Lemon parser, in order
// to do analysis on it. Nonetheless the caller should free what's left.
mlr_dsl_cst_t* mlr_dsl_cst_alloc(mlr_dsl_ast_t* past, int type_inferencing, int flush_every_record,
mlr_dsl_cst_t* mlr_dsl_cst_alloc(mlr_dsl_ast_t* past, int print_ast, int type_inferencing, int flush_every_record,
int do_final_filter, int negate_final_filter);
mlr_dsl_cst_statement_t* mlr_dsl_cst_alloc_statement(mlr_dsl_cst_t* pcst, mlr_dsl_ast_node_t* pnode,