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

neaten

Browse source
This commit is contained in:
John Kerl 2016-03-28 16:16:43 -04:00
parent da8b5df620
commit b5a9dd3bba
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
c/mapping/mlr_dsl_cst.c
View file

@ -1005,17 +1005,19 @@ static void mlr_dsl_cst_node_evaluate_emitn(
sllv_t* poutrecs)
{
mlr_dsl_cst_statement_item_t* pitem = pnode->pitems->phead->pvvalue;
int all_non_null_or_error = TRUE;
// xxx need two all-non-null, or nested
int keys_all_non_null_or_error = TRUE;
sllmv_t* pmvkeys = evaluate_list(pitem->poosvar_lhs_keylist_evaluators,
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &all_non_null_or_error);
sllmv_t* pmvnames = evaluate_list(pitem->poosvar_lhs_namelist_evaluators,
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &all_non_null_or_error);
if (all_non_null_or_error) {
mlhmmv_to_lrecs(poosvars, pmvkeys, pmvnames, poutrecs, FALSE);
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &keys_all_non_null_or_error);
if (keys_all_non_null_or_error) {
int names_all_non_null_or_error = TRUE;
sllmv_t* pmvnames = evaluate_list(pitem->poosvar_lhs_namelist_evaluators,
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &names_all_non_null_or_error);
if (names_all_non_null_or_error) {
mlhmmv_to_lrecs(poosvars, pmvkeys, pmvnames, poutrecs, FALSE);
}
sllmv_free(pmvnames);
}
sllmv_free(pmvkeys);
sllmv_free(pmvnames);
}
// ----------------------------------------------------------------
@ -1051,17 +1053,19 @@ static void mlr_dsl_cst_node_evaluate_emit(
sllv_t* poutrecs)
{
mlr_dsl_cst_statement_item_t* pitem = pnode->pitems->phead->pvvalue;
int all_non_null_or_error = TRUE;
// xxx need two all-non-null, or nested
int keys_all_non_null_or_error = TRUE;
sllmv_t* pmvkeys = evaluate_list(pitem->poosvar_lhs_keylist_evaluators,
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &all_non_null_or_error);
sllmv_t* pmvnames = evaluate_list(pitem->poosvar_lhs_namelist_evaluators,
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &all_non_null_or_error);
if (all_non_null_or_error) {
mlhmmv_to_lrecs(poosvars, pmvkeys, pmvnames, poutrecs, TRUE);
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &keys_all_non_null_or_error);
if (keys_all_non_null_or_error) {
int names_all_non_null_or_error = TRUE;
sllmv_t* pmvnames = evaluate_list(pitem->poosvar_lhs_namelist_evaluators,
pinrec, ptyped_overlay, poosvars, ppregex_captures, pctx, &names_all_non_null_or_error);
if (names_all_non_null_or_error) {
mlhmmv_to_lrecs(poosvars, pmvkeys, pmvnames, poutrecs, TRUE);
}
sllmv_free(pmvnames);
}
sllmv_free(pmvkeys);
sllmv_free(pmvnames);
}
// ----------------------------------------------------------------

4
doc/mlr.1
View file

@ -2,12 +2,12 @@
.\" Title: mlr
.\" Author: [see the "AUTHOR" section]
.\" Generator: ./mkman.rb
.\" Date: 2016-03-24
.\" Date: 2016-03-28
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
.TH "MILLER" "1" "2016-03-24" "\ \&" "\ \&"
.TH "MILLER" "1" "2016-03-28" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Portability definitions
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~