X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp.h;h=7a165cd8b47ef1bcf94004eec2aeb0813426fb52;hb=d46ca67f93e9ecbc4d8c051c3fbdead85490b690;hp=82ba5a20e1ec20f1bad122c31fc408f3b818f413;hpb=0ee44c8e4bf5dabe6a97bf76b366c8b767c387f8;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index 82ba5a20..7a165cd8 100644
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -15,17 +15,10 @@
 #ifndef _AO_LISP_H_
 #define _AO_LISP_H_
 
-#include <stdlib.h>
-
-#if !defined(AO_LISP_TEST) && !defined(AO_LISP_MAKE_CONST)
-#include <ao.h>
-#define AO_LISP_ALTOS	1
-#define abort() ao_panic(1)
-#endif
-
 #include <stdint.h>
 #include <string.h>
-#include <stdio.h>
+//#include <stdio.h>
+#include <ao_lisp_os.h>
 
 #ifdef AO_LISP_MAKE_CONST
 #define AO_LISP_POOL_CONST	16384
@@ -43,8 +36,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
@@ -79,6 +81,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;
 
@@ -96,26 +99,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)
-		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);
@@ -163,7 +151,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 {
@@ -203,6 +194,8 @@ struct ao_lisp_builtin {
 };
 
 enum ao_lisp_builtin_id {
+	builtin_eval,
+	builtin_read,
 	builtin_lambda,
 	builtin_lexpr,
 	builtin_nlambda,
@@ -211,10 +204,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,
@@ -227,12 +223,17 @@ enum ao_lisp_builtin_id {
 	builtin_greater,
 	builtin_less_equal,
 	builtin_greater_equal,
+	builtin_pack,
+	builtin_unpack,
+	builtin_flush,
+	builtin_delay,
+	builtin_led,
 	_builtin_last
 };
 
 typedef ao_poly (*ao_lisp_func_t)(struct ao_lisp_cons *cons);
 
-extern ao_lisp_func_t	ao_lisp_builtins[];
+extern const ao_lisp_func_t	ao_lisp_builtins[];
 
 static inline ao_lisp_func_t
 ao_lisp_func(struct ao_lisp_builtin *b)
@@ -401,6 +402,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;
 
@@ -413,6 +417,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);
 
@@ -502,8 +512,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);
@@ -530,8 +540,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 */