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

filter-put merge iterate

Browse source
This commit is contained in:
John Kerl 2016-01-11 21:15:39 -05:00
parent 99c083719f
commit 68eb27d46b
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
c/containers/mlr_dsl_ast.h
View file

@ -20,6 +20,7 @@ typedef struct _mlr_dsl_ast_node_t {
sllv_t* pchildren;
} mlr_dsl_ast_node_t;
// xxx delete?
// For convenience of the parser.
typedef struct _mlr_dsl_ast_node_holder_t {
mlr_dsl_ast_node_t* proot;

16
c/mapping/mapper_filter.c
View file

@ -3,7 +3,7 @@
#include "containers/sllv.h"
#include "mapping/lrec_evaluators.h"
#include "mapping/mappers.h"
#include "dsls/filter_dsl_wrapper.h"
#include "dsls/put_dsl_wrapper.h"
#include "cli/argparse.h"
typedef struct _mapper_filter_state_t {
@ -84,19 +84,25 @@ static mapper_t* mapper_filter_parse_cli(int* pargi, int argc, char** argv) {
}
mlr_dsl_expression = argv[(*pargi)++];
mlr_dsl_ast_node_holder_t* past = filter_dsl_parse(mlr_dsl_expression);
if (past == NULL) {
sllv_t* pasts = put_dsl_parse(mlr_dsl_expression);
if (pasts == NULL) {
mapper_filter_usage(stderr, argv[0], verb);
return NULL;
}
if (pasts->length != 1) {
fprintf(stderr, "%s %s: multiple expressions are unsupported.\n", argv[0], verb);
return NULL;
}
mlr_dsl_ast_node_t* past = sllv_pop(pasts);
sllv_free(pasts);
// For just dev-testing the parser, you can do
// mlr filter -v 'expression goes here' /dev/null
if (print_asts) {
mlr_dsl_ast_node_print(past->proot);
mlr_dsl_ast_node_print(past);
}
return mapper_filter_alloc(pstate, past->proot, type_inferencing, do_exclude);
return mapper_filter_alloc(pstate, past, type_inferencing, do_exclude);
}
// ----------------------------------------------------------------