altos/scheme: Fix macro-detection debugging

[fw/altos] / src / scheme / ao_scheme_eval.c

diff --git a/src/scheme/ao_scheme_eval.c b/src/scheme/ao_scheme_eval.c
index 9204ce1a9a379743c26827e0fc3a215da2bca4b9..91f6a84f9104869597e20448c2bbe285fbce6e31 100644 (file)
--- a/src/scheme/ao_scheme_eval.c
+++ b/src/scheme/ao_scheme_eval.c
@@ -206,7 +206,7 @@ ao_scheme_eval_formal(void)
        }
 
        /* Append formal to list of values */
-       formal = ao_scheme__cons(ao_scheme_v, AO_SCHEME_NIL);
+       formal = ao_scheme_cons(ao_scheme_v, AO_SCHEME_NIL);
        if (!formal)
                return 0;
 
@@ -348,7 +348,7 @@ ao_scheme_eval_cond(void)
                ao_scheme_stack->state = eval_val;
        } else {
                ao_scheme_v = ao_scheme_poly_cons(ao_scheme_stack->sexprs)->car;
-               if (!ao_scheme_v || !AO_SCHEME_IS_CONS(ao_scheme_v)) {
+               if (!ao_scheme_is_pair(ao_scheme_v)) {
                        ao_scheme_error(AO_SCHEME_INVALID, "invalid cond clause");
                        return 0;
                }
@@ -492,7 +492,7 @@ ao_scheme_eval_macro(void)
 
        if (ao_scheme_v == AO_SCHEME_NIL)
                ao_scheme_abort();
-       if (AO_SCHEME_IS_CONS(ao_scheme_v)) {
+       if (ao_scheme_is_cons(ao_scheme_v)) {
                *ao_scheme_poly_cons(ao_scheme_stack->sexprs) = *ao_scheme_poly_cons(ao_scheme_v);
                ao_scheme_v = ao_scheme_stack->sexprs;
                DBGI("sexprs rewritten to: "); DBG_POLY(ao_scheme_v); DBG("\n");