X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp.h;h=44838a3419b814c81450efe3aae78520a9f12bcf;hb=0fd008d75ca451ba68ad8ae773ea8a5ebc1785c5;hp=de55b3076888fed40047df96735033510ed4c6fa;hpb=a3535e28a74055c3b303dbb4111cb3d38c2817e2;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index de55b307..44838a34 100644
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -20,6 +20,26 @@
 //#include <stdio.h>
 #include <ao_lisp_os.h>
 
+typedef uint16_t	ao_poly;
+typedef int16_t		ao_signed_poly;
+
+#ifdef AO_LISP_SAVE
+
+struct ao_lisp_os_save {
+	ao_poly	ao_lisp_atoms;
+	ao_poly	ao_lisp_globals;
+};
+
+#define AO_LISP_POOL	(AO_LISP_POOL_TOTAL - sizeof (struct ao_lisp_os_save))
+
+int
+ao_lisp_os_save(void);
+
+int
+ao_lisp_os_restore(void);
+
+#endif
+
 #ifdef AO_LISP_MAKE_CONST
 #define AO_LISP_POOL_CONST	16384
 extern uint8_t ao_lisp_const[AO_LISP_POOL_CONST];
@@ -36,10 +56,17 @@ extern uint8_t ao_lisp_const[AO_LISP_POOL_CONST];
 #define _ao_lisp_atom_cdr	_atom("cdr")
 #define _ao_lisp_atom_cons	_atom("cons")
 #define _ao_lisp_atom_last	_atom("last")
+#define _ao_lisp_atom_length	_atom("length")
 #define _ao_lisp_atom_cond	_atom("cond")
 #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_pack	_atom("pack")
+#define _ao_lisp_atom_unpack	_atom("unpack")
+#define _ao_lisp_atom_flush	_atom("flush")
+#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,12 +101,10 @@ 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;
 
-typedef uint16_t	ao_poly;
-typedef int16_t		ao_signed_poly;
-
 static inline int
 ao_lisp_is_const(ao_poly poly) {
 	return poly & AO_LISP_CONST;
@@ -91,26 +116,11 @@ ao_lisp_is_const(ao_poly poly) {
 #define AO_LISP_IS_CONST(a)	(ao_lisp_const <= ((uint8_t *) (a)) && ((uint8_t *) (a)) < ao_lisp_const + AO_LISP_POOL_CONST)
 #define AO_LISP_IS_POOL(a)	(ao_lisp_pool <= ((uint8_t *) (a)) && ((uint8_t *) (a)) < ao_lisp_pool + AO_LISP_POOL)
 
-static inline void *
-ao_lisp_ref(ao_poly poly) {
-	if (poly == 0xBEEF)
-		ao_lisp_abort();
-	if (poly == AO_LISP_NIL)
-		return NULL;
-	if (poly & AO_LISP_CONST)
-		return (void *) (AO_LISP_CONST_BASE + (poly & AO_LISP_REF_MASK));
-	return (void *) (AO_LISP_POOL_BASE + (poly & AO_LISP_REF_MASK));
-}
+void *
+ao_lisp_ref(ao_poly poly);
 
-static inline ao_poly
-ao_lisp_poly(const void *addr, ao_poly type) {
-	const uint8_t	*a = addr;
-	if (a == NULL)
-		return AO_LISP_NIL;
-	if (AO_LISP_IS_CONST(a))
-		return AO_LISP_CONST | (a - AO_LISP_CONST_BASE) | type;
-	return (a - AO_LISP_POOL_BASE) | type;
-}
+ao_poly
+ao_lisp_poly(const void *addr, ao_poly type);
 
 struct ao_lisp_type {
 	int	(*size)(void *addr);
@@ -158,7 +168,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 +211,8 @@ struct ao_lisp_builtin {
 };
 
 enum ao_lisp_builtin_id {
+	builtin_eval,
+	builtin_read,
 	builtin_lambda,
 	builtin_lexpr,
 	builtin_nlambda,
@@ -206,10 +221,13 @@ enum ao_lisp_builtin_id {
 	builtin_cdr,
 	builtin_cons,
 	builtin_last,
+	builtin_length,
 	builtin_quote,
 	builtin_set,
 	builtin_setq,
 	builtin_cond,
+	builtin_progn,
+	builtin_while,
 	builtin_print,
 	builtin_patom,
 	builtin_plus,
@@ -222,8 +240,13 @@ enum ao_lisp_builtin_id {
 	builtin_greater,
 	builtin_less_equal,
 	builtin_greater_equal,
+	builtin_pack,
+	builtin_unpack,
+	builtin_flush,
 	builtin_delay,
 	builtin_led,
+	builtin_save,
+	builtin_restore,
 	_builtin_last
 };
 
@@ -398,6 +421,9 @@ ao_lisp_cons_print(ao_poly);
 void
 ao_lisp_cons_patom(ao_poly);
 
+int
+ao_lisp_cons_length(struct ao_lisp_cons *cons);
+
 /* string */
 extern const struct ao_lisp_type ao_lisp_string_type;
 
@@ -410,6 +436,12 @@ ao_lisp_string_copy(char *a);
 char *
 ao_lisp_string_cat(char *a, char *b);
 
+ao_poly
+ao_lisp_string_pack(struct ao_lisp_cons *cons);
+
+ao_poly
+ao_lisp_string_unpack(char *a);
+
 void
 ao_lisp_string_print(ao_poly s);
 
@@ -455,6 +487,12 @@ ao_lisp_poly_move(ao_poly *p, uint8_t note_cons);
 
 /* eval */
 
+void
+ao_lisp_eval_clear_globals(void);
+
+int
+ao_lisp_eval_restart(void);
+
 ao_poly
 ao_lisp_eval(ao_poly p);
 
@@ -499,8 +537,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 +565,15 @@ 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);
+
+/* save */
+
+ao_poly
+ao_lisp_save(struct ao_lisp_cons *cons);
+
+ao_poly
+ao_lisp_restore(struct ao_lisp_cons *cons);
 
 /* error */