X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_builtin.c;h=902f60e2e9b6f83b355264e875ad865096a1ab48;hb=d0053c5e2cc7b75b642ff4727a1ef874d323db9d;hp=b808cbc51aa992c3c9a4aa9e4419f3d7d5beca85;hpb=41175ff82bc0e35c99c60b49aa62944a12917157;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_builtin.c b/src/lisp/ao_lisp_builtin.c
index b808cbc5..902f60e2 100644
--- a/src/lisp/ao_lisp_builtin.c
+++ b/src/lisp/ao_lisp_builtin.c
@@ -86,7 +86,14 @@ static const ao_poly builtin_names[] = {
 	[builtin_led] = _ao_lisp_atom_led,
 	[builtin_save] = _ao_lisp_atom_save,
 	[builtin_restore] = _ao_lisp_atom_restore,
-
+	[builtin_call_cc] = _ao_lisp_atom_call2fcc,
+	[builtin_collect] = _ao_lisp_atom_collect,
+#if 0
+	[builtin_symbolp] = _ao_lisp_atom_symbolp,
+	[builtin_listp] = _ao_lisp_atom_listp,
+	[builtin_stringp] = _ao_lisp_atom_stringp,
+	[builtin_numberp] = _ao_lisp_atom_numberp,
+#endif
 };
 
 static char *
@@ -117,9 +124,7 @@ void
 ao_lisp_builtin_print(ao_poly b)
 {
 	struct ao_lisp_builtin *builtin = ao_lisp_poly_builtin(b);
-	printf("[builtin %s %s]",
-	       ao_lisp_args_name(builtin->args),
-	       ao_lisp_builtin_name(builtin->func));
+	printf("%s", ao_lisp_builtin_name(builtin->func));
 }
 
 ao_poly
@@ -213,9 +218,9 @@ ao_lisp_last(struct ao_lisp_cons *cons)
 ao_poly
 ao_lisp_length(struct ao_lisp_cons *cons)
 {
-	if (!ao_lisp_check_argc(_ao_lisp_atom_last, cons, 1, 1))
+	if (!ao_lisp_check_argc(_ao_lisp_atom_length, cons, 1, 1))
 		return AO_LISP_NIL;
-	if (!ao_lisp_check_argt(_ao_lisp_atom_last, cons, 0, AO_LISP_CONS, 1))
+	if (!ao_lisp_check_argt(_ao_lisp_atom_length, cons, 0, AO_LISP_CONS, 1))
 		return AO_LISP_NIL;
 	return ao_lisp_int_poly(ao_lisp_cons_length(ao_lisp_poly_cons(ao_lisp_arg(cons, 0))));
 }
@@ -562,6 +567,15 @@ ao_lisp_do_read(struct ao_lisp_cons *cons)
 	return ao_lisp_read();
 }
 
+ao_poly
+ao_lisp_do_collect(struct ao_lisp_cons *cons)
+{
+	int	free;
+	(void) cons;
+	free = ao_lisp_collect(AO_LISP_COLLECT_FULL);
+	return ao_lisp_int_poly(free);
+}
+
 const ao_lisp_func_t ao_lisp_builtins[] = {
 	[builtin_eval] = ao_lisp_do_eval,
 	[builtin_read] = ao_lisp_do_read,
@@ -599,5 +613,7 @@ const ao_lisp_func_t ao_lisp_builtins[] = {
 	[builtin_delay] = ao_lisp_delay,
 	[builtin_save] = ao_lisp_save,
 	[builtin_restore] = ao_lisp_restore,
+	[builtin_call_cc] = ao_lisp_call_cc,
+	[builtin_collect] = ao_lisp_do_collect,
 };