X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_prim.c;h=38dcb9616aa8f028fc3b35b4c361fdae697ad5c5;hb=338723847e66f7c34a6b5e54d094ed52dc5665c3;hp=ccfd2be4e6dfb88fd9b6098eb9471c73cb904600;hpb=75f07353a4fad170ac1cc6af98ed1aad7d1c0c88;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_prim.c b/src/lisp/ao_lisp_prim.c
index ccfd2be4..38dcb961 100644
--- a/src/lisp/ao_lisp_prim.c
+++ b/src/lisp/ao_lisp_prim.c
@@ -14,31 +14,25 @@
 
 #include "ao_lisp.h"
 
-ao_lisp_poly
-ao_lisp_poly_print(ao_lisp_poly p)
+static void (*const ao_lisp_print_funcs[AO_LISP_NUM_TYPE])(ao_poly) = {
+	[AO_LISP_CONS] = ao_lisp_cons_print,
+	[AO_LISP_STRING] = ao_lisp_string_print,
+	[AO_LISP_INT] = ao_lisp_int_print,
+	[AO_LISP_ATOM] = ao_lisp_atom_print,
+	[AO_LISP_BUILTIN] = ao_lisp_builtin_print
+};
+
+ao_poly
+ao_lisp_poly_print(ao_poly p)
 {
-	switch (ao_lisp_poly_type(p)) {
-	case AO_LISP_CONS:
-		ao_lisp_cons_print(ao_lisp_poly_cons(p));
-		break;
-	case AO_LISP_STRING:
-		ao_lisp_string_print(ao_lisp_poly_string(p));
-		break;
-	case AO_LISP_INT:
-		ao_lisp_int_print(ao_lisp_poly_int(p));
-		break;
-	case AO_LISP_ATOM:
-		ao_lisp_atom_print(ao_lisp_poly_atom(p));
-		break;
-	case AO_LISP_BUILTIN:
-		ao_lisp_builtin_print(ao_lisp_poly_builtin(p));
-		break;
-	}
-	return AO_LISP_NIL;
+	void (*print)(ao_poly) = ao_lisp_print_funcs[ao_lisp_poly_type(p)];
+	if (print)
+		print(p);
+	return p;
 }
 
 void
-ao_lisp_poly_mark(ao_lisp_poly p)
+ao_lisp_poly_mark(ao_poly p)
 {
 	switch (ao_lisp_poly_type(p)) {
 	case AO_LISP_CONS:
@@ -53,8 +47,8 @@ ao_lisp_poly_mark(ao_lisp_poly p)
 	}
 }
 
-ao_lisp_poly
-ao_lisp_poly_move(ao_lisp_poly p)
+ao_poly
+ao_lisp_poly_move(ao_poly p)
 {
 	switch (ao_lisp_poly_type(p)) {
 	case AO_LISP_CONS: