diff options
| -rw-r--r-- | cppawk-include/iter.h | 14 | ||||
| -rw-r--r-- | testcases-iter | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/cppawk-include/iter.h b/cppawk-include/iter.h index 627a43a..23f71fd 100644 --- a/cppawk-include/iter.h +++ b/cppawk-include/iter.h @@ -77,7 +77,7 @@ #define __nd_first(x) (x) #define __nd_next(p, x) p && (x) -#define loop_cross(...) __varexpand2(__cross_first, __cross_next, __VA_ARGS__) +#define loop_nest(...) __varexpand2(__cross_first, __cross_next, __VA_ARGS__) #define __cross_first(args) for (__init_ ## args; \ ((__test_ ## args) || \ @@ -293,16 +293,16 @@ function __loop_argmin(a, arga, b, argb) #define __fini_until(expr) 1 #define __step_until(expr) 1 -#define __temp_lockstep(...) -#define __init_lockstep(...) __prog(__varexpand3(__init_first, __init_next, \ +#define __temp_parallel(...) +#define __init_parallel(...) __prog(__varexpand3(__init_first, __init_next, \ __VA_ARGS__)) -#define __test_lockstep(...) __nd(__varexpand3(__test_first, __test_next, \ +#define __test_parallel(...) __nd(__varexpand3(__test_first, __test_next, \ __VA_ARGS__)) -#define __prep_lockstep(...) (__nd(__varexpand3(__prep_first, __prep_next, \ +#define __prep_parallel(...) (__nd(__varexpand3(__prep_first, __prep_next, \ __VA_ARGS__)) || 1) -#define __fini_lockstep(...) (__nd(__varexpand3(__fini_first, __fini_next, \ +#define __fini_parallel(...) (__nd(__varexpand3(__fini_first, __fini_next, \ __VA_ARGS__)) && 0) -#define __step_lockstep(...) __prog(__varexpand3(__step_first, __step_next, \ +#define __step_parallel(...) __prog(__varexpand3(__step_first, __step_next, \ __VA_ARGS__)) #define __temp_if(test, clause) diff --git a/testcases-iter b/testcases-iter index 9f85466..6455fa6 100644 --- a/testcases-iter +++ b/testcases-iter @@ -103,9 +103,9 @@ BEGIN { split("X Y", arr) # init array - loop_cross (fields(f), - keys(k, arr), - range(i, 1, 3)) + loop_nest (fields(f), + keys(k, arr), + range(i, 1, 3)) { print f, arr[k], i } @@ -192,11 +192,11 @@ BEGIN { split("X Y", arr) # init array bags (b1, b2) { - loop_cross (lockstep(fields(f), - str(i, ch, "IJK")), - keys(ky, arr), - lockstep(range(j, 1, 3), - from(k, 100))) + loop_nest (parallel(fields(f), + str(i, ch, "IJK")), + keys(ky, arr), + parallel(range(j, 1, 3), + from(k, 100))) { print f, ch, arr[ky], j, k bag(b1, j) |