X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_eval.c;h=edc16a7361e86f8527ff9f15e86af20bc1f618cc;hb=fa6f4b331db9d37da6767005fd375b696485b46b;hp=9b3cf63e3d4cbe8a3104e70b3524a0f12b94ea72;hpb=2f8fce1cf6ce4bd12a836cc8ee15f4edbc95c95e;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_eval.c b/src/scheme/ao_scheme_eval.c
index 9b3cf63e..edc16a73 100644
--- a/src/scheme/ao_scheme_eval.c
+++ b/src/scheme/ao_scheme_eval.c
@@ -17,7 +17,6 @@
 
 struct ao_scheme_stack		*ao_scheme_stack;
 ao_poly				ao_scheme_v;
-uint8_t				ao_scheme_skip_cons_free;
 
 ao_poly
 ao_scheme_set_cond(struct ao_scheme_cons *c)
@@ -108,13 +107,7 @@ ao_scheme_eval_sexpr(void)
 		DBGI("..frame "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");
 		ao_scheme_v = ao_scheme_atom_get(ao_scheme_v);
 		/* fall through */
-	case AO_SCHEME_BOOL:
-	case AO_SCHEME_INT:
-	case AO_SCHEME_BIGINT:
-	case AO_SCHEME_FLOAT:
-	case AO_SCHEME_STRING:
-	case AO_SCHEME_BUILTIN:
-	case AO_SCHEME_LAMBDA:
+	default:
 		ao_scheme_stack->state = eval_val;
 		break;
 	}
@@ -213,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;
 
@@ -271,7 +264,7 @@ ao_scheme_eval_exec(void)
 				DBGI("set "); DBG_POLY(atom); DBG(" = "); DBG_POLY(val); DBG("\n");
 			});
 		builtin = ao_scheme_poly_builtin(ao_scheme_v);
-		if (builtin && (builtin->args & AO_SCHEME_FUNC_FREE_ARGS) && !ao_scheme_stack_marked(ao_scheme_stack) && !ao_scheme_skip_cons_free) {
+		if (builtin && (builtin->args & AO_SCHEME_FUNC_FREE_ARGS) && !ao_scheme_stack_marked(ao_scheme_stack)) {
 			struct ao_scheme_cons *cons = ao_scheme_poly_cons(ao_scheme_stack->values);
 			ao_scheme_stack->values = AO_SCHEME_NIL;
 			ao_scheme_cons_free(cons);
@@ -300,7 +293,6 @@ ao_scheme_eval_exec(void)
 		DBGI(".. frame "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");
 		break;
 	}
-	ao_scheme_skip_cons_free = 0;
 	return 1;
 }
 
@@ -331,7 +323,7 @@ ao_scheme_eval_apply(void)
 	ao_scheme_v = ao_scheme_poly_cons(ao_scheme_stack->values)->car;
 	DBGI("apply: "); DBG_POLY(ao_scheme_stack->values); DBG ("\n");
 	ao_scheme_stack->state = eval_exec;
-	ao_scheme_skip_cons_free = 1;
+	ao_scheme_stack_mark(ao_scheme_stack);
 	return 1;
 }
 
@@ -356,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_poly_type(ao_scheme_v) != AO_SCHEME_CONS) {
+		if (!ao_scheme_v || !AO_SCHEME_IS_CONS(ao_scheme_v)) {
 			ao_scheme_error(AO_SCHEME_INVALID, "invalid cond clause");
 			return 0;
 		}
@@ -500,7 +492,7 @@ ao_scheme_eval_macro(void)
 
 	if (ao_scheme_v == AO_SCHEME_NIL)
 		ao_scheme_abort();
-	if (ao_scheme_poly_type(ao_scheme_v) == AO_SCHEME_CONS) {
+	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");