1 files changed, 6 insertions, 9 deletions
diff --git a/genvim.txr b/genvim.txr
index c3565859..114c40f1 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -7,10 +7,9 @@ static void dir_tables_init(void)
 @(until)
 }
 @(end)
-@(next "eval.c")
-@(skip)
-void eval_init(void)
-{
+@(next @[apply make-catenated-stream 
+               [mapcar open-file '("eval.c" "rand.c" "signal.c"
+                                   "stream.c" "syslog.c" "txr.c")]])
 @(collect)
 @  (cases)
   reg_@/op|mac/(@{txl-sym-nostar}_star_s,@(skip)
@@ -18,17 +17,15 @@ void eval_init(void)
 @  (or)
   reg_@/op|mac/(@{txl-sym}_s,@(skip)
 @  (or)
-  reg_mac(intern(lit("@{txl-sym}"),@(skip)
+  reg_mac(intern(lit("@{txl-sym}")@(skip)
 @  (or)
-  reg_fun(intern(lit("@{txl-sym}"),@(skip)
+  reg_fun(intern(lit("@{txl-sym}")@(skip)
 @  (or)
   reg_fun(@{txl-sym}_s,@(skip)
 @  (or)
-  reg_var(intern(lit("@{txl-sym}"),@(skip)
+  @/ */reg_var(@(skip)intern(lit("@{txl-sym}")@(skip)
 @  (end)
 @  (set txl-sym @(regsub #/_/ #\- txl-sym))
-@(until)
-}
 @(end)
 @(do
    (defun sortuniq (list)