From a5ce769cf780eebf7a704ac5a08f0d67a665efc1 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 13 Oct 2016 21:31:39 -0400 Subject: [PATCH] put comment-stripping in the grammar so #-strings don't get borked --- c/dsls/mlr_dsl_lexer.l | 2 ++ c/mapping/mapper_put_or_filter.c | 3 ++- c/todo.txt | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/c/dsls/mlr_dsl_lexer.l b/c/dsls/mlr_dsl_lexer.l index e3f79c952..04e942fd7 100644 --- a/c/dsls/mlr_dsl_lexer.l +++ b/c/dsls/mlr_dsl_lexer.l @@ -491,6 +491,8 @@ false { return MD_TOKEN_COMMA; } +#.*\n { } + [ \t\r\n] { } . { diff --git a/c/mapping/mapper_put_or_filter.c b/c/mapping/mapper_put_or_filter.c index 99941ef2d..8eba7f68f 100644 --- a/c/mapping/mapper_put_or_filter.c +++ b/c/mapping/mapper_put_or_filter.c @@ -343,7 +343,8 @@ static mapper_t* shared_parse_cli(int* pargi, int argc, char** argv, slls_free(expression_filenames); slls_free(expression_strings); - comment_stripped_mlr_dsl_expression = alloc_comment_strip(mlr_dsl_expression); + //comment_stripped_mlr_dsl_expression = alloc_comment_strip(mlr_dsl_expression); + comment_stripped_mlr_dsl_expression = mlr_strdup_or_die(mlr_dsl_expression); // Linked list of mlr_dsl_ast_node_t*. mlr_dsl_ast_t* past = mlr_dsl_parse(comment_stripped_mlr_dsl_expression, trace_parse); diff --git a/c/todo.txt b/c/todo.txt index 4f4e36d06..a2d83575e 100644 --- a/c/todo.txt +++ b/c/todo.txt @@ -24,6 +24,10 @@ MISC: * oosvar-single-for mlh * oosvar-single-for mld +* try # at grammar? try not to get strip-outs from strings. + +* gonna wanna pass maps to funcs/subrs ...... and return them too. syntax = ? val/map type-keywords? + ---------------------------------------------------------------- 5.0.0: