aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cppawk-include/cons-priv.h8
-rw-r--r--cppawk-include/iter-priv.h45
-rw-r--r--cppawk-include/iter.h68
3 files changed, 85 insertions, 36 deletions
diff --git a/cppawk-include/cons-priv.h b/cppawk-include/cons-priv.h
index f6acf8c..7669650 100644
--- a/cppawk-include/cons-priv.h
+++ b/cppawk-include/cons-priv.h
@@ -32,8 +32,8 @@
#include "base.h"
#endif
-#ifndef __CPPAWK_ITER_H
-#include "iter.h"
+#ifndef __CPPAWK_ITER_PRIV_H
+#include "iter-priv.h"
#endif
#ifndef __CPPAWK_CASE_PRIV_H
@@ -300,7 +300,7 @@ function __atol(__arr,
{
__tmp = __list_begin()
- doarray (__key, __value, __arr)
+ __doarray (__key, __value, __arr)
__tmp = __list_add(__tmp,__value)
return __list_end(__tmp)
@@ -310,7 +310,7 @@ function __ftol( __tmp, __i, __val)
{
__tmp = __list_begin()
- dofields (__i, __val)
+ __dofields (__i, __val)
__tmp = __list_add(__tmp, __val)
return __list_end(__tmp)
diff --git a/cppawk-include/iter-priv.h b/cppawk-include/iter-priv.h
new file mode 100644
index 0000000..5717da5
--- /dev/null
+++ b/cppawk-include/iter-priv.h
@@ -0,0 +1,45 @@
+// cppawk: C preprocessor wrapper around awk
+// Kaz Kylheku <kaz@kylheku.com>
+//
+// BSD-2 License
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef __CPPAWK_ITER_PRIV_H
+#define __CPPAWK_ITER_PRIV_H
+
+#define __doarray(key, value, arr) \
+ for (key in arr) \
+ if ((value = arr[key]) || 1)
+
+#define __dostring(index, chr, str) \
+ __g(s) = str; \
+ __g(l) = length(__g(s)); \
+ for (index = 1; index <= __g(l); i++) \
+ if ((chr = substr(__g(s), index, 1)) || 1)
+
+#define __dofields(index, val) \
+ for (index = 1; index <= NF; index++) \
+ if ((val = $ index) || 1)
+
+#endif
diff --git a/cppawk-include/iter.h b/cppawk-include/iter.h
index 1cc3c7b..99795f3 100644
--- a/cppawk-include/iter.h
+++ b/cppawk-include/iter.h
@@ -28,6 +28,10 @@
#ifndef __CPPAWK_ITER_H
#define __CPPAWK_ITER_H
+#ifndef __CPPAWK_ITER_PRIV_H
+#include "iter-priv.h"
+#endif
+
#ifndef __CPPAWK_BASE_H
#include "base.h"
#endif
@@ -36,24 +40,14 @@
#include "narg-priv.h"
#endif
-#define doarray(key, value, arr) \
- for (key in arr) \
- if ((value = arr[key]) || 1)
-
-#define dostring(index, chr, str) \
- __g(s) = str; \
- __g(l) = length(__g(s)); \
- for (index = 1; index <= __g(l); i++) \
- if ((chr = substr(__g(s), index, 1)) || 1)
-
-#define dofields(index, val) \
- for (index = 1; index <= NF; index++) \
- if ((val = $ index) || 1)
-
-#ifndef __CPPAWK_CONS_H
-#include "cons.h"
+#ifndef __CPPAWK_CONS_PRIV_H
+#include "cons-priv.h"
#endif
+#define doarray(key, value, arr) __doarray(key, value, arr)
+#define dostring(index, chr, str) __dostring(index, chr, str)
+#define dofields(index, val) __dofields(index, val)
+
#define loop(...) for (__loop_init(__VA_ARGS__); \
(__loop_test(__VA_ARGS__) || \
__loop_fini(__VA_ARGS__)) && \
@@ -137,11 +131,16 @@
#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 __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 __step___list(iter, var, list) iter = __cdr(iter)
#define __init_fields(var) __g(var) = 1
#define __test_fields(var) __g(var) <= NF
@@ -149,22 +148,27 @@
#define __fini_fields(var) 1
#define __step_fields(var) __g(var)++
-#define __init___keys(key, array) __g(key) = keys(array)
+#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 __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 __step___keys(key, array) __g(key) = __cdr(__g(key))
-#define __init_collect(var, expr) var = list_begin()
+#define __init_collect(var, expr) var = __list_begin()
#define __test_collect(var, expr) 1
-#define __prep_collect(var, expr) var = list_add(var, expr)
-#define __fini_collect(var, expr) var = list_end(var)
+#define __prep_collect(var, expr) var = __list_add(var, expr)
+#define __fini_collect(var, expr) var = __list_end(var)
#define __step_collect(var, expr) 1
-#define __init_collect_plus(var, expr) var = list_begin()
+#define __init_collect_plus(var, expr) var = __list_begin()
#define __test_collect_plus(var, expr) 1
-#define __prep_collect_plus(var, expr) var = list_add(var, expr)
-#define __fini_collect_plus(var, expr) var = list_end(list_add(var, expr))
+#define __prep_collect_plus(var, expr) var = __list_add(var, expr)
+#define __fini_collect_plus(var, expr) var = __list_end(__list_add(var, expr))
#define __step_collect_plus(var, expr) 1
#define __init_summing(var, expr) var = 0
@@ -180,7 +184,7 @@ function __loop_max(a, b)
#define __init_maximizing(var, expr) var = nil
#define __test_maximizing(var, expr) 1
-#define __prep_maximizing(var, expr) var = (null(var) \
+#define __prep_maximizing(var, expr) var = (__null(var) \
? expr \
: __loop_max(var, expr))
#define __fini_maximizing(var, expr) 1
@@ -193,7 +197,7 @@ function __loop_min(a, b)
#define __init_minimizing(var, expr) var = nil
#define __test_minimizing(var, expr) 1
-#define __prep_minimizing(var, expr) var = (null(var) \
+#define __prep_minimizing(var, expr) var = (__null(var) \
? expr \
: __loop_min(var, expr))
#define __fini_minimizing(var, expr) 1
@@ -208,7 +212,7 @@ function __loop_argmax(a, arga, b, argb)
#define __test_argmax(amx, arg, expr) 1
#define __prep_argmax(amx, arg, expr) ((__g(om) = __g(mx)) || 1) && \
((__g(mx) = \
- (null(__g(mx)) \
+ (__null(__g(mx)) \
? expr \
: __loop_max(__g(mx), \
expr))) || 1) && \
@@ -225,7 +229,7 @@ function __loop_argmin(a, arga, b, argb)
#define __test_argmin(ami, arg, expr) 1
#define __prep_argmin(ami, arg, expr) ((__g(om) = __g(mi)) || 1) && \
((__g(mi) = \
- (null(__g(mi)) \
+ (__null(__g(mi)) \
? expr \
: __loop_min(__g(mi), \
expr))) || 1) && \
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 05:00:30 +0000