From 30743ce1412724d2e454cc00df8b6bf6e9375d51 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 25 Mar 2017 15:58:44 +0100
Subject: [PATCH] mini-mes: Fully remove reader from core.

* scaffold/mini-mes.c (lookup_): Remove.
* mes.c: Likewise.
* reader.c (lookup_): Enable.
* mlib.c (putc): New function.
* module/mes/libc.mes (putc): New function.
---
 GNUmakefile             |   2 +
 build-aux/mes-snarf.scm |   9 +-
 lib.c                   | 152 ++++++++--
 math.c                  |   2 +-
 mes.c                   | 306 ++++++++-----------
 mlibc.c                 |  27 +-
 module/mes/base-0.mes   |  11 +-
 module/mes/libc.mes     |  21 +-
 module/mes/read-0-32.mo | Bin 0 -> 80657 bytes
 module/mes/read-0.mes   |  35 ++-
 module/mes/type-0.mes   |   8 +-
 posix.c                 | 133 --------
 reader.c                |  49 +--
 scaffold/cons-mes.c     | 113 ++-----
 scaffold/micro-mes.c    |  11 -
 scaffold/mini-mes.c     | 650 +++++++++++++++++-----------------------
 scaffold/tiny-mes.c     |   2 +-
 tests/gc-0.test         |  12 +-
 tests/gc-1.test         |  20 +-
 tests/gc.test           |   4 +-
 vector.c                |   2 +-
 21 files changed, 669 insertions(+), 900 deletions(-)
 create mode 100644 module/mes/read-0-32.mo

diff --git a/GNUmakefile b/GNUmakefile
index bb3eacdc..f6a7e704 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -101,6 +101,7 @@ dump: module/mes/read-0.mo
 mes-32: mes.c lib.c
 	rm -f mes mes.o
 	guix environment --system=i686-linux --ad-hoc gcc-toolchain -- bash -c 'make mes CC=i686-unknown-linux-gnu-gcc LIBRARY_PATH=$${PATH%%/bin:*}/lib'
+	rm -f mes.o
 	mv mes mes-32
 
 module/mes/read-0-32.mo: module/mes/read-0.mes mes-32
@@ -135,6 +136,7 @@ mini-mes: scaffold/mini-mes.c
 	rm -f $@
 	#	gcc -nostdlib --std=gnu99 -m32 -g -o $@ '-DPREFIX=' '-DVERSION='"$(VERSION)"' $<
 	gcc -nostdlib -I. --std=gnu99 -m32 -g -I. -o $@ $(CPPFLAGS) $<
+	rm -f mes.o
 	chmod +x $@
 
 guile-mini-mes: mini-mes.h mini-mes.i mini-mes.environment.i mini-mes.symbols.i
diff --git a/build-aux/mes-snarf.scm b/build-aux/mes-snarf.scm
index ae80d412..05215a2a 100755
--- a/build-aux/mes-snarf.scm
+++ b/build-aux/mes-snarf.scm
@@ -57,10 +57,11 @@ exec ${GUILE-guile} --no-auto-compile -L $HOME/src/mes/build-aux -L build-aux -e
                     (regexp-replace "_" "-")
                     (regexp-replace "_" "-")
                     (regexp-replace "_" "-")
-                    (regexp-replace "^builtin_" "")
                     (regexp-replace "_to_" "->")
                     (regexp-replace "_x$" "!")
-                    (regexp-replace "_p$" "?"))
+                    (regexp-replace "_p$" "?")
+                    (regexp-replace "___" "***")
+                    (regexp-replace "___" "***"))
                    (.name f))))
         (if (not (string-suffix? "-" name)) name
             (string-append "core:" (string-drop-right name 1))))))
@@ -120,8 +121,8 @@ exec ${GUILE-guile} --no-auto-compile -L $HOME/src/mes/build-aux -L build-aux -e
        (format #f "g_cells[cell_~a].string = MAKE_STRING (scm_~a.string);\n" (.name f) (.name f))
        (format #f "g_cells[cell_~a].car = MAKE_STRING (scm_~a.car);\n" (.name f) (.name f)))
    (if GCC?
-       (format #f "a = acons (make_symbol (scm_~a.string), ~a, a);\n\n" (.name f) (function-cell-name f))
-       (format #f "a = acons (make_symbol (scm_~a.car), ~a, a);\n\n" (.name f) (function-cell-name f)))))
+       (format #f "a = acons (lookup_symbol_ (scm_~a.string), ~a, a);\n\n" (.name f) (function-cell-name f))
+       (format #f "a = acons (lookup_symbol_ (scm_~a.car), ~a, a);\n\n" (.name f) (function-cell-name f)))))
 
 (define (snarf-symbols string)
   (let* ((matches (list-matches "\nstruct scm scm_([a-z_0-9]+) = [{](TSPECIAL|TSYMBOL)," string)))
diff --git a/lib.c b/lib.c
index ea5eb4f1..b458e561 100644
--- a/lib.c
+++ b/lib.c
@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * Mes --- Maxwell Equations of Software
- * Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of Mes.
  *
@@ -32,6 +32,137 @@
 //   return MAKE_NUMBER (n);
 // }
 
+SCM fdisplay_ (SCM,FILE*);
+
+int g_depth;
+
+SCM
+display_helper (SCM x, int cont, char* sep, FILE *fd)
+{
+  fputs (sep, fd);
+  if (g_depth == 0) return cell_unspecified;
+  g_depth = g_depth - 1;
+
+  switch (TYPE (x))
+    {
+    case TCHAR:
+      {
+        fputs ("#\\", fd);
+        putc (VALUE (x), fd);
+        break;
+      }
+    case TFUNCTION:
+      {
+        fputs ("#<procedure ", fd);
+        char *p = "?";
+        if (FUNCTION (x).name != 0)
+          p = FUNCTION (x).name;
+        fputs (p, fd);
+        fputs ("[", fd);
+        fputs (itoa (CDR (x)), fd);
+        fputs (",", fd);
+        fputs (itoa (x), fd);
+        fputs ("]>", fd);
+        break;
+      }
+    case TMACRO:
+      {
+        fputs ("#<macro ", fd);
+        display_helper (cdr (x), cont, "", fd);
+        fputs (">", fd);
+        break;
+      }
+    case TNUMBER:
+      {
+        fputs (itoa (VALUE (x)), fd);
+        break;
+      }
+    case TPAIR:
+      {
+        if (!cont) fputs ("(", fd);
+        if (x && x != cell_nil) fdisplay_ (CAR (x), fd);
+        if (CDR (x) && TYPE (CDR (x)) == TPAIR)
+          display_helper (CDR (x), 1, " ", fd);
+        else if (CDR (x) && CDR (x) != cell_nil)
+          {
+            if (TYPE (CDR (x)) != TPAIR)
+              fputs (" . ", fd);
+            fdisplay_ (CDR (x), fd);
+          }
+        if (!cont) fputs (")", fd);
+        break;
+      }
+    case TSPECIAL:
+#if __NYACC__
+      // FIXME
+      //{}
+      {
+        SCM t = CAR (x);
+        while (t && t != cell_nil)
+          {
+            putc (VALUE (CAR (t)), fd);
+            t = CDR (t);
+          }
+        break;
+      }
+#endif
+    case TSTRING:
+#if __NYACC__
+      // FIXME
+      {
+        SCM t = CAR (x);
+        while (t && t != cell_nil)
+          {
+            putc (VALUE (CAR (t)), fd);
+            t = CDR (t);
+          }
+        break;
+      }
+#endif
+    case TSYMBOL:
+      {
+        SCM t = CAR (x);
+        while (t && t != cell_nil)
+          {
+            putc (VALUE (CAR (t)), fd);
+            t = CDR (t);
+          }
+        break;
+      }
+    default:
+      {
+        fputs ("<", fd);
+        fputs (itoa (TYPE (x)), fd);
+        fputs (":", fd);
+        fputs (itoa (x), fd);
+        fputs (">", fd);
+        break;
+      }
+    }
+  return 0;
+}
+
+SCM
+display_ (SCM x)
+{
+  g_depth = 5;
+  return display_helper (x, 0, "", stdout);
+}
+
+SCM
+display_error_ (SCM x)
+{
+  g_depth = 5;
+  return display_helper (x, 0, "", stderr);
+}
+
+SCM
+fdisplay_ (SCM x, FILE *fd) ///((internal))
+{
+  g_depth = 5;
+  return display_helper (x, 0, "", fd);
+}
+
 SCM
 exit_ (SCM x) ///((name . "exit"))
 {
@@ -111,7 +242,7 @@ check_apply (SCM f, SCM e) ///((internal))
       char buf[1024];
       sprintf (buf, "cannot apply: %s:", type);
       fprintf (stderr, " [");
-      stderr_ (e);
+      display_error_ (e);
       fprintf (stderr, "]\n");
       SCM e = MAKE_STRING (cstring_to_list (buf));
       return error (cell_symbol_wrong_type_arg, cons (e, f));
@@ -147,7 +278,7 @@ int
 dump ()
 {
   fputs ("program r2=", stderr);
-  stderr_ (r2);
+  display_error_ (r2);
   fputs ("\n", stderr);
 
   r1 = g_symbols;
@@ -236,21 +367,6 @@ bload_env (SCM a) ///((internal))
   return r2;
 }
 
-SCM
-values (SCM x) ///((arity . n))
-{
-  SCM v = cons (0, x);
-  TYPE (v) = TVALUES;
-  return v;
-}
-
-SCM
-arity_ (SCM x)
-{
-  assert (TYPE (x) == TFUNCTION);
-  return MAKE_NUMBER (FUNCTION (x).arity);
-}
-
 SCM
 xassq (SCM x, SCM a) ///for speed in core only
 {
diff --git a/math.c b/math.c
index 11917fa6..9fe8b9c2 100644
--- a/math.c
+++ b/math.c
@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * Mes --- Maxwell Equations of Software
- * Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of Mes.
  *
diff --git a/mes.c b/mes.c
index 25c08e2f..89a86103 100644
--- a/mes.c
+++ b/mes.c
@@ -213,19 +213,19 @@ SCM r3 = 0; // continuation
 #define NTYPE(x) g_news[x].type
 
 #define CAAR(x) CAR (CAR (x))
+#define CADR(x) CAR (CDR (x))
 #define CDAR(x) CDR (CAR (x))
-#define CAAR(x) CAR (CAR (x))
+#define CDDR(x) CDR (CDR (x))
 #define CADAR(x) CAR (CDR (CAR (x)))
 #define CADDR(x) CAR (CDR (CDR (x)))
 #define CDDDR(x) CDR (CDR (CDR (x)))
 #define CDADAR(x) CAR (CDR (CAR (CDR (x))))
-#define CADR(x) CAR (CDR (x))
 
-#define MAKE_CHAR(n) make_cell (tmp_num_ (TCHAR), 0, tmp_num2_ (n))
-#define MAKE_CONTINUATION(n) make_cell (tmp_num_ (TCONTINUATION), n, g_stack)
-#define MAKE_NUMBER(n) make_cell (tmp_num_ (TNUMBER), 0, tmp_num2_ (n))
-#define MAKE_REF(n) make_cell (tmp_num_ (TREF), n, 0)
-#define MAKE_STRING(x) make_cell (tmp_num_ (TSTRING), x, 0)
+#define MAKE_CHAR(n) make_cell_ (tmp_num_ (TCHAR), 0, tmp_num2_ (n))
+#define MAKE_CONTINUATION(n) make_cell_ (tmp_num_ (TCONTINUATION), n, g_stack)
+#define MAKE_NUMBER(n) make_cell_ (tmp_num_ (TNUMBER), 0, tmp_num2_ (n))
+#define MAKE_REF(n) make_cell_ (tmp_num_ (TREF), n, 0)
+#define MAKE_STRING(x) make_cell_ (tmp_num_ (TSTRING), x, 0)
 
 SCM vm_call (function0_t f, SCM p1, SCM a);
 char const* itoa(int);
@@ -256,7 +256,7 @@ alloc (int n)
 }
 
 SCM
-make_cell (SCM type, SCM car, SCM cdr)
+make_cell_ (SCM type, SCM car, SCM cdr)
 {
   SCM x = alloc (1);
   assert (TYPE (type) == TNUMBER);
@@ -274,11 +274,79 @@ make_cell (SCM type, SCM car, SCM cdr)
   return x;
 }
 
+SCM
+make_symbol_ (SCM s)
+{
+  g_cells[tmp_num].value = TSYMBOL;
+  SCM x = make_cell_ (tmp_num, s, 0);
+  g_symbols = cons (x, g_symbols);
+  return x;
+}
+
+SCM
+list_of_char_equal_p (SCM a, SCM b) ///((internal))
+{
+  while (a != cell_nil && b != cell_nil && VALUE (car (a)) == VALUE (car (b))) {
+    assert (TYPE (car (a)) == TCHAR);
+    assert (TYPE (car (b)) == TCHAR);
+    a = cdr (a);
+    b = cdr (b);
+  }
+  return (a == cell_nil && b == cell_nil) ? cell_t : cell_f;
+}
+
+SCM
+lookup_symbol_ (SCM s)
+{
+  SCM x = g_symbols;
+  while (x) {
+    if (list_of_char_equal_p (STRING (car (x)), s) == cell_t) break;
+    x = cdr (x);
+  }
+  if (x) x = car (x);
+  if (!x) x = make_symbol_ (s);
+  return x;
+}
+
+SCM
+type_ (SCM x)
+{
+  return MAKE_NUMBER (TYPE (x));
+}
+
+SCM
+car_ (SCM x)
+{
+  return (TYPE (x) != TCONTINUATION
+          && (TYPE (CAR (x)) == TPAIR // FIXME: this is weird
+              || TYPE (CAR (x)) == TREF
+              || TYPE (CAR (x)) == TSPECIAL
+              || TYPE (CAR (x)) == TSYMBOL
+              || TYPE (CAR (x)) == TSTRING)) ? CAR (x) : MAKE_NUMBER (CAR (x));
+}
+
+SCM
+cdr_ (SCM x)
+{
+  return (TYPE (CDR (x)) == TPAIR
+          || TYPE (CDR (x)) == TREF
+          || TYPE (CAR (x)) == TSPECIAL
+          || TYPE (CDR (x)) == TSYMBOL
+          || TYPE (CDR (x)) == TSTRING) ? CDR (x) : MAKE_NUMBER (CDR (x));
+}
+
+SCM
+arity_ (SCM x)
+{
+  assert (TYPE (x) == TFUNCTION);
+  return MAKE_NUMBER (FUNCTION (x).arity);
+}
+
 SCM
 cons (SCM x, SCM y)
 {
   g_cells[tmp_num].value = TPAIR;
-  return make_cell (tmp_num, x, y);
+  return make_cell_ (tmp_num, x, y);
 }
 
 SCM
@@ -321,30 +389,17 @@ eq_p (SCM x, SCM y)
 }
 
 SCM
-type_ (SCM x)
+values (SCM x) ///((arity . n))
 {
-  return MAKE_NUMBER (TYPE (x));
+  SCM v = cons (0, x);
+  TYPE (v) = TVALUES;
+  return v;
 }
 
 SCM
-car_ (SCM x)
+acons (SCM key, SCM value, SCM alist)
 {
-  return (TYPE (x) != TCONTINUATION
-          && (TYPE (CAR (x)) == TPAIR // FIXME: this is weird
-              || TYPE (CAR (x)) == TREF
-              || TYPE (CAR (x)) == TSPECIAL
-              || TYPE (CAR (x)) == TSYMBOL
-              || TYPE (CAR (x)) == TSTRING)) ? CAR (x) : MAKE_NUMBER (CAR (x));
-}
-
-SCM
-cdr_ (SCM x)
-{
-  return (TYPE (CDR (x)) == TPAIR
-          || TYPE (CDR (x)) == TREF
-          || TYPE (CAR (x)) == TSPECIAL
-          || TYPE (CDR (x)) == TSYMBOL
-          || TYPE (CDR (x)) == TSTRING) ? CDR (x) : MAKE_NUMBER (CDR (x));
+  return cons (cons (key, value), alist);
 }
 
 // MIMI_MES lib.c?
@@ -367,6 +422,9 @@ error (SCM key, SCM x)
   SCM throw;
   if ((throw = assq_ref_env (cell_symbol_throw, r0)) != cell_undefined)
     return apply (throw, cons (key, cons (x, cell_nil)), r0);
+  display_error_ (key);
+  fputs (": ", stderr);
+  display_error_ (x);
   assert (!"error");
 }
 
@@ -408,18 +466,12 @@ call (SCM fn, SCM x)
   if ((FUNCTION (fn).arity > 1 || FUNCTION (fn).arity == -1)
       && x != cell_nil && TYPE (CDR (x)) == TPAIR && TYPE (CADR (x)) == TVALUES)
     x = cons (CAR (x), cons (CDADAR (x), CDR (x)));
-#if 0
-  eputs ("call: ");
-  if (FUNCTION (fn).name) eputs (FUNCTION (fn).name);
-  else eputs (itoa (CDR (fn)));
-  eputs ("\n");
-#endif
   switch (FUNCTION (fn).arity)
     {
     case 0: return FUNCTION (fn).function0 ();
     case 1: return FUNCTION (fn).function1 (car (x));
-    case 2: return FUNCTION (fn).function2 (car (x), cadr (x));
-    case 3: return FUNCTION (fn).function3 (car (x), cadr (x), car (cddr (x)));
+    case 2: return FUNCTION (fn).function2 (car (x), CADR (x));
+    case 3: return FUNCTION (fn).function3 (car (x), CADR (x), car (CDDR (x)));
     case -1: return FUNCTION (fn).functionn (x);
     }
 
@@ -430,7 +482,7 @@ SCM
 assq (SCM x, SCM a)
 {
   while (a != cell_nil && eq_p (x, CAAR (a)) == cell_f) a = CDR (a);
-  return a != cell_nil ? car (a) : cell_f;
+  return a != cell_nil ? CAR (a) : cell_f;
 }
 
 SCM
@@ -438,7 +490,7 @@ assq_ref_env (SCM x, SCM a)
 {
   x = assq (x, a);
   if (x == cell_f) return cell_undefined;
-  return cdr (x);
+  return CDR (x);
 }
 
 SCM
@@ -475,28 +527,16 @@ call_lambda (SCM e, SCM x, SCM aa, SCM a) ///((internal))
 }
 
 SCM
-make_closure (SCM args, SCM body, SCM a)
+make_closure_ (SCM args, SCM body, SCM a) ///((internal))xs
 {
-  return make_cell (tmp_num_ (TCLOSURE), cell_f, cons (cons (cell_circular, a), cons (args, body)));
+  return make_cell_ (tmp_num_ (TCLOSURE), cell_f, cons (cons (cell_circular, a), cons (args, body)));
 }
 
 SCM
-lookup_macro (SCM x, SCM a)
+lookup_macro_ (SCM x, SCM a) ///((internal))
 {
   if (TYPE (x) != TSYMBOL) return cell_f;
   SCM m = assq_ref_env (x, a);
-#if 0
-  if (TYPE (m) == TMACRO)
-    {
-      fputs ("XXmacro: ", stdout);
-      fputs ("[", stdout);
-      fputs (itoa (m), stdout);
-      fputs ("]: ", stdout);
-      display_ (m);
-      fputs ("\n", stdout);
-
-    }
-#endif
   if (TYPE (m) == TMACRO) return MACRO (m);
   return cell_f;
 }
@@ -514,11 +554,6 @@ push_cc (SCM p1, SCM p2, SCM a, SCM c) ///((internal))
   return cell_unspecified;
 }
 
-SCM caar (SCM x) {return car (car (x));}
-SCM cadr (SCM x) {return car (cdr (x));}
-SCM cdar (SCM x) {return cdr (car (x));}
-SCM cddr (SCM x) {return cdr (cdr (x));}
-
 SCM
 eval_apply ()
 {
@@ -582,9 +617,9 @@ eval_apply ()
     case TCLOSURE:
       {
         SCM cl = CLOSURE (car (r1));
-        SCM formals = cadr (cl);
-        SCM body = cddr (cl);
-        SCM aa = cdar (cl);
+        SCM formals = CADR (cl);
+        SCM body = CDDR (cl);
+        SCM aa = CDAR (cl);
         aa = cdr (aa);
         check_formals (car (r1), formals, cdr (r1));
         SCM p = pairlis (formals, cdr (r1), aa);
@@ -596,7 +631,7 @@ eval_apply ()
           x = r1;
           g_stack = CONTINUATION (CAR (r1));
           gc_pop_frame ();
-          r1 = cadr (x);
+          r1 = CADR (x);
           goto eval_apply;
         }
     case TSPECIAL:
@@ -637,12 +672,12 @@ eval_apply ()
       }
     case TPAIR:
       {
-        switch (caar (r1))
+        switch (CAAR (r1))
           {
           case cell_symbol_lambda:
             {
-              SCM formals = cadr (car (r1));
-              SCM body = cddr (car (r1));
+              SCM formals = CADR (car (r1));
+              SCM body = CDDR (car (r1));
               SCM p = pairlis (formals, cdr (r1), r0);
               check_formals (r1, formals, cdr (r1));
               call_lambda (body, p, p, r0);
@@ -696,27 +731,27 @@ eval_apply ()
 #endif // FIXED_PRIMITIVES
           case cell_symbol_quote:
             {
-              x = r1; gc_pop_frame (); r1 = cadr (x); goto eval_apply;
+              x = r1; gc_pop_frame (); r1 = CADR (x); goto eval_apply;
             }
           case cell_symbol_begin: goto begin;
           case cell_symbol_lambda:
             {
-              r1 = make_closure (cadr (r1), cddr (r1), assq (cell_closure, r0));
+              r1 = make_closure_ (CADR (r1), CDDR (r1), assq (cell_closure, r0));
               goto vm_return;
             }
           case cell_symbol_if: {r1=cdr (r1); goto vm_if;}
           case cell_symbol_set_x:
             {
-              push_cc (car (cddr (r1)), r1, r0, cell_vm_eval_set_x);
+              push_cc (car (CDDR (r1)), r1, r0, cell_vm_eval_set_x);
               goto eval;
             eval_set_x:
               x = r2;
-              r1 = set_env_x (cadr (x), r1, r0);
+              r1 = set_env_x (CADR (x), r1, r0);
               goto vm_return;
             }
           case cell_vm_macro_expand:
             {
-              push_cc (cadr (r1), r1, r0, cell_vm_return);
+              push_cc (CADR (r1), r1, r0, cell_vm_return);
               goto macro_expand;
             }
           default: {
@@ -752,17 +787,9 @@ eval_apply ()
   SCM expanders;
  macro_expand:
   if (TYPE (r1) == TPAIR
-      && (macro = lookup_macro (car (r1), r0)) != cell_f)
+      && (macro = lookup_macro_ (car (r1), r0)) != cell_f)
     {
       r1 = cons (macro, CDR (r1));
-#if 0
-      fputs ("macro: ", stdout);
-      display_ (macro);
-      fputs ("\n", stdout);
-      fputs ("r1: ", stdout);
-      display_ (r1);
-      fputs ("\n", stdout);
-#endif
       goto apply;
     }
   else if (TYPE (r1) == TPAIR
@@ -784,9 +811,9 @@ eval_apply ()
   while (r1 != cell_nil) {
     if (TYPE (r1) == TPAIR && TYPE (CAR (r1)) == TPAIR)
       {
-        if (caar (r1) == cell_symbol_begin)
-          r1 = append2 (cdar (r1), cdr (r1));
-        else if (caar (r1) == cell_symbol_primitive_load)
+        if (CAAR (r1) == cell_symbol_begin)
+          r1 = append2 (CDAR (r1), cdr (r1));
+        else if (CAAR (r1) == cell_symbol_primitive_load)
           {
             push_cc (cons (cell_symbol_read_input_file, cell_nil), r1, r0, cell_vm_begin_read_input_file);
             goto apply;
@@ -797,11 +824,6 @@ eval_apply ()
     if (CDR (r1) == cell_nil)
       {
         r1 = car (r1);
-#if 0
-        fputs ("begin: ", stdout);
-        display_ (r1);
-        fputs ("\n", stdout);
-#endif
         goto eval;
       }
     push_cc (CAR (r1), r1, r0, cell_vm_begin2);
@@ -821,12 +843,12 @@ eval_apply ()
   r1 = r2;
   if (x != cell_f)
     {
-      r1 = cadr (r1);
+      r1 = CADR (r1);
       goto eval;
     }
-  if (cddr (r1) != cell_nil)
+  if (CDDR (r1) != cell_nil)
     {
-      r1 = car (cddr (r1));
+      r1 = car (CDDR (r1));
       goto eval;
     }
   r1 = cell_unspecified;
@@ -848,7 +870,7 @@ eval_apply ()
  call_with_values2:
   if (TYPE (r1) == TVALUES)
     r1 = CDR (r1);
-  r1 = cons (cadr (r2), r1);
+  r1 = cons (CADR (r2), r1);
   goto apply;
 
  vm_return:
@@ -863,9 +885,9 @@ gc_peek_frame () ///((internal))
 {
   SCM frame = car (g_stack);
   r1 = car (frame);
-  r2 = cadr (frame);
-  r3 = car (cddr (frame));
-  r0 = cadr (cddr (frame));
+  r2 = CADR (frame);
+  r3 = car (CDDR (frame));
+  r0 = CADR (CDDR (frame));
   return frame;
 }
 
@@ -892,76 +914,6 @@ apply (SCM f, SCM x, SCM a) ///((internal))
   return eval_apply ();
 }
 
-SCM
-make_symbol_ (SCM s)
-{
-  g_cells[tmp_num].value = TSYMBOL;
-  SCM x = make_cell (tmp_num, s, 0);
-  g_symbols = cons (x, g_symbols);
-  return x;
-}
-
-SCM
-list_of_char_equal_p (SCM a, SCM b)
-{
-  while (a != cell_nil && b != cell_nil && VALUE (car (a)) == VALUE (car (b))) {
-    assert (TYPE (car (a)) == TCHAR);
-    assert (TYPE (car (b)) == TCHAR);
-    a = cdr (a);
-    b = cdr (b);
-  }
-  return (a == cell_nil && b == cell_nil) ? cell_t : cell_f;
-}
-
-SCM
-lookup_symbol_ (SCM s)
-{
-  SCM x = g_symbols;
-  while (x) {
-    if (list_of_char_equal_p (STRING (car (x)), s) == cell_t) break;
-    x = cdr (x);
-  }
-  if (x) x = car (x);
-  return x;
-}
-
-SCM
-make_symbol (SCM s)
-{
-  SCM x = lookup_symbol_ (s);
-  return x ? x : make_symbol_ (s);
-}
-
-//MINI_MES reader.c
-SCM
-lookup_ (SCM s, SCM a)
-{
-  if (isdigit (VALUE (car (s))) || (VALUE (car (s)) == '-' && cdr (s) != cell_nil)) {
-    SCM p = s;
-    int sign = 1;
-    if (VALUE (car (s)) == '-') {
-      sign = -1;
-      p = cdr (s);
-    }
-    int n = 0;
-    while (p != cell_nil && isdigit (VALUE (car (p)))) {
-      n *= 10;
-      n += VALUE (car (p)) - '0';
-      p = cdr (p);
-    }
-    if (p == cell_nil) return MAKE_NUMBER (n * sign);
-  }
-
-  SCM x = lookup_symbol_ (s);
-  return x ? x : make_symbol_ (s);
-}
-
-SCM
-acons (SCM key, SCM value, SCM alist)
-{
-  return cons (cons (key, value), alist);
-}
-
 void
 make_tmps (struct scm* cells)
 {
@@ -1041,8 +993,6 @@ mes_symbols () ///((internal))
   return a;
 }
 
-#define gputs(x) fputs(x,stdout);
-
 SCM
 mes_builtins (SCM a) ///((internal))
 {
@@ -1051,9 +1001,9 @@ mes_builtins (SCM a) ///((internal))
 #include "posix.i"
 #include "math.i"
 #include "lib.i"
-#include "reader.i"
 #include "vector.i"
 #include "gc.i"
+#include "reader.i"
 
 #include "gc.environment.i"
 #include "lib.environment.i"
@@ -1065,18 +1015,18 @@ mes_builtins (SCM a) ///((internal))
 
   if (g_debug)
     {
-      gputs ("functions: ");
-      gputs (itoa (g_function));
-      gputs ("\n");
+      fputs ("functions: ", stderr);
+      fputs (itoa (g_function), stderr);
+      fputs ("\n", stderr);
       for (int i = 0; i < g_function; i++)
         {
-          gputs ("[");
-          gputs (itoa (i));
-          gputs ("]: ");
-          gputs (g_functions[i].name);
-          gputs ("\n");
+          fputs ("[", stderr);
+          fputs (itoa (i), stderr);
+          fputs ("]: ", stderr);
+          fputs (g_functions[i].name, stderr);
+          fputs ("\n", stderr);
         }
-      gputs ("\n");
+      fputs ("\n", stderr);
     }
 
   return a;
@@ -1128,11 +1078,11 @@ main (int argc, char *argv[])
   for (int i=argc; i; i--) lst = cons (MAKE_STRING (cstring_to_list (argv[i-1])), lst);
   r0 = acons (cell_symbol_argv, lst, r0);
 
+  if (g_debug) {eputs ("program: "); display_error_ (r2); eputs ("\n");}
   push_cc (r2, cell_unspecified, r0, cell_unspecified);
   r3 = cell_vm_begin;
   r1 = eval_apply ();
-  ///stderr_ (r1);
-  display_ (r1);
+  display_error_ (r1);
   fputs ("", stdout);
   gc (g_stack);
 #if __GNUC__
diff --git a/mlibc.c b/mlibc.c
index 89d1d931..562079b6 100644
--- a/mlibc.c
+++ b/mlibc.c
@@ -29,6 +29,10 @@ void write (int fd, char const* s, int n);
 #define O_RDONLY 0
 #define INT_MIN -2147483648
 #define INT_MAX 2147483647
+#define EOF -1
+#define STDIN 0
+#define STDOUT 1
+#define STDERR 2
 
 void
 exit (int code)
@@ -128,12 +132,17 @@ brk (void *p)
   return r;
 }
 
+int
+putc (int c, int fd)
+{
+  write (fd, (char*)&c, 1);
+  return 0;
+}
+
 int
 putchar (int c)
 {
-  //write (STDOUT, s, strlen (s));
-  //int i = write (STDOUT, s, strlen (s));
-  write (1, (char*)&c, 1);
+  write (STDOUT, (char*)&c, 1);
   return 0;
 }
 
@@ -163,11 +172,6 @@ free (void *p)
   //munmap ((void*)p, *n);
 }
 
-#define EOF -1
-#define STDIN 0
-#define STDOUT 1
-#define STDERR 2
-
 size_t
 strlen (char const* s)
 {
@@ -186,16 +190,14 @@ strcmp (char const* a, char const* b)
 int
 eputs (char const* s)
 {
-  //int i = write (STDERR, s, strlen (s));
   int i = strlen (s);
-  write (2, s, i);
+  write (STDERR, s, i);
   return 0;
 }
 
 int
 fputs (char const* s, int fd)
 {
-  //int i = write (fd, s, strlen (s));
   int i = strlen (s);
   write (fd, s, i);
   return 0;
@@ -204,9 +206,8 @@ fputs (char const* s, int fd)
 int
 puts (char const* s)
 {
-  //int i = write (STDOUT, s, strlen (s));
   int i = strlen (s);
-  write (1, s, i);
+  write (STDOUT, s, i);
   return 0;
 }
 
diff --git a/module/mes/base-0.mes b/module/mes/base-0.mes
index b505012d..871a86db 100644
--- a/module/mes/base-0.mes
+++ b/module/mes/base-0.mes
@@ -35,6 +35,11 @@
 (define (primitive-eval e) (core:eval e (current-module)))
 (define eval core:eval)
 
+(define (caar x) (car (car x)))
+(define (cadr x) (car (cdr x)))
+(define (cdar x) (cdr (car x)))
+(define (cddr x) (cdr (cdr x)))
+
 (define-macro (defined? x)
   (list 'assq x '(cddr (current-module))))
 
@@ -107,9 +112,9 @@
   (list 'begin
         (list 'if (list getenv "MES_DEBUG")
               (list 'begin
-                    (list core:stderr "read ")
-                    (list core:stderr file)
-                    (list core:stderr "\n")))
+                    (list core:display-error "read ")
+                    (list core:display-error file)
+                    (list core:display-error "\n")))
      (list 'push! '*input-ports* (list current-input-port))
      (list 'set-current-input-port (list open-input-file file))
      (list 'primitive-load)
diff --git a/module/mes/libc.mes b/module/mes/libc.mes
index 1c381805..d4d500e2 100644
--- a/module/mes/libc.mes
+++ b/module/mes/libc.mes
@@ -151,8 +151,6 @@ ungetc (int c, int fd)
 int
 putchar (int c)
 {
-  //write (STDOUT, s, strlen (s));
-  //int i = write (STDOUT, s, strlen (s));
   write (1, (char*)&c, 1);
   return 0;
 }
@@ -161,14 +159,26 @@ putchar (int c)
                 parse-c99)))
     ast))
 
+(define putc
+  (let* ((ast (with-input-from-string
+                  "
+int
+putc (int c, int fd)
+{
+  write (fd, (char*)&c, 1);
+  return 0;
+}
+"
+;;paredit:"
+                parse-c99)))
+    ast))
+
 (define eputs
   (let* ((ast (with-input-from-string
                   "
 int
 eputs (char const* s)
 {
-  //write (STDERR, s, strlen (s));
-  //write (2, s, strlen (s));
   int i = strlen (s);
   write (2, s, i);
   return 0;
@@ -199,8 +209,6 @@ fputs (char const* s, int fd)
 int
 puts (char const* s)
 {
-  //write (STDOUT, s, strlen (s));
-  //int i = write (STDOUT, s, strlen (s));
   int i = strlen (s);
   write (1, s, i);
   return 0;
@@ -323,6 +331,7 @@ realloc (int *p, int size)
    assert_fail
    ungetc
    putchar
+   putc
    eputs
    fputs
    puts
diff --git a/module/mes/read-0-32.mo b/module/mes/read-0-32.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5ddf8c2a292c781788d4f58fc6e7fd6f2f8a093d
GIT binary patch
literal 80657
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
QEjBXi-oL`E^;O&d03tFJ_W%F@

literal 0
HcmV?d00001

diff --git a/module/mes/read-0.mes b/module/mes/read-0.mes
index 1b2cef47..8cf185a5 100644
--- a/module/mes/read-0.mes
+++ b/module/mes/read-0.mes
@@ -60,14 +60,14 @@
 
   (set! sexp:define
         (lambda (e a)
-          (if (atom? (cadr e)) (cons (cadr e) (core:eval (car (cddr e)) a))
-              (cons (car (cadr e)) (core:eval (cons (quote lambda) (cons (cdr (cadr e)) (cddr e))) a)))))
+          (if (atom? (car (cdr e))) (cons (car (cdr e)) (core:eval (car (cdr (cdr e))) a))
+              (cons (car (car (cdr e))) (core:eval (cons (quote lambda) (cons (cdr (car (cdr e))) (cdr (cdr e)))) a)))))
 
   (set! env:macro
         (lambda (name+entry)
           (cons
            (cons (car name+entry)
-                 (make-cell <cell:macro> (core:car (car name+entry)) (cdr name+entry)))
+                 (core:make-cell <cell:macro> (core:car (car name+entry)) (cdr name+entry)))
            (list))))
 
   (set! cons*
@@ -108,22 +108,22 @@
   (define <cell:keyword> 4)
   (define <cell:string> 10)
 
-  (define (newline . rest) (core:stderr (list->string (list (integer->char 10)))))
-  (define (display x . rest) (core:stderr x))
+  (define (newline . rest) (core:display (list->string (list (integer->char 10)))))
+  (define (display x . rest) core:display)
   
-  (define (list->symbol lst) (make-symbol lst))
+  (define (list->symbol lst) (core:lookup-symbol lst))
 
   (define (symbol->list s)
     (core:car s))
 
   (define (list->string lst)
-    (make-cell <cell:string> lst 0))
+    (core:make-cell <cell:string> lst 0))
 
   (define (integer->char x)
-    (make-cell <cell:character> 0 x))
+    (core:make-cell <cell:character> 0 x))
 
   (define (symbol->keyword s)
-    (make-cell <cell:keyword> (symbol->list s) 0))
+    (core:make-cell <cell:keyword> (symbol->list s) 0))
 
   (define (read)
     (read-word (read-byte) (list) (current-module)))
@@ -140,9 +140,9 @@
   (define-macro (cond . clauses)
     (list (quote if) (pair? clauses)
           (list (quote if) (car (car clauses))
-                (if (pair? (cdar clauses))
-                    (if (eq? (car (cdar clauses)) (quote =>))
-                        (append2 (cdr (cdar clauses)) (list (caar clauses)))
+                (if (pair? (cdr (car clauses)))
+                    (if (eq? (car (cdr (car clauses))) (quote =>))
+                        (append2 (cdr (cdr (car clauses))) (list (car (car clauses))))
                         (list (cons (quote lambda) (cons (list) (car clauses)))))
                     (list (cons (quote lambda) (cons (list) (car clauses)))))
                 (if (pair? (cdr clauses))
@@ -269,7 +269,16 @@
         (cons (f (car lst)) (map1 f (cdr lst)))))
 
   (define (lookup w a)
-    (core:lookup (map1 integer->char w) a))
+    (define (lookup-number c p s n)
+      (and (> c 47) (< c 58)
+           (if (null? p) (* s (+ (* n 10) (- c 48)))
+               (lookup-number (car p) (cdr p) s (+ (* n 10) (- c 48))))))
+    ((lambda (c p)
+       (or (cond ((and (> c 47) (< c 58)) (lookup-number c p 1 0))
+                 ((and (eq? c 45) (pair? p)) (lookup-number (car p) (cdr p) -1 0))
+                 (#t #f))
+           (core:lookup-symbol (map1 integer->char w))))
+     (car w) (cdr w)))
 
   (define (read-hash c w a)
     (cond
diff --git a/module/mes/type-0.mes b/module/mes/type-0.mes
index 9ed66256..af2f3e1e 100644
--- a/module/mes/type-0.mes
+++ b/module/mes/type-0.mes
@@ -120,14 +120,14 @@
 
 ;;; core: accessors
 (define (string . lst)
-  (make-cell <cell:string> lst 0))
+  (core:make-cell <cell:string> lst 0))
 
 (define (string->list s)
   (core:car s))
 
 (define (string->symbol s)
   (if (not (pair? (core:car s))) '()
-      (make-symbol (core:car s))))
+      (core:lookup-symbol (core:car s))))
 
 (define (symbol->list s)
   (core:car s))
@@ -142,7 +142,7 @@
   (apply string (apply append (map1 string->list rest))))
 
 (define (integer->char x)
-  (make-cell <cell:character> 0 x))
+  (core:make-cell <cell:character> 0 x))
 
 (define (char->integer x)
-  (make-cell <cell:number> 0 x))
+  (core:make-cell <cell:number> 0 x))
diff --git a/posix.c b/posix.c
index 045eb1c4..924b5a69 100644
--- a/posix.c
+++ b/posix.c
@@ -97,139 +97,6 @@ string_to_cstring (SCM s)
   return buf;
 }
 
-int g_depth;
-
-SCM
-display_helper (SCM x, int cont, char* sep)
-{
-  gputs (sep);
-  if (g_depth == 0) return cell_unspecified;
-  //FIXME:
-  //g_depth--;
-  g_depth = g_depth - 1;
-  
-  // eputs ("<display>\n");
-  switch (TYPE (x))
-    {
-    case TCHAR:
-      {
-        //gputs ("<char>\n");
-        gputs ("#\\");
-        putchar (VALUE (x));
-        break;
-      }
-    case TFUNCTION:
-      {
-        gputs ("#<procedure ");
-        ///gputs (FUNCTION (x).name ? FUNCTION (x).name : "?");
-        char *p = "?";
-        if (FUNCTION (x).name != 0)
-          p = FUNCTION (x).name;
-        gputs (p);
-        gputs ("[");
-        gputs (itoa (CDR (x)));
-        gputs (",");
-        gputs (itoa (x));
-        gputs ("]>");
-        break;
-      }
-    case TMACRO:
-      {
-        gputs ("#<macro ");
-        display_helper (cdr (x), cont, "");
-        gputs (">");
-        break;
-      }
-    case TNUMBER:
-      {
-        //gputs ("<number>\n");
-        gputs (itoa (VALUE (x)));
-        break;
-      }
-    case TPAIR:
-      {
-        if (!cont) gputs ("(");
-        if (x && x != cell_nil) display_ (CAR (x));
-        if (CDR (x) && TYPE (CDR (x)) == TPAIR)
-          display_helper (CDR (x), 1, " ");
-        else if (CDR (x) && CDR (x) != cell_nil)
-          {
-            if (TYPE (CDR (x)) != TPAIR)
-              gputs (" . ");
-            display_ (CDR (x));
-          }
-        if (!cont) gputs (")");
-        break;
-      }
-    case TSPECIAL:
-#if __NYACC__
-      // FIXME
-      //{}
-      {
-        SCM t = CAR (x);
-        while (t && t != cell_nil)
-          {
-            putchar (VALUE (CAR (t)));
-            t = CDR (t);
-          }
-        break;
-      }
-#endif
-    case TSTRING:
-#if __NYACC__
-      // FIXME
-      {}
-#endif
-    case TSYMBOL:
-      {
-        SCM t = CAR (x);
-        while (t && t != cell_nil)
-          {
-            putchar (VALUE (CAR (t)));
-            t = CDR (t);
-          }
-        break;
-      }
-    default:
-      {
-        //gputs ("<default>\n");
-        gputs ("<");
-        gputs (itoa (TYPE (x)));
-        gputs (":");
-        gputs (itoa (x));
-        gputs (">");
-        break;
-      }
-    }
-  return 0;
-}
-
-SCM
-display_ (SCM x)
-{
-  g_depth = 5;
-  return display_helper (x, 0, "");
-}
-
-SCM
-stderr_ (SCM x)
-{
-  SCM write;
-  if (TYPE (x) == TSTRING)
-    eputs (string_to_cstring (x));
-#if __GNUC__
-  else if ((write = assq_ref_env (cell_symbol_write, r0)) != cell_undefined)
-    apply (assq_ref_env (cell_symbol_display, r0), cons (x, cons (MAKE_NUMBER (2), cell_nil)), r0);
-#endif
-  else if (TYPE (x) == TSPECIAL || TYPE (x) == TSTRING || TYPE (x) == TSYMBOL)
-    eputs (string_to_cstring (x));
-  else if (TYPE (x) == TNUMBER)
-    eputs (itoa (VALUE (x)));
-  else
-    eputs ("core:stderr: display undefined\n");
-  return cell_unspecified;
-}
-
 SCM
 getenv_ (SCM s) ///((name . "getenv"))
 {
diff --git a/reader.c b/reader.c
index 842f3f6b..ee09e365 100644
--- a/reader.c
+++ b/reader.c
@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * Mes --- Maxwell Equations of Software
- * Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of Mes.
  *
@@ -18,6 +18,11 @@
  * along with Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+SCM
+___end_of_mes___ ()
+{
+  return 0;
+}
 
 SCM
 read_input_file_env_ (SCM e, SCM a)
@@ -86,26 +91,24 @@ read_env (SCM a)
   return read_word (getchar (), cell_nil, a);
 }
 
-//MINI_MES
-// SCM
-// lookup_ (SCM s, SCM a)
-// {
-//   if (isdigit (VALUE (car (s))) || (VALUE (car (s)) == '-' && cdr (s) != cell_nil)) {
-//     SCM p = s;
-//     int sign = 1;
-//     if (VALUE (car (s)) == '-') {
-//       sign = -1;
-//       p = cdr (s);
-//     }
-//     int n = 0;
-//     while (p != cell_nil && isdigit (VALUE (car (p)))) {
-//       n *= 10;
-//       n += VALUE (car (p)) - '0';
-//       p = cdr (p);
-//     }
-//     if (p == cell_nil) return MAKE_NUMBER (n * sign);
-//   }
+SCM
+lookup_ (SCM s, SCM a)
+{
+  if (isdigit (VALUE (car (s))) || (VALUE (car (s)) == '-' && cdr (s) != cell_nil)) {
+    SCM p = s;
+    int sign = 1;
+    if (VALUE (car (s)) == '-') {
+      sign = -1;
+      p = cdr (s);
+    }
+    int n = 0;
+    while (p != cell_nil && isdigit (VALUE (car (p)))) {
+      n *= 10;
+      n += VALUE (car (p)) - '0';
+      p = cdr (p);
+    }
+    if (p == cell_nil) return MAKE_NUMBER (n * sign);
+  }
 
-//   SCM x = lookup_symbol_ (s);
-//   return x ? x : make_symbol_ (s);
-// }
+  return lookup_symbol_ (s);
+}
diff --git a/scaffold/cons-mes.c b/scaffold/cons-mes.c
index 94d21ece..5c3d6d76 100644
--- a/scaffold/cons-mes.c
+++ b/scaffold/cons-mes.c
@@ -26,17 +26,6 @@
 #define MES_MINI 1
 #define FIXED_PRIMITIVES 0
 
-#if __GNUC__
-#define FIXME_NYACC 1
-#define  __NYACC__ 0
-#define NYACC_CAR
-#define NYACC_CDR
-#else
-#define  __NYACC__ 1
-#define NYACC_CAR nyacc_car
-#define NYACC_CDR nyacc_cdr
-#endif
-
 char arena[2000];
 //char buf0[400];
 
@@ -59,11 +48,7 @@ SCM r2 = 0;
 // continuation
 SCM r3 = 0;
 
-#if __NYACC__ || FIXME_NYACC
-enum type_t {CHAR, CLOSURE, CONTINUATION, TFUNCTION, KEYWORD, MACRO, NUMBER, PAIR, REF, SPECIAL, TSTRING, SYMBOL, VALUES, TVECTOR, BROKEN_HEART};
-#else
-enum type_t {CHAR, CLOSURE, CONTINUATION, FUNCTION, KEYWORD, MACRO, NUMBER, PAIR, REF, SPECIAL, STRING, SYMBOL, VALUES, VECTOR, BROKEN_HEART};
-#endif
+enum type_t {CHAR, CLOSURE, CONTINUATION, TFUNCTION, KEYWORD, MACRO, NUMBER, PAIR, REF, SPECIAL, STRING, SYMBOL, VALUES, VECTOR, BROKEN_HEART};
 
 struct scm {
   enum type_t type;
@@ -117,11 +102,11 @@ struct function g_functions[5];
 int g_function = 0;
 
 
-SCM make_cell (SCM type, SCM car, SCM cdr);
-struct function fun_make_cell = {&make_cell,3,"make-cell"};
-struct scm scm_make_cell = {TFUNCTION,0,0};
-   //, "make-cell", 0};
-SCM cell_make_cell;
+SCM make_cell_ (SCM type, SCM car, SCM cdr);
+struct function fun_make_cell_ = {&make_cell_,3,"core:make-cell"};
+struct scm scm_make_cell_ = {TFUNCTION,0,0};
+   //, "core:make-cell", 0};
+SCM cell_make_cell_;
 
 SCM cons (SCM x, SCM y);
 struct function fun_cons = {&cons,2,"cons"};
@@ -153,38 +138,21 @@ SCM cell_cdr;
 #define STRING(x) g_cells[x].car
 
 #define CDR(x) g_cells[x].cdr
-#if __GNUC__
-//#define CLOSURE(x) g_cells[x].closure
-#endif
 #define CONTINUATION(x) g_cells[x].cdr
-#if __GNUC__
-//#define FUNCTION(x) g_functions[g_cells[x].function]
-#endif
 
 #define FUNCTION(x) g_functions[g_cells[x].cdr]
 #define VALUE(x) g_cells[x].cdr
 #define VECTOR(x) g_cells[x].cdr
 
-#define MAKE_CHAR(n) make_cell (tmp_num_ (CHAR), 0, tmp_num2_ (n))
-//#define MAKE_CONTINUATION(n) make_cell (tmp_num_ (CONTINUATION), n, g_stack)
-#define MAKE_NUMBER(n) make_cell (tmp_num_ (NUMBER), 0, tmp_num2_ (n))
-//#define MAKE_REF(n) make_cell (tmp_num_ (REF), n, 0)
-
+#define MAKE_CHAR(n) make_cell_ (tmp_num_ (CHAR), 0, tmp_num2_ (n))
+#define MAKE_NUMBER(n) make_cell_ (tmp_num_ (NUMBER), 0, tmp_num2_ (n))
 
 #define CAAR(x) CAR (CAR (x))
-// #define CDAR(x) CDR (CAR (x))
 #define CADAR(x) CAR (CDR (CAR (x)))
-// #define CADDR(x) CAR (CDR (CDR (x)))
-// #define CDDDR(x) CDR (CDR (CDR (x)))
 #define CDADAR(x) CAR (CDR (CAR (CDR (x))))
 #define CADR(x) CAR (CDR (x))
 
-
-#if __NYACC__ || FIXME_NYACC
-#define MAKE_STRING(x) make_cell (tmp_num_ (TSTRING), x, 0)
-// #else
-// #define MAKE_STRING(x) make_cell (tmp_num_ (STRING), x, 0)
-#endif
+#define MAKE_STRING(x) make_cell_ (tmp_num_ (TSTRING), x, 0)
 
 SCM
 alloc (int n)
@@ -196,7 +164,7 @@ alloc (int n)
 }
 
 SCM
-make_cell (SCM type, SCM car, SCM cdr)
+make_cell_ (SCM type, SCM car, SCM cdr)
 {
   SCM x = alloc (1);
   assert (TYPE (type) == NUMBER);
@@ -239,7 +207,7 @@ cons (SCM x, SCM y)
   puts ("\n");
 #endif
   VALUE (tmp_num) = PAIR;
-  return make_cell (tmp_num, x, y);
+  return make_cell_ (tmp_num, x, y);
 }
 
 SCM
@@ -464,7 +432,7 @@ SCM
 make_symbol_ (SCM s)
 {
   VALUE (tmp_num) = SYMBOL;
-  SCM x = make_cell (tmp_num, s, 0);
+  SCM x = make_cell_ (tmp_num, s, 0);
   g_symbols = cons (x, g_symbols);
   return x;
 }
@@ -584,7 +552,7 @@ g_free++;
 SCM
 make_closure (SCM args, SCM body, SCM a)
 {
-  return make_cell (tmp_num_ (CLOSURE), cell_f, cons (cons (cell_circular, a), cons (args, body)));
+  return make_cell_ (tmp_num_ (CLOSURE), cell_f, cons (cons (cell_circular, a), cons (args, body)));
 }
 
 SCM
@@ -614,10 +582,10 @@ mes_builtins (SCM a)
 // #include "posix.environment.i"
 // #include "reader.environment.i"
 #else
-scm_make_cell.cdr = g_function;
-g_functions[g_function++] = fun_make_cell;
-cell_make_cell = g_free++;
- g_cells[cell_make_cell] = scm_make_cell;
+scm_make_cell_.cdr = g_function;
+g_functions[g_function++] = fun_make_cell_;
+cell_make_cell_ = g_free++;
+ g_cells[cell_make_cell_] = scm_make_cell_;
  
 scm_cons.cdr = g_function;
 g_functions[g_function++] = fun_cons;
@@ -687,7 +655,7 @@ fill ()
 
   TYPE (11) = TFUNCTION;
   CAR (11) = 0x58585858;
-  // 0 = make_cell
+  // 0 = make_cell_
   // 1 = cons
   // 2 = car
   CDR (11) = 1;
@@ -729,7 +697,7 @@ display_ (SCM x)
       {
         //puts ("<function>\n");
         if (VALUE (x) == 0)
-          puts ("make-cell");
+          puts ("core:make-cell");
         if (VALUE (x) == 1)
           puts ("cons");
         if (VALUE (x) == 2)
@@ -934,49 +902,6 @@ simple_bload_env (SCM a) ///((internal))
   return r2;
 }
 
-char string_to_cstring_buf[1024];
-char const*
-string_to_cstring (SCM s)
-{
-  //static char buf[1024];
-  //char *p = buf;
-  char *p = string_to_cstring_buf;
-  s = STRING(s);
-  while (s != cell_nil)
-    {
-      *p++ = VALUE (car (s));
-      s = cdr (s);
-    }
-  *p = 0;
-  //return buf;
-  return string_to_cstring_buf;
-}
-
-SCM
-stderr_ (SCM x)
-{
-  //SCM write;
-#if __NYACC__ || FIXME_NYACC
-  if (TYPE (x) == TSTRING)
-// #else
-//   if (TYPE (x) == STRING)
-#endif
-    eputs (string_to_cstring (x));
-  // else if ((write = assq_ref_env (cell_symbol_write, r0)) != cell_undefined)
-  //   apply (assq_ref_env (cell_symbol_display, r0), cons (x, cons (MAKE_NUMBER (2), cell_nil)), r0);
-#if __NYACC__ || FIXME_NYACC
-  else if (TYPE (x) == SPECIAL || TYPE (x) == TSTRING || TYPE (x) == SYMBOL)
-// #else
-//   else if (TYPE (x) == SPECIAL || TYPE (x) == STRING || TYPE (x) == SYMBOL)
-#endif
-    eputs (string_to_cstring (x));
-  else if (TYPE (x) == NUMBER)
-    eputs (itoa (VALUE (x)));
-  else
-    eputs ("display: undefined\n");
-  return cell_unspecified;
-}
-
 int
 main (int argc, char *argv[])
 {
diff --git a/scaffold/micro-mes.c b/scaffold/micro-mes.c
index d0be018a..6304c0ea 100644
--- a/scaffold/micro-mes.c
+++ b/scaffold/micro-mes.c
@@ -26,16 +26,6 @@
 
 #define MES_MINI 1
 
-#if __GNUC__
-#define  __NYACC__ 0
-#define NYACC
-#define NYACC2
-#else
-#define  __NYACC__ 1
-#define NYACC nyacc
-#define NYACC2 nyacc2
-#endif
-
 typedef int SCM;
 
 #if __GNUC__
@@ -91,7 +81,6 @@ main (int argc, char *argv[])
   push_cc (r2, cell_unspecified, r0, cell_unspecified);
   r3 = cell_vm_begin;
   r1 = eval_apply ();
-  stderr_ (r1);
 
   eputs ("\n");
   gc (g_stack);
diff --git a/scaffold/mini-mes.c b/scaffold/mini-mes.c
index 8ab0a706..d3b85db2 100644
--- a/scaffold/mini-mes.c
+++ b/scaffold/mini-mes.c
@@ -23,28 +23,9 @@
 #endif
 #define assert(x) ((x) ? (void)0 : assert_fail (#x))
 
-#if __MESC__
-//void *g_malloc_base = 0;
-char *g_malloc_base = 0;
-// int ungetc_char = -1;
-// char ungetc_buf[2];
-#endif
-
 #define MES_MINI 1
 #define FIXED_PRIMITIVES 1
 
-#if __GNUC__
-#define FIXME_NYACC 1
-#define  __NYACC__ 0
-#define NYACC_CAR
-#define NYACC_CDR
-#else
-#define  __NYACC__ 1
-#define NYACC_CAR nyacc_car
-#define NYACC_CDR nyacc_cdr
-#endif
-
-
 //int ARENA_SIZE = 4000000;
 int ARENA_SIZE = 1000000000;
 char *arena = 0;
@@ -80,16 +61,14 @@ struct function {
   char *name;
 };
 
-//struct scm *g_cells = arena;
-int *foobar = 0;
 #if __GNUC__
-struct scm *g_cells;
-#else
-struct scm *g_cells = foobar;
-#endif
-
-//FIXME
+struct scm *g_cells = 0;
 //struct scm *g_news = 0;
+#else
+int *foobar = 0;
+struct scm *g_cells = foobar;
+//struct scm *g_news = foobar;
+#endif
 
 struct scm scm_nil = {TSPECIAL, "()",0};
 struct scm scm_f = {TSPECIAL, "#f",0};
@@ -201,29 +180,24 @@ int g_function = 0;
 #define VALUE(x) g_cells[x].cdr
 #define VECTOR(x) g_cells[x].cdr
 
-#define MAKE_CHAR(n) make_cell (tmp_num_ (TCHAR), 0, tmp_num2_ (n))
-#define MAKE_CONTINUATION(n) make_cell (tmp_num_ (TCONTINUATION), n, g_stack)
-#define MAKE_NUMBER(n) make_cell (tmp_num_ (TNUMBER), 0, tmp_num2_ (n))
-//#define MAKE_REF(n) make_cell (tmp_num_ (REF), n, 0)
-
+#define MAKE_CHAR(n) make_cell_ (tmp_num_ (TCHAR), 0, tmp_num2_ (n))
+#define MAKE_CONTINUATION(n) make_cell_ (tmp_num_ (TCONTINUATION), n, g_stack)
+#define MAKE_NUMBER(n) make_cell_ (tmp_num_ (TNUMBER), 0, tmp_num2_ (n))
 
 #define CAAR(x) CAR (CAR (x))
+#define CADR(x) CAR (CDR (x))
 #define CDAR(x) CDR (CAR (x))
+#define CDDR(x) CDR (CDR (x))
 #define CADAR(x) CAR (CDR (CAR (x)))
 #define CADDR(x) CAR (CDR (CDR (x)))
-// #define CDDDR(x) CDR (CDR (CDR (x)))
 #define CDADAR(x) CAR (CDR (CAR (CDR (x))))
-#define CADR(x) CAR (CDR (x))
 
-#define MAKE_STRING(x) make_cell (tmp_num_ (TSTRING), x, 0)
+#define MAKE_STRING(x) make_cell_ (tmp_num_ (TSTRING), x, 0)
 
 SCM
 alloc (int n)
 {
-#if 1
-  //__GNUC__
   assert (g_free + n < ARENA_SIZE);
-#endif
   SCM x = g_free;
   g_free += n;
   return x;
@@ -232,7 +206,21 @@ alloc (int n)
 #define DEBUG 0
 
 SCM
-make_cell (SCM type, SCM car, SCM cdr)
+tmp_num_ (int x)
+{
+  VALUE (tmp_num) = x;
+  return tmp_num;
+}
+
+SCM
+tmp_num2_ (int x)
+{
+  VALUE (tmp_num2) = x;
+  return tmp_num2;
+}
+
+SCM
+make_cell_ (SCM type, SCM car, SCM cdr)
 {
   SCM x = alloc (1);
 #if __GNUC__
@@ -254,25 +242,84 @@ make_cell (SCM type, SCM car, SCM cdr)
   return x;
 }
 
+
 SCM
-tmp_num_ (int x)
+make_symbol_ (SCM s) ///((internal))
 {
-  VALUE (tmp_num) = x;
-  return tmp_num;
+  VALUE (tmp_num) = TSYMBOL;
+  SCM x = make_cell_ (tmp_num, s, 0);
+  g_symbols = cons (x, g_symbols);
+  return x;
 }
 
 SCM
-tmp_num2_ (int x)
+lookup_symbol_ (SCM s)
 {
-  VALUE (tmp_num2) = x;
-  return tmp_num2;
+  SCM x = g_symbols;
+  while (x) {
+    //if (list_of_char_equal_p (STRING (car (x)), s) == cell_t) break;
+    if (list_of_char_equal_p (STRING (car (x)), s) == cell_t) goto dun;
+    x = cdr (x);
+  }
+ dun:
+  if (x) x = car (x);
+  if (!x) x = make_symbol_ (s);
+  return x;
+}
+
+SCM
+list_of_char_equal_p (SCM a, SCM b) ///((internal))
+{
+  while (a != cell_nil && b != cell_nil && VALUE (car (a)) == VALUE (car (b))) {
+#if __GNUC__
+    assert (TYPE (car (a)) == TCHAR);
+    assert (TYPE (car (b)) == TCHAR);
+#endif
+    a = cdr (a);
+    b = cdr (b);
+  }
+  return (a == cell_nil && b == cell_nil) ? cell_t : cell_f;
+}
+
+SCM
+type_ (SCM x)
+{
+  return MAKE_NUMBER (TYPE (x));
+}
+
+SCM
+car_ (SCM x)
+{
+  return (TYPE (x) != TCONTINUATION
+          && (TYPE (CAR (x)) == TPAIR // FIXME: this is weird
+              || TYPE (CAR (x)) == TREF
+              || TYPE (CAR (x)) == TSPECIAL
+              || TYPE (CAR (x)) == TSYMBOL
+              || TYPE (CAR (x)) == TSTRING)) ? CAR (x) : MAKE_NUMBER (CAR (x));
+}
+
+SCM
+cdr_ (SCM x)
+{
+  return (TYPE (CDR (x)) == TPAIR
+          || TYPE (CDR (x)) == TREF
+          || TYPE (CAR (x)) == TSPECIAL
+          || TYPE (CDR (x)) == TSYMBOL
+          || TYPE (CDR (x)) == TSTRING) ? CDR (x) : MAKE_NUMBER (CDR (x));
+}
+
+SCM
+arity_ (SCM x)
+{
+  assert (TYPE (x) == TFUNCTION);
+  return MAKE_NUMBER (FUNCTION (x).arity);
 }
 
 SCM
 cons (SCM x, SCM y)
 {
   VALUE (tmp_num) = TPAIR;
-  return make_cell (tmp_num, x, y);
+  return make_cell_ (tmp_num, x, y);
 }
 
 SCM
@@ -325,30 +372,17 @@ eq_p (SCM x, SCM y)
 }
 
 SCM
-type_ (SCM x)
+values (SCM x) ///((arity . n))
 {
-  return MAKE_NUMBER (TYPE (x));
+  SCM v = cons (0, x);
+  TYPE (v) = TVALUES;
+  return v;
 }
 
 SCM
-car_ (SCM x)
+acons (SCM key, SCM value, SCM alist)
 {
-  return (TYPE (x) != TCONTINUATION
-          && (TYPE (CAR (x)) == TPAIR // FIXME: this is weird
-              || TYPE (CAR (x)) == TREF
-              || TYPE (CAR (x)) == TSPECIAL
-              || TYPE (CAR (x)) == TSYMBOL
-              || TYPE (CAR (x)) == TSTRING)) ? CAR (x) : MAKE_NUMBER (CAR (x));
-}
-
-SCM
-cdr_ (SCM x)
-{
-  return (TYPE (CDR (x)) == TPAIR
-          || TYPE (CDR (x)) == TREF
-          || TYPE (CAR (x)) == TSPECIAL
-          || TYPE (CDR (x)) == TSYMBOL
-          || TYPE (CDR (x)) == TSTRING) ? CDR (x) : MAKE_NUMBER (CDR (x));
+  return cons (cons (key, value), alist);
 }
 
 SCM
@@ -370,7 +404,9 @@ error (SCM key, SCM x)
   SCM throw;
   if ((throw = assq_ref_env (cell_symbol_throw, r0)) != cell_undefined)
     return apply (throw, cons (key, cons (x, cell_nil)), r0);
-  eputs ("error");
+  display_ (key);
+  puts (": ");
+  display_ (x);
   assert (0);
 }
 
@@ -380,7 +416,7 @@ assert_defined (SCM x, SCM e) ///((internal))
   if (e != cell_undefined) return e;
   // error (cell_symbol_unbound_variable, x);
   eputs ("unbound variable: ");
-  display_ (x);
+  display_error_ (x);
   eputs ("\n");
   exit (33);
   return e;
@@ -416,7 +452,7 @@ check_formals (SCM f, SCM formals, SCM args) ///((internal))
       eputs (", got: ");
       eputs (itoa (alen));
       eputs ("\n");
-      display_ (f);
+      display_error_ (f);
       SCM e = MAKE_STRING (cstring_to_list (buf));
       return error (cell_symbol_wrong_number_of_args, cons (e, f));
     }
@@ -443,12 +479,12 @@ check_apply (SCM f, SCM e) ///((internal))
       char buf = "TODO:check_apply";
       // sprintf (buf, "cannot apply: %s:", type);
       // fprintf (stderr, " [");
-      // stderr_ (e);
+      // display_error_ (e);
       // fprintf (stderr, "]\n");
       eputs ("cannot apply: ");
       eputs (type);
       eputs ("[");
-      display_ (e);
+      display_error_ (e);
       eputs ("]\n");
       SCM e = MAKE_STRING (cstring_to_list (buf));
       return error (cell_symbol_wrong_type_arg, cons (e, f));
@@ -504,18 +540,12 @@ call (SCM fn, SCM x)
   if ((FUNCTION (fn).arity > 1 || FUNCTION (fn).arity == -1)
       && x != cell_nil && TYPE (CDR (x)) == TPAIR && TYPE (CADR (x)) == TVALUES)
     x = cons (CAR (x), cons (CDADAR (x), CDR (x)));
-#if 0
-  eputs ("call: ");
-  if (FUNCTION (fn).name) eputs (FUNCTION (fn).name);
-  else eputs (itoa (CDR (fn)));
-  eputs ("\n");
-#endif
   switch (FUNCTION (fn).arity)
     {
     case 0: {return (FUNCTION (fn).function) ();}
-    case 1: {return ((SCM(*)(SCM))(FUNCTION (fn).function)) (car (x));}
-    case 2: {return ((SCM(*)(SCM,SCM))(FUNCTION (fn).function)) (car (x), cadr (x));}
-    case 3: {return ((SCM(*)(SCM,SCM,SCM))(FUNCTION (fn).function)) (car (x), cadr (x), car (cddr (x)));}
+    case 1: {return ((SCM(*)(SCM))(FUNCTION (fn).function)) (CAR (x));}
+    case 2: {return ((SCM(*)(SCM,SCM))(FUNCTION (fn).function)) (CAR (x), CADR (x));}
+    case 3: {return ((SCM(*)(SCM,SCM,SCM))(FUNCTION (fn).function)) (CAR (x), CADR (x), car (CDDR (x)));}
     case -1: {return ((SCM(*)(SCM))(FUNCTION (fn).function)) (x);}
     default: {return ((SCM(*)(SCM))(FUNCTION (fn).function)) (x);}
     }
@@ -577,29 +607,17 @@ call_lambda (SCM e, SCM x, SCM aa, SCM a) ///((internal))
 }
 
 SCM
-make_closure (SCM args, SCM body, SCM a)
+make_closure_ (SCM args, SCM body, SCM a) ///((internal))
 {
-  return make_cell (tmp_num_ (TCLOSURE), cell_f, cons (cons (cell_circular, a), cons (args, body)));
+  return make_cell_ (tmp_num_ (TCLOSURE), cell_f, cons (cons (cell_circular, a), cons (args, body)));
 }
 
 SCM
-lookup_macro (SCM x, SCM a)
+lookup_macro_ (SCM x, SCM a) ///((internal))
 {
   if (TYPE (x) != TSYMBOL) return cell_f;
   SCM m = assq_ref_env (x, a);
-#if 0
-  if (TYPE (m) == TMACRO)
-    {
-      fputs ("XXmacro: ", 1);
-      fputs ("[", 1);
-      fputs (itoa (m), 1);
-      fputs ("]: ", 1);
-      display_ (m);
-      fputs ("\n", 1);
-
-    }
-#endif
-  if (TYPE (m) == TMACRO) return MACRO (m);
+ if (TYPE (m) == TMACRO) return MACRO (m);
   return cell_f;
 }
 
@@ -616,11 +634,6 @@ push_cc (SCM p1, SCM p2, SCM a, SCM c) ///((internal))
   return cell_unspecified;
 }
 
-SCM caar (SCM x) {return car (car (x));}
-SCM cadr (SCM x) {return car (cdr (x));}
-SCM cdar (SCM x) {return cdr (car (x));}
-SCM cddr (SCM x) {return cdr (cdr (x));}
-
 SCM gc_pop_frame (); //((internal))
 
 SCM
@@ -684,13 +697,13 @@ eval_apply ()
     }
     case TCLOSURE:
       {
-        SCM cl = CLOSURE (car (r1));
-        SCM formals = cadr (cl);
-        SCM body = cddr (cl);
-        SCM aa = cdar (cl);
-        aa = cdr (aa);
-        check_formals (car (r1), formals, cdr (r1));
-        SCM p = pairlis (formals, cdr (r1), aa);
+        SCM cl = CLOSURE (CAR (r1));
+        SCM formals = CADR (cl);
+        SCM body = CDDR (cl);
+        SCM aa = CDAR (cl);
+        aa = CDR (aa);
+        check_formals (CAR (r1), formals, CDR (r1));
+        SCM p = pairlis (formals, CDR (r1), aa);
         call_lambda (body, p, aa, r0);
         goto begin;
       }
@@ -699,7 +712,7 @@ eval_apply ()
           x = r1;
           g_stack = CONTINUATION (CAR (r1));
           gc_pop_frame ();
-          r1 = cadr (x);
+          r1 = CADR (x);
           goto eval_apply;
         }
     case TSPECIAL:
@@ -740,12 +753,12 @@ eval_apply ()
       }
     case TPAIR:
       {
-        switch (caar (r1))
+        switch (CAAR (r1))
           {
           case cell_symbol_lambda:
             {
-              SCM formals = cadr (car (r1));
-              SCM body = cddr (car (r1));
+              SCM formals = CADR (car (r1));
+              SCM body = CDDR (car (r1));
               SCM p = pairlis (formals, cdr (r1), r0);
               check_formals (r1, formals, cdr (r1));
               call_lambda (body, p, p, r0);
@@ -799,27 +812,27 @@ eval_apply ()
 #endif // FIXED_PRIMITIVES
           case cell_symbol_quote:
             {
-              x = r1; gc_pop_frame (); r1 = cadr (x); goto eval_apply;
+              x = r1; gc_pop_frame (); r1 = CADR (x); goto eval_apply;
             }
           case cell_symbol_begin: goto begin;
           case cell_symbol_lambda:
             {
-              r1 = make_closure (cadr (r1), cddr (r1), assq (cell_closure, r0));
+              r1 = make_closure_ (CADR (r1), CDDR (r1), assq (cell_closure, r0));
               goto vm_return;
             }
           case cell_symbol_if: {r1=cdr (r1); goto vm_if;}
           case cell_symbol_set_x:
             {
-              push_cc (car (cddr (r1)), r1, r0, cell_vm_eval_set_x);
+              push_cc (car (CDDR (r1)), r1, r0, cell_vm_eval_set_x);
               goto eval;
             eval_set_x:
               x = r2;
-              r1 = set_env_x (cadr (x), r1, r0);
+              r1 = set_env_x (CADR (x), r1, r0);
               goto vm_return;
             }
           case cell_vm_macro_expand:
             {
-              push_cc (cadr (r1), r1, r0, cell_vm_return);
+              push_cc (CADR (r1), r1, r0, cell_vm_return);
               goto macro_expand;
             }
           default: {
@@ -855,17 +868,9 @@ eval_apply ()
   SCM expanders;
  macro_expand:
   if (TYPE (r1) == TPAIR
-      && (macro = lookup_macro (car (r1), r0)) != cell_f)
+      && (macro = lookup_macro_ (car (r1), r0)) != cell_f)
     {
       r1 = cons (macro, CDR (r1));
-#if 0
-      puts ("macro: ");
-      display_ (macro);
-      puts ("\n");
-      puts ("r1: ");
-      display_ (r1);
-      puts ("\n");
-#endif
       goto apply;
     }
   else if (TYPE (r1) == TPAIR
@@ -886,9 +891,9 @@ eval_apply ()
   while (r1 != cell_nil) {
     if (TYPE (r1) == TPAIR && TYPE (CAR (r1)) == TPAIR)
       {
-        if (caar (r1) == cell_symbol_begin)
-          r1 = append2 (cdar (r1), cdr (r1));
-        else if (caar (r1) == cell_symbol_primitive_load)
+        if (CAAR (r1) == cell_symbol_begin)
+          r1 = append2 (CDAR (r1), cdr (r1));
+        else if (CAAR (r1) == cell_symbol_primitive_load)
           {
             push_cc (cons (cell_symbol_read_input_file, cell_nil), r1, r0, cell_vm_begin_read_input_file);
             goto apply;
@@ -899,11 +904,6 @@ eval_apply ()
     if (CDR (r1) == cell_nil)
       {
         r1 = car (r1);
-#if 0
-        puts ("begin: ");
-        display_ (r1);
-        puts ("\n");
-#endif
         goto eval;
       }
     push_cc (CAR (r1), r1, r0, cell_vm_begin2);
@@ -923,12 +923,12 @@ eval_apply ()
   r1 = r2;
   if (x != cell_f)
     {
-      r1 = cadr (r1);
+      r1 = CADR (r1);
       goto eval;
     }
-  if (cddr (r1) != cell_nil)
+  if (CDDR (r1) != cell_nil)
     {
-      r1 = car (cddr (r1));
+      r1 = car (CDDR (r1));
       goto eval;
     }
   r1 = cell_unspecified;
@@ -956,7 +956,7 @@ eval_apply ()
  call_with_values2:
   if (TYPE (r1) == TVALUES)
     r1 = CDR (r1);
-  r1 = cons (cadr (r2), r1);
+  r1 = cons (CADR (r2), r1);
   goto apply;
 
  vm_return:
@@ -969,11 +969,11 @@ eval_apply ()
 SCM
 gc_peek_frame () ///((internal))
 {
-  SCM frame = car (g_stack);
-  r1 = car (frame);
-  r2 = cadr (frame);
-  r3 = car (cddr (frame));
-  r0 = cadr (cddr (frame));
+  SCM frame = CAR (g_stack);
+  r1 = CAR (frame);
+  r2 = CADR (frame);
+  r3 = CAR (CDDR (frame));
+  r0 = CADR (CDDR (frame));
   return frame;
 }
 
@@ -1009,86 +1009,6 @@ make_tmps (struct scm* cells)
   return 0;
 }
 
-SCM
-make_symbol_ (SCM s)
-{
-  VALUE (tmp_num) = TSYMBOL;
-  SCM x = make_cell (tmp_num, s, 0);
-  g_symbols = cons (x, g_symbols);
-  return x;
-}
-
-SCM
-list_of_char_equal_p (SCM a, SCM b)
-{
-  while (a != cell_nil && b != cell_nil && VALUE (car (a)) == VALUE (car (b))) {
-#if __GNUC__
-    assert (TYPE (car (a)) == TCHAR);
-    assert (TYPE (car (b)) == TCHAR);
-#endif
-    a = cdr (a);
-    b = cdr (b);
-  }
-  return (a == cell_nil && b == cell_nil) ? cell_t : cell_f;
-}
-
-SCM
-lookup_symbol_ (SCM s)
-{
-  SCM x = g_symbols;
-  while (x) {
-    //if (list_of_char_equal_p (STRING (car (x)), s) == cell_t) break;
-    if (list_of_char_equal_p (STRING (car (x)), s) == cell_t) goto dun;
-    x = cdr (x);
-  }
- dun:
-  if (x) x = car (x);
-  return x;
-}
-
-SCM
-make_symbol (SCM s)
-{
-  SCM x = lookup_symbol_ (s);
-  return x ? x : make_symbol_ (s);
-}
-
-//MINI_MES reader.c
-SCM
-lookup_ (SCM s, SCM a)
-{
-  if (isdigit (VALUE (car (s))) || (VALUE (car (s)) == '-' && cdr (s) != cell_nil)) {
-    SCM p = s;
-    int sign = 1;
-    if (VALUE (car (s)) == '-') {
-      sign = -1;
-      p = cdr (s);
-    }
-    int n = 0;
-    while (p != cell_nil && isdigit (VALUE (car (p)))) {
-#if __GNUC__
-      //FIXME
-      n *= 10;
-      n += VALUE (car (p)) - '0';
-#else
-      n = n * 10;
-      n = n + VALUE (car (p)) - '0';
-#endif
-      p = cdr (p);
-    }
-    if (p == cell_nil) return MAKE_NUMBER (n * sign);
-  }
-
-  SCM x = lookup_symbol_ (s);
-  return x ? x : make_symbol_ (s);
-}
-
-SCM
-acons (SCM key, SCM value, SCM alist)
-{
-  return cons (cons (key, value), alist);
-}
-
 // Posix
 int
 ungetchar (int c)
@@ -1158,148 +1078,6 @@ string_to_cstring (SCM s)
   return string_to_cstring_buf;
 }
 
-int g_depth;
-
-SCM
-display_helper (SCM x, int cont, char* sep)
-{
-  puts (sep);
-  if (g_depth == 0) return cell_unspecified;
-  //FIXME:
-  //g_depth--;
-  g_depth = g_depth - 1;
-  
-  // eputs ("<display>\n");
-  switch (TYPE (x))
-    {
-    case TCHAR:
-      {
-        //puts ("<char>\n");
-        puts ("#\\");
-        putchar (VALUE (x));
-        break;
-      }
-    case TFUNCTION:
-      {
-        puts ("#<procedure ");
-        ///puts (FUNCTION (x).name ? FUNCTION (x).name : "?");
-        char *p = "?";
-        if (FUNCTION (x).name != 0)
-          p = FUNCTION (x).name;
-        puts (p);
-        puts ("[");
-        puts (itoa (CDR (x)));
-        puts (",");
-        puts (itoa (x));
-        puts ("]>");
-        break;
-      }
-    case TMACRO:
-      {
-        puts ("#<macro ");
-        display_helper (cdr (x), cont, "");
-        puts (">");
-        break;
-      }
-    case TNUMBER:
-      {
-        //puts ("<number>\n");
-        puts (itoa (VALUE (x)));
-        break;
-      }
-    case TPAIR:
-      {
-        if (!cont) puts ("(");
-        if (x && x != cell_nil) display_ (CAR (x));
-        if (CDR (x) && TYPE (CDR (x)) == TPAIR)
-          display_helper (CDR (x), 1, " ");
-        else if (CDR (x) && CDR (x) != cell_nil)
-          {
-            if (TYPE (CDR (x)) != TPAIR)
-              puts (" . ");
-            display_ (CDR (x));
-          }
-        if (!cont) puts (")");
-        break;
-      }
-    case TSPECIAL:
-#if __NYACC__
-      // FIXME
-      //{}
-      {
-        SCM t = CAR (x);
-        while (t && t != cell_nil)
-          {
-            putchar (VALUE (CAR (t)));
-            t = CDR (t);
-          }
-        break;
-      }
-#endif
-    case TSTRING:
-#if __NYACC__
-      // FIXME
-      //{}
-      {
-        SCM t = CAR (x);
-        while (t && t != cell_nil)
-          {
-            putchar (VALUE (CAR (t)));
-            t = CDR (t);
-          }
-        break;
-      }
-#endif
-    case TSYMBOL:
-      {
-        SCM t = CAR (x);
-        while (t && t != cell_nil)
-          {
-            putchar (VALUE (CAR (t)));
-            t = CDR (t);
-          }
-        break;
-      }
-    default:
-      {
-        //puts ("<default>\n");
-        puts ("<");
-        puts (itoa (TYPE (x)));
-        puts (":");
-        puts (itoa (x));
-        puts (">");
-        break;
-      }
-    }
-  return 0;
-}
-
-SCM
-display_ (SCM x)
-{
-  g_depth = 5;
-  return display_helper (x, 0, "");
-}
-
-SCM
-stderr_ (SCM x)
-{
-  SCM write;
-  if (TYPE (x) == TSTRING)
-    eputs (string_to_cstring (x));
-#if __GNUC__
-  else if ((write = assq_ref_env (cell_symbol_write, r0)) != cell_undefined)
-    apply (assq_ref_env (cell_symbol_display, r0), cons (x, cons (MAKE_NUMBER (2), cell_nil)), r0);
-#endif
-  else if (TYPE (x) == TSPECIAL || TYPE (x) == TSTRING || TYPE (x) == TSYMBOL)
-    eputs (string_to_cstring (x));
-  else if (TYPE (x) == TNUMBER)
-    eputs (itoa (VALUE (x)));
-  else
-    eputs ("core:stderr: display undefined\n");
-  return cell_unspecified;
-}
-
 SCM
 getenv_ (SCM s) ///((name . "getenv"))
 {
@@ -1513,6 +1291,135 @@ ash (SCM n, SCM count)
 
 // Lib [rest of]
 
+int g_depth;
+
+SCM
+display_helper (SCM x, int cont, char* sep, int fd)
+{
+  fputs (sep, fd);
+  if (g_depth == 0) return cell_unspecified;
+  g_depth = g_depth - 1;
+  
+  switch (TYPE (x))
+    {
+    case TCHAR:
+      {
+        fputs ("#\\", fd);
+        putc (VALUE (x), fd);
+        break;
+      }
+    case TFUNCTION:
+      {
+        fputs ("#<procedure ", fd);
+        char *p = "?";
+        if (FUNCTION (x).name != 0)
+          p = FUNCTION (x).name;
+        fputs (p, fd);
+        fputs ("[", fd);
+        fputs (itoa (CDR (x)), fd);
+        fputs (",", fd);
+        fputs (itoa (x), fd);
+        fputs ("]>", fd);
+        break;
+      }
+    case TMACRO:
+      {
+        fputs ("#<macro ", fd);
+        display_helper (cdr (x), cont, "", fd);
+        fputs (">", fd);
+        break;
+      }
+    case TNUMBER:
+      {
+        fputs (itoa (VALUE (x)), fd);
+        break;
+      }
+    case TPAIR:
+      {
+        if (!cont) fputs ("(", fd);
+        if (x && x != cell_nil) fdisplay_ (CAR (x), fd);
+        if (CDR (x) && TYPE (CDR (x)) == TPAIR)
+          display_helper (CDR (x), 1, " ", fd);
+        else if (CDR (x) && CDR (x) != cell_nil)
+          {
+            if (TYPE (CDR (x)) != TPAIR)
+              fputs (" . ", fd);
+            fdisplay_ (CDR (x), fd);
+          }
+        if (!cont) fputs (")", fd);
+        break;
+      }
+    case TSPECIAL:
+#if __NYACC__
+      // FIXME
+      //{}
+      {
+        SCM t = CAR (x);
+        while (t && t != cell_nil)
+          {
+            putc (VALUE (CAR (t)), fd);
+            t = CDR (t);
+          }
+        break;
+      }
+#endif
+    case TSTRING:
+#if __NYACC__
+      // FIXME
+      {
+        SCM t = CAR (x);
+        while (t && t != cell_nil)
+          {
+            putc (VALUE (CAR (t)), fd);
+            t = CDR (t);
+          }
+        break;
+      }
+#endif
+    case TSYMBOL:
+      {
+        SCM t = CAR (x);
+        while (t && t != cell_nil)
+          {
+            putc (VALUE (CAR (t)), fd);
+            t = CDR (t);
+          }
+        break;
+      }
+    default:
+      {
+        fputs ("<", fd);
+        fputs (itoa (TYPE (x)), fd);
+        fputs (":", fd);
+        fputs (itoa (x), fd);
+        fputs (">", fd);
+        break;
+      }
+    }
+  return 0;
+}
+
+SCM
+display_ (SCM x)
+{
+  g_depth = 5;
+  return display_helper (x, 0, "", STDOUT);
+}
+
+SCM
+display_error_ (SCM x)
+{
+  g_depth = 5;
+  return display_helper (x, 0, "", STDERR);
+}
+
+SCM
+fdisplay_ (SCM x, int fd) ///((internal))
+{
+  g_depth = 5;
+  return display_helper (x, 0, "", fd);
+}
+
 SCM
 exit_ (SCM x) ///((name . "exit"))
 {
@@ -1528,21 +1435,6 @@ append (SCM x) ///((arity . n))
   return append2 (car (x), append (cdr (x)));
 }
 
-SCM
-values (SCM x) ///((arity . n))
-{
-  SCM v = cons (0, x);
-  TYPE (v) = TVALUES;
-  return v;
-}
-
-SCM
-arity_ (SCM x)
-{
-  assert (TYPE (x) == TFUNCTION);
-  return MAKE_NUMBER (FUNCTION (x).arity);
-}
-
 SCM
 xassq (SCM x, SCM a) ///for speed in core only
 {
diff --git a/scaffold/tiny-mes.c b/scaffold/tiny-mes.c
index 3498e1c2..23a0a607 100644
--- a/scaffold/tiny-mes.c
+++ b/scaffold/tiny-mes.c
@@ -198,7 +198,7 @@ display_ (SCM x)
       {
         //puts ("<function>\n");
         if (VALUE (x) == 0)
-          puts ("make-cell");
+          puts ("core:make-cell");
         if (VALUE (x) == 1)
           puts ("cons");
         if (VALUE (x) == 2)
diff --git a/tests/gc-0.test b/tests/gc-0.test
index fbac8b46..0a2aa4b7 100755
--- a/tests/gc-0.test
+++ b/tests/gc-0.test
@@ -26,15 +26,15 @@ exit $?
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with Mes.  If not, see <http://www.gnu.org/licenses/>.
 
-(define zero (make-cell 2 0 0))
-(define one (make-cell 2 0 1))
-(define pair (make-cell 3 zero one)) 
-(define zero-list (make-cell 3 zero '()))
+(define zero (core:make-cell 2 0 0))
+(define one (core:make-cell 2 0 1))
+(define pair (core:make-cell 3 zero one)) 
+(define zero-list (core:make-cell 3 zero '()))
 (define v (make-vector 1))
 (display v) (newline)
 (vector-set! v 0 88)
-(define zero-v-list (make-cell 3 v zero-list))
-(define list (make-cell 3 (make-cell 3 zero one) zero-v-list))
+(define zero-v-list (core:make-cell 3 v zero-list))
+(define list (core:make-cell 3 (make-cell 3 zero one) zero-v-list))
 (display "list: ") (display list) (newline)
 (display "v: ") (display v) (newline)
 (gc)
diff --git a/tests/gc-1.test b/tests/gc-1.test
index 6b2da74d..4508d6db 100755
--- a/tests/gc-1.test
+++ b/tests/gc-1.test
@@ -26,24 +26,24 @@ exit $?
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with Mes.  If not, see <http://www.gnu.org/licenses/>.
 
-(define first (make-cell 0 0 #\F)) (newline)
+(define first (core:make-cell 0 0 #\F)) (newline)
 
-(define one (make-cell 2 0 1))
+(define one (core:make-cell 2 0 1))
 (display "\n one=") (display one) (newline)
-(define two (make-cell 2 0 2))
-(define pair2-nil (make-cell 3 two '()))
+(define two (core:make-cell 2 0 2))
+(define pair2-nil (core:make-cell 3 two '()))
 (display "\npair2-nil=") (display pair2-nil) (newline)
 (gc-show)
 
-(define list1-2 (make-cell 3 one pair2-nil))
+(define list1-2 (core:make-cell 3 one pair2-nil))
 (display "\nlist1-2=") (display list1-2) (newline)
 (gc-show)
 
-(define three (make-cell 2 0 3))
-(define four (make-cell 2 0 4))
-(define pair4-nil (make-cell 3 four '()))
-(define list3-4 (make-cell 3 three pair4-nil))
-(define list1234 (make-cell 3 list1-2 list3-4))
+(define three (core:make-cell 2 0 3))
+(define four (core:make-cell 2 0 4))
+(define pair4-nil (core:make-cell 3 four '()))
+(define list3-4 (core:make-cell 3 three pair4-nil))
+(define list1234 (core:make-cell 3 list1-2 list3-4))
 (gc-show)
 (gc list1234)
 (gc-show)
diff --git a/tests/gc.test b/tests/gc.test
index ea1f1d27..f016612e 100755
--- a/tests/gc.test
+++ b/tests/gc.test
@@ -72,10 +72,10 @@ exit $?
   (if (= gc-free gc-size) (gc))
   ((lambda (index)
      (set! gc-free (+ gc-free 1))
-     (make-cell 'p index))
+     (core:make-cell 'p index))
    gc-free))
 
-(define (make-cell type . x)
+(define (core:make-cell type . x)
   (cons type (if (pair? x) (car x) '*)))
 
 (define (cell-index c)
diff --git a/vector.c b/vector.c
index abbeba3a..134b317f 100644
--- a/vector.c
+++ b/vector.c
@@ -24,7 +24,7 @@ make_vector (SCM n)
   int k = VALUE (n);
   g_cells[tmp_num].value = TVECTOR;
   SCM v = alloc (k);
-  SCM x = make_cell (tmp_num, k, v);
+  SCM x = make_cell_ (tmp_num, k, v);
   for (int i=0; i<k; i++) g_cells[v+i] = g_cells[vector_entry (cell_unspecified)];
   return x;
 }