X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp.h;h=60a97f2c9d98ca96a83fd3b62e7dc7cc16fa237c;hb=7da6bfc195fad97e3afc576c609897c131fd4d8c;hp=de55b3076888fed40047df96735033510ed4c6fa;hpb=417161dbb36323b5a6572859dedad02ca92fc65c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index de55b307..60a97f2c 100644
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -40,6 +40,9 @@ extern uint8_t ao_lisp_const[AO_LISP_POOL_CONST];
 #define _ao_lisp_atom_lambda	_atom("lambda")
 #define _ao_lisp_atom_led	_atom("led")
 #define _ao_lisp_atom_delay	_atom("delay")
+#define _ao_lisp_atom_eval	_atom("eval")
+#define _ao_lisp_atom_read	_atom("read")
+#define _ao_lisp_atom_eof	_atom("eof")
 #else
 #include "ao_lisp_const.h"
 #ifndef AO_LISP_POOL
@@ -74,6 +77,7 @@ extern uint16_t		ao_lisp_top;
 #define AO_LISP_DIVIDE_BY_ZERO	0x02
 #define AO_LISP_INVALID		0x04
 #define AO_LISP_UNDEFINED	0x08
+#define AO_LISP_EOF		0x10
 
 extern uint8_t		ao_lisp_exception;
 
@@ -158,7 +162,10 @@ enum eval_state {
 	eval_formal,
 	eval_exec,
 	eval_cond,
-	eval_cond_test
+	eval_cond_test,
+	eval_progn,
+	eval_while,
+	eval_while_test,
 };
 
 struct ao_lisp_stack {
@@ -198,6 +205,8 @@ struct ao_lisp_builtin {
 };
 
 enum ao_lisp_builtin_id {
+	builtin_eval,
+	builtin_read,
 	builtin_lambda,
 	builtin_lexpr,
 	builtin_nlambda,
@@ -210,6 +219,8 @@ enum ao_lisp_builtin_id {
 	builtin_set,
 	builtin_setq,
 	builtin_cond,
+	builtin_progn,
+	builtin_while,
 	builtin_print,
 	builtin_patom,
 	builtin_plus,
@@ -499,8 +510,8 @@ ao_lisp_frame_ref(struct ao_lisp_frame *frame, ao_poly atom);
 struct ao_lisp_frame *
 ao_lisp_frame_new(int num);
 
-struct ao_lisp_frame *
-ao_lisp_frame_add(struct ao_lisp_frame *frame, ao_poly atom, ao_poly val);
+int
+ao_lisp_frame_add(struct ao_lisp_frame **frame, ao_poly atom, ao_poly val);
 
 void
 ao_lisp_frame_print(ao_poly p);
@@ -527,8 +538,7 @@ ao_poly
 ao_lisp_macro(struct ao_lisp_cons *cons);
 
 ao_poly
-ao_lisp_lambda_eval(struct ao_lisp_lambda *lambda,
-		    struct ao_lisp_cons *cons);
+ao_lisp_lambda_eval(void);
 
 /* error */