From c1682c4fcab9a2d4d34e4dcfd63f3f810c7440ee Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 7 Jun 2016 21:40:46 -0400 Subject: [PATCH] neaten --- c/mapping/mlr_dsl_cst.c | 1 - c/mapping/rval_evaluators.h | 5 ++--- c/mapping/rval_expr_evaluators.c | 1 - c/todo.txt | 12 +++++------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/c/mapping/mlr_dsl_cst.c b/c/mapping/mlr_dsl_cst.c index 06b70dacf..70b20a118 100644 --- a/c/mapping/mlr_dsl_cst.c +++ b/c/mapping/mlr_dsl_cst.c @@ -187,7 +187,6 @@ mlr_dsl_ast_node_t* extract_filterable_statement(mlr_dsl_ast_t* pnode, int type_ mlr_dsl_cst_t* mlr_dsl_cst_alloc(mlr_dsl_ast_t* pnode, int type_inferencing) { int context_flags = 0; // The root node is not populated on empty-string input to the parser. - // xxx move this to the finish-hook in the parser? if (pnode->proot == NULL) { pnode->proot = mlr_dsl_ast_node_alloc_zary("list", MD_AST_NODE_TYPE_STATEMENT_LIST); } diff --git a/c/mapping/rval_evaluators.h b/c/mapping/rval_evaluators.h index 11883536f..f0a89ff99 100644 --- a/c/mapping/rval_evaluators.h +++ b/c/mapping/rval_evaluators.h @@ -174,14 +174,13 @@ sllmv_t* evaluate_list(sllv_t* pevaluators, variables_t* pvars, int* pall_non_nu // ---------------------------------------------------------------- // Type-inferenced srec-field getters for the expression-evaluators, as well as for boundvars in srec for-loops. +// For RHS evaluation: mv_t get_srec_value_string_only(char* field_name, lrec_t* pinrec, lhmsmv_t* ptyped_overlay); mv_t get_srec_value_string_float(char* field_name, lrec_t* pinrec, lhmsmv_t* ptyped_overlay); mv_t get_srec_value_string_float_int(char* field_name, lrec_t* pinrec, lhmsmv_t* ptyped_overlay); +// For boundvars in for-srec: typedef mv_t type_infererenced_srec_field_getter_t(lrece_t* pentry, lhmsmv_t* ptyped_overlay); - -// xxx rename -// xxx comment context mv_t get_srec_value_string_only_aux(lrece_t* pentry, lhmsmv_t* ptyped_overlay); mv_t get_srec_value_string_float_aux(lrece_t* pentry, lhmsmv_t* ptyped_overlay); mv_t get_srec_value_string_float_int_aux(lrece_t* pentry, lhmsmv_t* ptyped_overlay); diff --git a/c/mapping/rval_expr_evaluators.c b/c/mapping/rval_expr_evaluators.c index 70c90da0b..d4333b2ba 100644 --- a/c/mapping/rval_expr_evaluators.c +++ b/c/mapping/rval_expr_evaluators.c @@ -935,7 +935,6 @@ mv_t get_srec_value_string_float_int(char* field_name, lrec_t* pinrec, lhmsmv_t* // ---------------------------------------------------------------- -// xxx rename mv_t get_srec_value_string_only_aux(lrece_t* pentry, lhmsmv_t* ptyped_overlay) { // See comments in rval_evaluator.h and mapper_put.c regarding the typed-overlay map. mv_t* poverlay = lhmsmv_get(ptyped_overlay, pentry->key); diff --git a/c/todo.txt b/c/todo.txt index fb9d735ba..f9f1f7e7b 100644 --- a/c/todo.txt +++ b/c/todo.txt @@ -6,7 +6,6 @@ BUGFIXES ================================================================ TOP OF LIST: -* xxxes * re-do valgrinds before release * isnumeric et al.: UTs @@ -15,25 +14,24 @@ COOKBOOK: * cookbook example: komosa originals x 2 * cookbook example: oosvar keyed mean * cookbook https://github.com/johnkerl/miller/issues/103 to fix up short csv data lines - mlr --fs comma --nidx put ' + mlr --from jb.csv --fs comma --nidx put ' @maxnf = max(@maxnf, NF); @nf = NF; while(@nf < @maxnf) { @nf += 1; $[@nf] = "" } - ' jb.csv + ' FAQ: -* faqent about NR from original input stream. NF is already dynamic; FILENUM/FILENAME don't make sense to change. +* NR is from the original input stream. NF is already dynamic; FILENUM/FILENAME don't make sense to change. * gunzip prepipe faqent +* no triple-for with boundvars, but oosvars & while-loops MLD: -* doc re newlines not replacing semicolons. no need for \ continuations that way; simple parser. * ref emph while is *within* each srec do don't loop over NR (for example) * doc & mlr:filter:olh more complex filter expressions: xref to put w/ filter w/in it * -n can be used as syntax-checker flag for DSLs. and/or for dataless ops all in begin{}. -* faqent: no triple-for with boundvars, but oosvars & while-loops * readme note re head dev: announced features ok if build passing (and it is); unannounced features may change ! clear in doc re semicolon as statement separator, not terminator; blank line doesn't terminate. in its own subsubsection. @@ -43,7 +41,7 @@ GEN DOC: UT: * mixed for/while -* dlb-chk UT coverage for 4.1.0 features +* dbl-chk UT coverage for 4.1.0 features * move/filter all reg_test/dev -> reg_test/run HYGIENE: