altos/lisp: Clean up OS integration bits, add defun

[fw/altos] / src / lisp / ao_lisp_prim.c

diff --git a/src/lisp/ao_lisp_prim.c b/src/lisp/ao_lisp_prim.c
deleted file mode 100644 (file)
index bfd75ae..0000000
--- a/src/lisp/ao_lisp_prim.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright © 2016 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- */
-
-#include "ao_lisp.h"
-
-#if 0
-#define DBG(...) printf (__VA_ARGS__)
-#else
-#define DBG(...)
-#endif
-
-struct ao_lisp_funcs {
-       void (*print)(ao_poly);
-       void (*patom)(ao_poly);
-};
-
-static const struct ao_lisp_funcs ao_lisp_funcs[AO_LISP_NUM_TYPE] = {
-       [AO_LISP_CONS] = {
-               .print = ao_lisp_cons_print,
-               .patom = ao_lisp_cons_patom,
-       },
-       [AO_LISP_STRING] = {
-               .print = ao_lisp_string_print,
-               .patom = ao_lisp_string_patom,
-       },
-       [AO_LISP_INT] = {
-               .print = ao_lisp_int_print,
-               .patom = ao_lisp_int_print,
-       },
-       [AO_LISP_ATOM] = {
-               .print = ao_lisp_atom_print,
-               .patom = ao_lisp_atom_print,
-       },
-       [AO_LISP_BUILTIN] = {
-               .print = ao_lisp_builtin_print,
-               .patom = ao_lisp_builtin_print,
-       },
-       [AO_LISP_FRAME] = {
-               .print = ao_lisp_frame_print,
-               .patom = ao_lisp_frame_print,
-       },
-       [AO_LISP_LAMBDA] = {
-               .print = ao_lisp_lambda_print,
-               .patom = ao_lisp_lambda_print,
-       },
-};
-
-static const struct ao_lisp_funcs *
-funcs(ao_poly p)
-{
-       uint8_t type = ao_lisp_poly_type(p);
-
-       if (type < AO_LISP_NUM_TYPE)
-               return &ao_lisp_funcs[type];
-       return NULL;
-}
-
-void
-ao_lisp_poly_print(ao_poly p)
-{
-       const struct ao_lisp_funcs *f = funcs(p);
-
-       if (f && f->print)
-               f->print(p);
-}
-
-void
-ao_lisp_poly_patom(ao_poly p)
-{
-       const struct ao_lisp_funcs *f = funcs(p);
-
-       if (f && f->patom)
-               f->patom(p);
-}
-