X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Flisp%2Fao_lisp_make_const.c;h=9c2ea74cdccf811e2514b49cdfa0b08638eae62f;hb=6fc1ee0f7adc6fcb3e850bcbaabc1db705314234;hp=8d3e03a913f7c349c0daccc3cc0cb0353f62274d;hpb=9e1a787f8828fb7b750ad3310c89a89536ea5286;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_make_const.c b/src/lisp/ao_lisp_make_const.c
index 8d3e03a9..9c2ea74c 100644
--- a/src/lisp/ao_lisp_make_const.c
+++ b/src/lisp/ao_lisp_make_const.c
@@ -39,6 +39,7 @@ struct builtin_func funcs[] = {
 	"quote",	AO_LISP_NLAMBDA,builtin_quote,
 	"set",		AO_LISP_LEXPR,	builtin_set,
 	"setq",		AO_LISP_MACRO,	builtin_setq,
+	"cond",		AO_LISP_NLAMBDA,builtin_cond,
 	"print",	AO_LISP_LEXPR,	builtin_print,
 	"+",		AO_LISP_LEXPR,	builtin_plus,
 	"-",		AO_LISP_LEXPR,	builtin_minus,
@@ -47,21 +48,67 @@ struct builtin_func funcs[] = {
 	"%",		AO_LISP_LEXPR,	builtin_mod
 };
 
+ao_poly
+ao_lisp_set_cond(struct ao_lisp_cons *c)
+{
+	(void) c;
+	return AO_LISP_NIL;
+}
+
 #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
+is_atom(int offset)
+{
+	struct ao_lisp_atom *a;
+
+	for (a = ao_lisp_atoms; a; a = ao_lisp_poly_atom(a->next))
+		if (((uint8_t *) a->name - ao_lisp_const) == offset)
+			return strlen(a->name);
+	return 0;
+}
+
 int
 main(int argc, char **argv)
 {
-	int	f, o;
+	int	f, o, i;
 	ao_poly	atom, val;
 	struct ao_lisp_atom	*a;
+	struct ao_lisp_builtin	*b;
+	int	in_atom;
 
+	printf("/*\n");
+	printf(" * Generated file, do not edit\n");
+	ao_lisp_root_add(&ao_lisp_frame_type, &globals);
+	globals = ao_lisp_frame_new(0, 0);
 	for (f = 0; f < N_FUNC; f++) {
-		struct ao_lisp_builtin	*b = ao_lisp_make_builtin(funcs[f].func, funcs[f].args);
-		struct ao_lisp_atom	*a = ao_lisp_atom_intern(funcs[f].name);
-		a->val = ao_lisp_builtin_poly(b);
+		b = ao_lisp_make_builtin(funcs[f].func, funcs[f].args);
+		a = ao_lisp_atom_intern(funcs[f].name);
+		globals = ao_lisp_frame_add(globals, ao_lisp_atom_poly(a), ao_lisp_builtin_poly(b));
 	}
 
+	/* atoms for syntax */
+	for (i = 0; i < N_ATOM; i++)
+		(void) ao_lisp_atom_intern(atoms[i]);
+
+	/* boolean constants */
+	a = ao_lisp_atom_intern("nil");
+	globals = ao_lisp_frame_add(globals, ao_lisp_atom_poly(a), AO_LISP_NIL);
+	a = ao_lisp_atom_intern("t");
+	globals = ao_lisp_frame_add(globals, ao_lisp_atom_poly(a), ao_lisp_atom_poly(a));
+
 	for (;;) {
 		atom = ao_lisp_read();
 		if (!atom)
@@ -73,13 +120,19 @@ main(int argc, char **argv)
 			fprintf(stderr, "input must be atom val pairs\n");
 			exit(1);
 		}
-		ao_lisp_poly_atom(atom)->val = val;
+		globals = ao_lisp_frame_add(globals, atom, val);
 	}
 
-	printf("/* constant objects, all referenced from atoms */\n\n");
+	/* Reduce to referenced values */
+	ao_lisp_collect();
+	printf(" */\n");
+
+	globals->readonly = 1;
+
 	printf("#define AO_LISP_POOL_CONST %d\n", ao_lisp_top);
 	printf("extern const uint8_t ao_lisp_const[AO_LISP_POOL_CONST] __attribute__((aligned(4)));\n");
 	printf("#define ao_builtin_atoms 0x%04x\n", ao_lisp_atom_poly(ao_lisp_atoms));
+	printf("#define ao_builtin_frame 0x%04x\n", ao_lisp_frame_poly(globals));
 
 	for (a = ao_lisp_atoms; a; a = ao_lisp_poly_atom(a->next)) {
 		char	*n = a->name, c;
@@ -101,10 +154,14 @@ main(int argc, char **argv)
 		else
 			printf(" ");
 		c = ao_lisp_const[o];
-		if (' ' < c && c <= '~' && c != '\'')
+		if (!in_atom)
+			in_atom = is_atom(o);
+		if (in_atom) {
 			printf (" '%c',", c);
-		else
+			in_atom--;
+		} else {
 			printf("0x%02x,", c);
+		}
 	}
 	printf("\n};\n");
 	printf("#endif /* AO_LISP_CONST_BITS */\n");