X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_builtin.c;h=7cd131f54d3984daf594486cb246678e784372b3;hb=1b1bc92e6781c563e3d3b117b9cda2dddccc44de;hp=57d9ee10edd1ecca5869ba066280a35bcf684267;hpb=c7d7cdc2318a97534c4c1f9c6fd2b51644be729d;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_builtin.c b/src/lisp/ao_lisp_builtin.c
index 57d9ee10..7cd131f5 100644
--- a/src/lisp/ao_lisp_builtin.c
+++ b/src/lisp/ao_lisp_builtin.c
@@ -41,9 +41,11 @@ const struct ao_lisp_type ao_lisp_builtin_type = {
 
 #ifdef AO_LISP_MAKE_CONST
 char *ao_lisp_builtin_name(enum ao_lisp_builtin_id b) {
+	(void) b;
 	return "???";
 }
 char *ao_lisp_args_name(uint8_t args) {
+	(void) args;
 	return "???";
 }
 #else
@@ -58,6 +60,7 @@ static const ao_poly builtin_names[] = {
 	[builtin_cdr] = _ao_lisp_atom_cdr,
 	[builtin_cons] = _ao_lisp_atom_cons,
 	[builtin_last] = _ao_lisp_atom_last,
+	[builtin_length] = _ao_lisp_atom_length,
 	[builtin_quote] = _ao_lisp_atom_quote,
 	[builtin_set] = _ao_lisp_atom_set,
 	[builtin_setq] = _ao_lisp_atom_setq,
@@ -76,8 +79,16 @@ static const ao_poly builtin_names[] = {
 	[builtin_greater] = _ao_lisp_atom_3e,
 	[builtin_less_equal] = _ao_lisp_atom_3c3d,
 	[builtin_greater_equal] = _ao_lisp_atom_3e3d,
+	[builtin_pack] = _ao_lisp_atom_pack,
+	[builtin_unpack] = _ao_lisp_atom_unpack,
+	[builtin_flush] = _ao_lisp_atom_flush,
 	[builtin_delay] = _ao_lisp_atom_delay,
 	[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,
+
 };
 
 static char *
@@ -97,6 +108,7 @@ static const ao_poly ao_lisp_args_atoms[] = {
 char *
 ao_lisp_args_name(uint8_t args)
 {
+	args &= AO_LISP_FUNC_MASK;
 	if (args < sizeof ao_lisp_args_atoms / sizeof ao_lisp_args_atoms[0])
 		return ao_lisp_poly_atom(ao_lisp_args_atoms[args])->name;
 	return "(unknown)";
@@ -107,9 +119,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
@@ -200,6 +210,16 @@ ao_lisp_last(struct ao_lisp_cons *cons)
 	return AO_LISP_NIL;
 }
 
+ao_poly
+ao_lisp_length(struct ao_lisp_cons *cons)
+{
+	if (!ao_lisp_check_argc(_ao_lisp_atom_length, cons, 1, 1))
+		return AO_LISP_NIL;
+	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))));
+}
+
 ao_poly
 ao_lisp_quote(struct ao_lisp_cons *cons)
 {
@@ -470,6 +490,35 @@ ao_lisp_greater_equal(struct ao_lisp_cons *cons)
 	return ao_lisp_compare(cons, builtin_greater_equal);
 }
 
+ao_poly
+ao_lisp_pack(struct ao_lisp_cons *cons)
+{
+	if (!ao_lisp_check_argc(_ao_lisp_atom_pack, cons, 1, 1))
+		return AO_LISP_NIL;
+	if (!ao_lisp_check_argt(_ao_lisp_atom_pack, cons, 0, AO_LISP_CONS, 1))
+		return AO_LISP_NIL;
+	return ao_lisp_string_pack(ao_lisp_poly_cons(ao_lisp_arg(cons, 0)));
+}
+
+ao_poly
+ao_lisp_unpack(struct ao_lisp_cons *cons)
+{
+	if (!ao_lisp_check_argc(_ao_lisp_atom_unpack, cons, 1, 1))
+		return AO_LISP_NIL;
+	if (!ao_lisp_check_argt(_ao_lisp_atom_unpack, cons, 0, AO_LISP_STRING, 0))
+		return AO_LISP_NIL;
+	return ao_lisp_string_unpack(ao_lisp_poly_string(ao_lisp_arg(cons, 0)));
+}
+
+ao_poly
+ao_lisp_flush(struct ao_lisp_cons *cons)
+{
+	if (!ao_lisp_check_argc(_ao_lisp_atom_flush, cons, 0, 0))
+		return AO_LISP_NIL;
+	ao_lisp_os_flush();
+	return _ao_lisp_atom_t;
+}
+
 ao_poly
 ao_lisp_led(struct ao_lisp_cons *cons)
 {
@@ -513,6 +562,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,
@@ -524,6 +582,7 @@ const ao_lisp_func_t ao_lisp_builtins[] = {
 	[builtin_cdr] = ao_lisp_cdr,
 	[builtin_cons] = ao_lisp_cons,
 	[builtin_last] = ao_lisp_last,
+	[builtin_length] = ao_lisp_length,
 	[builtin_quote] = ao_lisp_quote,
 	[builtin_set] = ao_lisp_set,
 	[builtin_setq] = ao_lisp_setq,
@@ -542,7 +601,14 @@ const ao_lisp_func_t ao_lisp_builtins[] = {
 	[builtin_greater] = ao_lisp_greater,
 	[builtin_less_equal] = ao_lisp_less_equal,
 	[builtin_greater_equal] = ao_lisp_greater_equal,
+	[builtin_pack] = ao_lisp_pack,
+	[builtin_unpack] = ao_lisp_unpack,
+	[builtin_flush] = ao_lisp_flush,
 	[builtin_led] = ao_lisp_led,
 	[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,
 };