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

unset iterate

Browse source
This commit is contained in:
John Kerl 2016-02-28 08:29:30 -05:00
parent 5a6af6b69e
commit 23e7badcb5
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
c/mapping/mlr_dsl_cst.c
View file

@ -221,7 +221,7 @@ static mlr_dsl_cst_statement_t* cst_statement_alloc(mlr_dsl_ast_node_t* past, in
//
// Here past is the =; pright is the 5; pleft is the string of bracket references
// ending at the oosvar name.
//
// Bracket operators come in from the right. So the highest AST node is the rightmost map, and the
// lowest is the oosvar name. Hence sllv_prepend rather than sllv_append.
if (pnode->type == MD_AST_NODE_TYPE_OOSVAR_LEVEL_KEY) {
@ -263,17 +263,35 @@ static mlr_dsl_cst_statement_t* cst_statement_alloc(mlr_dsl_ast_node_t* past, in
} else if (pnode->type == MD_AST_NODE_TYPE_OOSVAR_NAME) {
sllv_append(pstatement->pitems, mlr_dsl_cst_statement_item_alloc(
pnode->text,
NULL, // xxx needs to be poosvar_lhs_keylist_evaluators if keyed
sllv_alloc(),
NULL,
NULL));
} else if (pnode->type == MD_AST_NODE_TYPE_OOSVAR_LEVEL_KEY) {
sllv_t* poosvar_lhs_keylist_evaluators = sllv_alloc();
mlr_dsl_ast_node_t* pwalker = pnode;
while (TRUE) {
if (pwalker->type == MD_AST_NODE_TYPE_OOSVAR_LEVEL_KEY) {
mlr_dsl_ast_node_t* pkeynode = pwalker->pchildren->phead->pnext->pvvalue;
sllv_prepend(poosvar_lhs_keylist_evaluators,
rval_evaluator_alloc_from_ast(pkeynode, type_inferencing));
} else {
sllv_prepend(poosvar_lhs_keylist_evaluators,
rval_evaluator_alloc_from_string(mlr_strdup_or_die(pwalker->text)));
}
if (pwalker->pchildren == NULL)
break;
pwalker = pwalker->pchildren->phead->pvvalue;
}
sllv_append(pstatement->pitems, mlr_dsl_cst_statement_item_alloc(
pnode->text,
NULL, // xxx needs to be poosvar_lhs_keylist_evaluators if keyed
pwalker->text,
poosvar_lhs_keylist_evaluators,
NULL,
NULL));
} else {
// xxx abend
fprintf(stderr, "%s: internal coding error detected in file %s at line %d.\n",
MLR_GLOBALS.argv0, __FILE__, __LINE__);
exit(1);
}
}

4
c/todo.txt
View file

@ -16,6 +16,7 @@ TOP-OF-LIST SUMMARY
* allow begin/end srec assignments in the grammar, to allow better error messages than 'syntax error' in the caller
! valgrinds
! xxxes
* ack hash algo
* double-check oosvar+emit+tri-split-null by re-implementing as many mappers as possible using ossvars + emit
? @x = $0 ? $0 = @x ?
@ -53,6 +54,9 @@ UNSET
================================================================
PARAMETERIZED EMIT
!! need submaps:
mlr put -v 'emit @a["sums"]'
* evolve & extend the UTs
* handle too-short, too-long, just-right cases
* rename functions