From 8d220a91c9ff1cda020f697abacc786b3ca17dd7 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sat, 19 Nov 2016 20:16:43 -0500 Subject: [PATCH] mapvar-ref iterate --- c/mapping/rval_evaluator.h | 4 ++-- c/mapping/rxval_expr_evaluators.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c/mapping/rval_evaluator.h b/c/mapping/rval_evaluator.h index ef9165099..8d89a7ff0 100644 --- a/c/mapping/rval_evaluator.h +++ b/c/mapping/rval_evaluator.h @@ -78,12 +78,12 @@ typedef struct _rval_evaluator_t { // This is for map-valued contexts: LHS/RHS of assignments, // UDF/subroutine arguments, and UDF return values. -// The is_ephemeral flag is TRUE for map-literals, function return values, and +// The map_is_ephemeral flag is TRUE for map-literals, function return values, and // data copied out of srecs. It is FALSE when the pointer is into an existing // data structure's memory (e.g. oosvars or locals). typedef struct _boxed_xval_t { mlhmmv_value_t xval; - int is_ephemeral; + int map_is_ephemeral; } boxed_xval_t; struct _rxval_evaluator_xxx_deprecated_t; // forward reference for method declarations diff --git a/c/mapping/rxval_expr_evaluators.c b/c/mapping/rxval_expr_evaluators.c index 670279497..d779fd382 100644 --- a/c/mapping/rxval_expr_evaluators.c +++ b/c/mapping/rxval_expr_evaluators.c @@ -456,7 +456,7 @@ static boxed_xval_t rxval_evaluator_wrapping_rval_func(void* pvstate, variables_ mv_t val = prval_evaluator->pprocess_func(prval_evaluator->pvstate, pvars); return (boxed_xval_t) { .xval = mlhmmv_value_transfer_terminal(val), - .is_ephemeral = TRUE, + .map_is_ephemeral = TRUE, }; }