From 85b58bd43e3e72c286a310de05e0d84f39ec65d5 Mon Sep 17 00:00:00 2001
From: Yuichi Nishiwaki <yuichi.nishiwaki@gmail.com>
Date: Thu, 3 Mar 2016 18:59:07 +0900
Subject: [PATCH] add pic_boot function

---
 extlib/benz/boot.c  | 22 ++++++++++++++++++++--
 extlib/benz/state.c | 17 ++++++-----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/extlib/benz/boot.c b/extlib/benz/boot.c
index a25b7be6..76651e4b 100644
--- a/extlib/benz/boot.c
+++ b/extlib/benz/boot.c
@@ -695,7 +695,10 @@ foreach (@data) {
 print "\n#endif\n\n";
 
 print <<EOL;
-const char pic_boot[][80] = {
+#include "picrin.h"
+#include "picrin/extra.h"
+
+static const char boot_rom[][80] = {
 EOL
 
 my @lines = $src =~ /.{0,80}/gs;
@@ -715,6 +718,12 @@ print "\"\"\n";
 print <<EOL;
 };
 
+void
+pic_boot(pic_state *pic)
+{
+  pic_load_cstr(pic, &boot_rom[0][0]);
+}
+
 #if 0
 Local Variables:
 mode: scheme
@@ -730,7 +739,10 @@ EOL
 
 #endif
 
-const char pic_boot[][80] = {
+#include "picrin.h"
+#include "picrin/extra.h"
+
+static const char boot_rom[][80] = {
 "\n(builtin:define-macro call-with-current-environment\n  (builtin:lambda (form env",
 ")\n    (list (cadr form) env)))\n\n(builtin:define here\n  (call-with-current-enviro",
 "nment\n   (builtin:lambda (env)\n     env)))\n\n(builtin:define the                 ",
@@ -1033,6 +1045,12 @@ const char pic_boot[][80] = {
 ""
 };
 
+void
+pic_boot(pic_state *pic)
+{
+  pic_load_cstr(pic, &boot_rom[0][0]);
+}
+
 #if 0
 Local Variables:
 mode: scheme
diff --git a/extlib/benz/state.c b/extlib/benz/state.c
index 9b778272..84741fb8 100644
--- a/extlib/benz/state.c
+++ b/extlib/benz/state.c
@@ -109,20 +109,18 @@ void pic_init_eval(pic_state *);
 void pic_init_lib(pic_state *);
 void pic_init_weak(pic_state *);
 
-extern const char pic_boot[][80];
+void pic_boot(pic_state *);
+
+#define DONE pic_leave(pic, ai);
 
 static void
 pic_init_core(pic_state *pic)
 {
-  size_t ai;
+  size_t ai = pic_enter(pic);
   pic_value env;
 
   pic_deflibrary(pic, "picrin.base");
 
-  ai = pic_enter(pic);
-
-#define DONE pic_leave(pic, ai);
-
   env = pic_library_environment(pic, pic->lib);
 
   import_builtin_syntax("define");
@@ -133,8 +131,7 @@ pic_init_core(pic_state *pic)
   import_builtin_syntax("begin");
   import_builtin_syntax("define-macro");
 
-  DONE;
-
+  pic_init_features(pic); DONE;
   pic_init_bool(pic); DONE;
   pic_init_pair(pic); DONE;
   pic_init_port(pic); DONE;
@@ -159,9 +156,7 @@ pic_init_core(pic_state *pic)
   pic_init_write(pic); DONE;
 #endif
 
-  pic_init_features(pic);
-
-  pic_load_cstr(pic, &pic_boot[0][0]);
+  pic_boot(pic); DONE;
 }
 
 pic_state *