diff options
Diffstat (limited to 'cppawk-include/iter.h')
| -rw-r--r-- | cppawk-include/iter.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/cppawk-include/iter.h b/cppawk-include/iter.h index 72f8acb..1cc3c7b 100644 --- a/cppawk-include/iter.h +++ b/cppawk-include/iter.h @@ -62,7 +62,7 @@ #define __loop_init(...) prog(__varexpand(__init_first, __init_next, \ __VA_ARGS__)) -#define __loop_test(...) __and(__varexpand(__test_first, __test_next, \ +#define __loop_test(...) __nd(__varexpand(__test_first, __test_next, \ __VA_ARGS__)) #define __loop_prep(...) prog(__varexpand(__prep_first, __prep_next, \ __VA_ARGS__)) @@ -71,7 +71,7 @@ #define __loop_step(...) prog(__varexpand(__step_first, __step_next, \ __VA_ARGS__)) -#define __and(...) __varexpand(__nd_first, __nd_next, __VA_ARGS__) +#define __nd(...) __varexpand(__nd_first, __nd_next, __VA_ARGS__) #define __nd_first(x) (x) #define __nd_next(p, x) p && (x) @@ -137,11 +137,11 @@ #define for_var(var, expr) first_then(var, expr, expr) -#define __init_list(iter, var, list) iter = (list) -#define __test_list(iter, var, list) !endp(iter) -#define __prep_list(iter, var, list) var = car(iter) -#define __fini_list(iter, var, list) 0 -#define __step_list(iter, var, list) iter = cdr(iter) +#define __init___list(iter, var, list) iter = (list) +#define __test___list(iter, var, list) !endp(iter) +#define __prep___list(iter, var, list) var = car(iter) +#define __fini___list(iter, var, list) 0 +#define __step___list(iter, var, list) iter = cdr(iter) #define __init_fields(var) __g(var) = 1 #define __test_fields(var) __g(var) <= NF @@ -149,11 +149,11 @@ #define __fini_fields(var) 1 #define __step_fields(var) __g(var)++ -#define __init_keys(key, array) __g(key) = keys(array) -#define __test_keys(key, array) !endp(__g(key)) -#define __prep_keys(key, array) key = car(__g(key)) -#define __fini_keys(key, array) 1 -#define __step_keys(key, array) __g(key) = cdr(__g(key)) +#define __init___keys(key, array) __g(key) = keys(array) +#define __test___keys(key, array) !endp(__g(key)) +#define __prep___keys(key, array) key = car(__g(key)) +#define __fini___keys(key, array) 1 +#define __step___keys(key, array) __g(key) = cdr(__g(key)) #define __init_collect(var, expr) var = list_begin() #define __test_collect(var, expr) 1 @@ -247,11 +247,11 @@ function __loop_argmin(a, arga, b, argb) #define __init_lockstep(...) prog(__varexpand3(__init_first, __init_next, \ __VA_ARGS__)) -#define __test_lockstep(...) __and(__varexpand3(__test_first, __test_next, \ +#define __test_lockstep(...) __nd(__varexpand3(__test_first, __test_next, \ __VA_ARGS__)) -#define __prep_lockstep(...) (__and(__varexpand3(__prep_first, __prep_next, \ +#define __prep_lockstep(...) (__nd(__varexpand3(__prep_first, __prep_next, \ __VA_ARGS__)) || 1) -#define __fini_lockstep(...) (__and(__varexpand3(__fini_first, __fini_next, \ +#define __fini_lockstep(...) (__nd(__varexpand3(__fini_first, __fini_next, \ __VA_ARGS__)) && 0) #define __step_lockstep(...) prog(__varexpand3(__step_first, __step_next, \ __VA_ARGS__)) |