From 51a2a95bc16d8fd9b79f43dc12b61a8d3cb00314 Mon Sep 17 00:00:00 2001
From: "Sunrim KIM (keen)" <3han5chou7@gmail.com>
Date: Mon, 11 Aug 2014 11:12:32 +0900
Subject: [PATCH] generate better load error message

---
 etc/mkloader.pl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/etc/mkloader.pl b/etc/mkloader.pl
index 1702414c..afbd88f2 100755
--- a/etc/mkloader.pl
+++ b/etc/mkloader.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 use strict;
+use File::Basename qw/basename dirname/;
 
 print <<EOL;
 /**
@@ -34,22 +35,26 @@ print <<EOL;
 void
 pic_load_piclib(pic_state *pic)
 {
-  pic_try {
 EOL
 
 foreach my $file (@ARGV) {
+    print "  pic_try {\n";
     my $var = &escape_v($file);
+    my $basename = basename($file);
+    my $dirname = basename(dirname($file));
     print "    pic_load_cstr(pic, $var);\n";
-}
-
-print <<EOL;
+    print<<EOL
   }
   pic_catch {
     /* error! */
-    fputs("fatal error: failure in loading built-in.scm\\n", stderr);
+    fputs("fatal error: failure in loading $dirname/$basename\\n", stderr);
     fputs(pic_errmsg(pic), stderr);
     abort();
   }
+EOL
+}
+
+print <<EOL;
 
 #if DEBUG
   puts("successfully loaded stdlib");