X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_make_const.c;h=0b3e25a6df079787182787abecf0dc120d1b07ae;hb=7f7e2431f5d1f7c1782ed6e774ccfc70fb4c87cf;hp=501052b91b991a0c4533e86f4c39f9cd1d6f3e4e;hpb=794718abc62f4610495fe2bd535a2b67bc46573c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_make_const.c b/src/lisp/ao_lisp_make_const.c
index 501052b9..0b3e25a6 100644
--- a/src/lisp/ao_lisp_make_const.c
+++ b/src/lisp/ao_lisp_make_const.c
@@ -33,6 +33,8 @@ struct builtin_func {
 };
 
 struct builtin_func funcs[] = {
+	"eval",		AO_LISP_FUNC_LAMBDA,	builtin_eval,
+	"read",		AO_LISP_FUNC_LAMBDA,	builtin_read,
 	"lambda",	AO_LISP_FUNC_NLAMBDA,	builtin_lambda,
 	"lexpr",	AO_LISP_FUNC_NLAMBDA,	builtin_lexpr,
 	"nlambda",	AO_LISP_FUNC_NLAMBDA,	builtin_nlambda,
@@ -41,10 +43,13 @@ struct builtin_func funcs[] = {
 	"cdr",		AO_LISP_FUNC_LAMBDA,	builtin_cdr,
 	"cons",		AO_LISP_FUNC_LAMBDA,	builtin_cons,
 	"last",		AO_LISP_FUNC_LAMBDA,	builtin_last,
+	"length",	AO_LISP_FUNC_LAMBDA,	builtin_length,
 	"quote",	AO_LISP_FUNC_NLAMBDA,	builtin_quote,
 	"set",		AO_LISP_FUNC_LAMBDA,	builtin_set,
 	"setq",		AO_LISP_FUNC_MACRO,	builtin_setq,
 	"cond",		AO_LISP_FUNC_NLAMBDA,	builtin_cond,
+	"progn",	AO_LISP_FUNC_NLAMBDA,	builtin_progn,
+	"while",	AO_LISP_FUNC_NLAMBDA,	builtin_while,
 	"print",	AO_LISP_FUNC_LEXPR,	builtin_print,
 	"patom",	AO_LISP_FUNC_LEXPR,	builtin_patom,
 	"+",		AO_LISP_FUNC_LEXPR,	builtin_plus,
@@ -57,20 +62,15 @@ struct builtin_func funcs[] = {
 	">",		AO_LISP_FUNC_LEXPR,	builtin_greater,
 	"<=",		AO_LISP_FUNC_LEXPR,	builtin_less_equal,
 	">=",		AO_LISP_FUNC_LEXPR,	builtin_greater_equal,
+	"pack",		AO_LISP_FUNC_LAMBDA,	builtin_pack,
+	"unpack",	AO_LISP_FUNC_LAMBDA,	builtin_unpack,
+	"flush",	AO_LISP_FUNC_LAMBDA,	builtin_flush,
+	"delay",	AO_LISP_FUNC_LAMBDA,	builtin_delay,
+	"led",		AO_LISP_FUNC_LEXPR,	builtin_led,
 };
 
 #define N_FUNC (sizeof funcs / sizeof funcs[0])
 
-/* Syntactic atoms */
-char *atoms[] = {
-	"lambda",
-	"nlambda",
-	"lexpr",
-	"macro"
-};
-
-#define N_ATOM (sizeof atoms / sizeof atoms[0])
-
 struct ao_lisp_frame	*globals;
 
 static int
@@ -102,10 +102,6 @@ main(int argc, char **argv)
 				 ao_lisp_builtin_poly(b));
 	}
 
-	/* atoms for syntax */
-	for (i = 0; i < N_ATOM; i++)
-		(void) ao_lisp_atom_intern(atoms[i]);
-
 	/* boolean constants */
 	ao_lisp_atom_set(ao_lisp_atom_poly(ao_lisp_atom_intern("nil")),
 			 AO_LISP_NIL);
@@ -113,20 +109,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();