altos/lisp: use regular read-eval-print loop for make const

No need to open code this sequence of operations.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/lisp/Makefile b/src/lisp/Makefile
index 9c99f05cdfab15493ddf1fa399ef147e750d5f22..aa54202172d0df977c7b13e28d2af8172bb6fd24 100644 (file)
--- a/src/lisp/Makefile
+++ b/src/lisp/Makefile
@@ -19,6 +19,7 @@ SRCS=\
        ao_lisp_frame.c \
        ao_lisp_lambda.c \
        ao_lisp_eval.c \
+       ao_lisp_rep.c \
        ao_lisp_error.c 
 
 OBJS=$(SRCS:.c=.o)

diff --git a/src/lisp/ao_lisp_make_const.c b/src/lisp/ao_lisp_make_const.c
index bb4afbfb322363c7a13140abab952378128819da..4fc43e583b6ca50f16d3f48cf264d2a23af9d650 100644 (file)
--- a/src/lisp/ao_lisp_make_const.c
+++ b/src/lisp/ao_lisp_make_const.c
@@ -105,20 +105,12 @@ main(int argc, char **argv)
        ao_lisp_atom_set(ao_lisp_atom_poly(a),
                         ao_lisp_atom_poly(a));
 
-       for (;;) {
-               sexpr = ao_lisp_read();
-               if (!sexpr)
-                       break;
-               printf ("sexpr: ");
-               ao_lisp_poly_print(sexpr);
-               printf("\n");
-               val = ao_lisp_eval(sexpr);
-               if (ao_lisp_exception)
-                       exit(1);
-               printf("\t");
-               ao_lisp_poly_print(val);
-               printf("\n");
-       }
+       /* end of file value */
+       a = ao_lisp_atom_intern("eof");
+       ao_lisp_atom_set(ao_lisp_atom_poly(a),
+                        ao_lisp_atom_poly(a));
+
+       ao_lisp_read_eval_print();
 
        /* Reduce to referenced values */
        ao_lisp_collect();