X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_make_const.c;fp=src%2Flisp%2Fao_lisp_make_const.c;h=6e4b411ee351c9882d1b02b9dbf10ad01ad46757;hb=9dbc686ad7d3289dc0f9bcf4a973f71100e02ded;hp=f3ea6be065151f723f7ef1bf6aa090033e5eb0b1;hpb=a1d013ab8cc508d4e17ae8876bc5465d1a2dfc1e;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_make_const.c b/src/lisp/ao_lisp_make_const.c
index f3ea6be0..6e4b411e 100644
--- a/src/lisp/ao_lisp_make_const.c
+++ b/src/lisp/ao_lisp_make_const.c
@@ -191,6 +191,7 @@ ao_has_macro(ao_poly p)
 	struct ao_lisp_cons	*cons;
 	struct ao_lisp_lambda	*lambda;
 	ao_poly			m;
+	ao_poly			list;
 
 	if (p == AO_LISP_NIL)
 		return AO_LISP_NIL;
@@ -206,15 +207,16 @@ ao_has_macro(ao_poly p)
 		if ((p = ao_is_macro(cons->car)))
 			break;
 
-		cons = ao_lisp_poly_cons(cons->cdr);
+		list = cons->cdr;
 		p = AO_LISP_NIL;
-		while (cons) {
+		while (list != AO_LISP_NIL && ao_lisp_poly_type(list) == AO_LISP_CONS) {
+			cons = ao_lisp_poly_cons(list);
 			m = ao_has_macro(cons->car);
 			if (m) {
 				p = m;
 				break;
 			}
-			cons = ao_lisp_poly_cons(cons->cdr);
+			list = cons->cdr;
 		}
 		break;