From d98cb495a372374ec8d7c98e943ad0521121d8db Mon Sep 17 00:00:00 2001
From: Yuichi Nishiwaki <yuichi.nishiwaki@gmail.com>
Date: Thu, 7 Aug 2014 11:20:28 +0900
Subject: [PATCH] [bugfix] define standard functions before loading piclibs

---
 src/init.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/init.c b/src/init.c
index d9a48cf6..48601882 100644
--- a/src/init.c
+++ b/src/init.c
@@ -83,7 +83,13 @@ pic_init_core(pic_state *pic)
     pic_define_syntactic_keyword(pic, pic->lib->env, pic->sDEFINE_SYNTAX, pic->rDEFINE_SYNTAX);
   }
 
+  pic_deflibrary (pic, "(picrin library)") {
+    pic_defun(pic, "libraries", pic_libraries);
+  }
+
   pic_deflibrary (pic, "(scheme base)") {
+    pic_defun(pic, "features", pic_features);
+
     pic_init_bool(pic); DONE;
     pic_init_pair(pic); DONE;
     pic_init_port(pic); DONE;
@@ -111,11 +117,5 @@ pic_init_core(pic_state *pic)
 
     pic_load_piclib(pic); DONE;
     pic_init_contrib(pic); DONE;
-
-    pic_defun(pic, "features", pic_features);
-  }
-
-  pic_deflibrary (pic, "(picrin library)") {
-    pic_defun(pic, "libraries", pic_libraries);
   }
 }