X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_error.c;h=2b15c4184c99f4ef24565366fcc2cde93166e90b;hb=2ce7ab37df07b3c1ea1ca9befc06477e3b6cdeac;hp=cedc107cd8d12e9b172cac677345d813ccef7289;hpb=794718abc62f4610495fe2bd535a2b67bc46573c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_error.c b/src/lisp/ao_lisp_error.c
index cedc107c..2b15c418 100644
--- a/src/lisp/ao_lisp_error.c
+++ b/src/lisp/ao_lisp_error.c
@@ -49,7 +49,7 @@ ao_lisp_error_frame(int indent, char *name, struct ao_lisp_frame *frame)
 	tabs(indent);
 	printf ("%s{", name);
 	if (frame) {
-		for (f = 0; f < frame->num; f++) {
+		for (f = 0; f < ao_lisp_frame_num(frame); f++) {
 			if (f != 0) {
 				tabs(indent);
 				printf("         ");
@@ -59,8 +59,8 @@ ao_lisp_error_frame(int indent, char *name, struct ao_lisp_frame *frame)
 			ao_lisp_poly_print(frame->vals[f].val);
 			printf("\n");
 		}
-		if (frame->next)
-			ao_lisp_error_frame(indent + 1, "next:   ", ao_lisp_poly_frame(frame->next));
+		if (frame->prev)
+			ao_lisp_error_frame(indent + 1, "prev:   ", ao_lisp_poly_frame(frame->prev));
 	}
 	tabs(indent);
 	printf("        }\n");
@@ -73,6 +73,7 @@ static const char *state_names[] = {
 	"exec",
 	"cond",
 	"cond_test",
+	"progn",
 };
 
 void
@@ -80,17 +81,16 @@ ao_lisp_stack_print(void)
 {
 	struct ao_lisp_stack *s;
 	printf("Value:  "); ao_lisp_poly_print(ao_lisp_v); printf("\n");
-	ao_lisp_error_frame(0, "Frame:  ", ao_lisp_frame_current);
 	printf("Stack:\n");
 	for (s = ao_lisp_stack; s; s = ao_lisp_poly_stack(s->prev)) {
 		printf("\t[\n");
 		printf("\t\texpr:   "); ao_lisp_poly_print(s->list); printf("\n");
 		printf("\t\tstate:  %s\n", state_names[s->state]);
-		printf("\t\tmacro:  %s\n", s->macro ? "true" : "false");
+//		printf("\t\tmacro:  %s\n", s->macro ? "true" : "false");
 		ao_lisp_error_cons ("sexprs: ", ao_lisp_poly_cons(s->sexprs));
 		ao_lisp_error_cons ("values: ", ao_lisp_poly_cons(s->values));
 		ao_lisp_error_frame(2, "frame:  ", ao_lisp_poly_frame(s->frame));
-		ao_lisp_error_frame(2, "mframe: ", ao_lisp_poly_frame(s->macro_frame));
+//		ao_lisp_error_frame(2, "mframe: ", ao_lisp_poly_frame(s->macro_frame));
 		printf("\t]\n");
 	}
 }