diff options
Diffstat (limited to 'cppawk-include')
| -rw-r--r-- | cppawk-include/fun.h | 8 | ||||
| -rw-r--r-- | cppawk-include/iter.h | 16 | ||||
| -rw-r--r-- | cppawk-include/varg-priv.h | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/cppawk-include/fun.h b/cppawk-include/fun.h index e14adf5..77ebf38 100644 --- a/cppawk-include/fun.h +++ b/cppawk-include/fun.h @@ -37,7 +37,7 @@ #endif #ifndef __CPPAWK_CONS_H -#include "cons.h" +#include "cons-priv.h" #endif #if !__have_indirect_functions @@ -46,9 +46,9 @@ #define bind(fname, env) cons(#fname, env) #define fun(fname) #fname -#define call(fobj, ...) (consp(fobj) \ - ? progn(__g(f) = car(fobj), \ - @__g(f)(cdr(fobj), __VA_ARGS__)) \ +#define call(fobj, ...) (__consp(fobj) \ + ? progn(__g(f) = __car(fobj), \ + @__g(f)(__cdr(fobj), __VA_ARGS__)) \ : @fobj(__VA_ARGS__)) #endif diff --git a/cppawk-include/iter.h b/cppawk-include/iter.h index 99795f3..8ea75a2 100644 --- a/cppawk-include/iter.h +++ b/cppawk-include/iter.h @@ -54,15 +54,15 @@ __loop_prep(__VA_ARGS__); \ __loop_step(__VA_ARGS__)) -#define __loop_init(...) prog(__varexpand(__init_first, __init_next, \ +#define __loop_init(...) __prog(__varexpand(__init_first, __init_next, \ __VA_ARGS__)) #define __loop_test(...) __nd(__varexpand(__test_first, __test_next, \ __VA_ARGS__)) -#define __loop_prep(...) prog(__varexpand(__prep_first, __prep_next, \ +#define __loop_prep(...) __prog(__varexpand(__prep_first, __prep_next, \ __VA_ARGS__)) -#define __loop_fini(...) prog(__varexpand(__fini_first, __fini_next, \ +#define __loop_fini(...) __prog(__varexpand(__fini_first, __fini_next, \ __VA_ARGS__)) && 0 -#define __loop_step(...) prog(__varexpand(__step_first, __step_next, \ +#define __loop_step(...) __prog(__varexpand(__step_first, __step_next, \ __VA_ARGS__)) #define __nd(...) __varexpand(__nd_first, __nd_next, __VA_ARGS__) @@ -149,12 +149,12 @@ #define __step_fields(var) __g(var)++ #define __init_keys(key, array) __g(key) = __keys(array) -#define __test_keys(key, array) !endp(__g(key)) +#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 __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)) @@ -249,7 +249,7 @@ function __loop_argmin(a, arga, b, argb) #define __fini_until(expr) 1 #define __step_until(expr) 1 -#define __init_lockstep(...) prog(__varexpand3(__init_first, __init_next, \ +#define __init_lockstep(...) __prog(__varexpand3(__init_first, __init_next, \ __VA_ARGS__)) #define __test_lockstep(...) __nd(__varexpand3(__test_first, __test_next, \ __VA_ARGS__)) @@ -257,7 +257,7 @@ function __loop_argmin(a, arga, b, argb) __VA_ARGS__)) || 1) #define __fini_lockstep(...) (__nd(__varexpand3(__fini_first, __fini_next, \ __VA_ARGS__)) && 0) -#define __step_lockstep(...) prog(__varexpand3(__step_first, __step_next, \ +#define __step_lockstep(...) __prog(__varexpand3(__step_first, __step_next, \ __VA_ARGS__)) #define __init_if(test, clause) __init_ ## clause diff --git a/cppawk-include/varg-priv.h b/cppawk-include/varg-priv.h index fc4e432..9a92b61 100644 --- a/cppawk-include/varg-priv.h +++ b/cppawk-include/varg-priv.h @@ -362,8 +362,8 @@ __cfall; \ } -#ifndef __CPPAWK_CONS_H -#include "cons.h" +#ifndef __CPPAWK_CONS_PRIV_H +#include "cons-priv.h" #endif function __argcount(__name, __rest, |