altos/lisp: Finish first pass through r7rs

[fw/altos] / src / lisp / ao_lisp_make_builtin

diff --git a/src/lisp/ao_lisp_make_builtin b/src/lisp/ao_lisp_make_builtin
index b7b17cf48009c80673bc6ba3d4b5c7c4eec6ecb9..531e388d8627d165826d8f4cae08ed2c6aca4f88 100644 (file)
--- a/src/lisp/ao_lisp_make_builtin
+++ b/src/lisp/ao_lisp_make_builtin
@@ -7,10 +7,12 @@ typedef struct {
 } builtin_t;
 
 string[string] type_map = {
-       "lambda" => "F_LAMBDA",
+       "lambda" => "LAMBDA",
        "nlambda" => "NLAMBDA",
-       "lexpr" => "F_LEXPR",
+       "lexpr" => "LEXPR",
        "macro" => "MACRO",
+       "f_lambda" => "F_LAMBDA",
+       "f_lexpr" => "F_LEXPR",
 };
 
 string[*]
@@ -67,8 +69,8 @@ dump_casename(builtin_t[*] builtins) {
        printf("static char *ao_lisp_builtin_name(enum ao_lisp_builtin_id b) {\n");
        printf("\tswitch(b) {\n");
        for (int i = 0; i < dim(builtins); i++)
-               printf("\tcase builtin_%s: return ao_lisp_poly_atom(_atom(%s))->name;\n",
-                      builtins[i].c_name, builtins[i].c_name);
+               printf("\tcase builtin_%s: return ao_lisp_poly_atom(_atom(\"%s\"))->name;\n",
+                      builtins[i].c_name, builtins[i].lisp_names[0]);
        printf("\tdefault: return \"???\";\n");
        printf("\t}\n");
        printf("}\n");
@@ -135,13 +137,29 @@ dump_consts(builtin_t[*] builtins) {
        for (int i = 0; i < dim(builtins); i++) {
                for (int j = 0; j < dim(builtins[i].lisp_names); j++) {
                        printf ("\t{ .name = \"%s\", .args = AO_LISP_FUNC_%s, .func = builtin_%s },\n",
-                               builtins[i].lisp_names[j], builtins[i].type, builtins[i].c_name);
+                               builtins[i].lisp_names[j],
+                               builtins[i].type,
+                               builtins[i].c_name);
                }
        }
        printf("};\n");
        printf("#endif /* AO_LISP_BUILTIN_CONSTS */\n");
 }
 
+void
+dump_atoms(builtin_t[*] builtins) {
+       printf("#ifdef AO_LISP_BUILTIN_ATOMS\n");
+       printf("#undef AO_LISP_BUILTIN_ATOMS\n");
+       for (int i = 0; i < dim(builtins); i++) {
+               for (int j = 0; j < dim(builtins[i].lisp_names); j++) {
+                       printf("#define _ao_lisp_atom_");
+                       cify_lisp(builtins[i].lisp_names[j]);
+                       printf(" _atom(\"%s\")\n", builtins[i].lisp_names[j]);
+               }
+       }
+       printf("#endif /* AO_LISP_BUILTIN_ATOMS */\n");
+}
+
 void main() {
        if (dim(argv) < 2) {
                File::fprintf(stderr, "usage: %s <file>\n", argv[0]);
@@ -155,6 +173,7 @@ void main() {
                dump_funcs(builtins);
                dump_decls(builtins);
                dump_consts(builtins);
+               dump_atoms(builtins);
        }
 }