1 files changed, 56 insertions, 78 deletions

diff --git a/src/error.c b/src/error.c
index ed30173bc..ab5480e97 100644
--- a/src/error.c
+++ b/src/error.c
@@ -5,7 +5,9 @@
 */
 
 #include "mruby.h"
+#include <errno.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <setjmp.h>
 #include <string.h>
 #include "error.h"
@@ -42,7 +44,7 @@ exc_initialize(mrb_state *mrb, mrb_value exc)
   mrb_value mesg;
 
   if (mrb_get_args(mrb, "|o", &mesg) == 1) {
-    mrb_iv_set(mrb, exc, mrb_intern(mrb, "mesg"), mesg);
+    mrb_iv_set(mrb, exc, mrb_intern2(mrb, "mesg", 4), mesg);
   }
   return exc;
 }
@@ -71,7 +73,7 @@ exc_exception(mrb_state *mrb, mrb_value self)
   if (argc == 0) return self;
   if (mrb_obj_equal(mrb, self, a)) return self;
   exc = mrb_obj_clone(mrb, self);
-  mrb_iv_set(mrb, exc, mrb_intern(mrb, "mesg"), a);
+  mrb_iv_set(mrb, exc, mrb_intern2(mrb, "mesg", 4), a);
 
   return exc;
 }
@@ -87,9 +89,9 @@ exc_exception(mrb_state *mrb, mrb_value self)
 static mrb_value
 exc_to_s(mrb_state *mrb, mrb_value exc)
 {
-  mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern(mrb, "mesg"));
+  mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "mesg", 4));
 
-  if (mrb_nil_p(mesg)) return mrb_str_new2(mrb, mrb_obj_classname(mrb, exc));
+  if (mrb_nil_p(mesg)) return mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, exc));
   return mesg;
 }
 
@@ -121,32 +123,32 @@ exc_inspect(mrb_state *mrb, mrb_value exc)
 {
   mrb_value str, mesg, file, line;
 
-  mesg = mrb_attr_get(mrb, exc, mrb_intern(mrb, "mesg"));
-  file = mrb_attr_get(mrb, exc, mrb_intern(mrb, "file"));
-  line = mrb_attr_get(mrb, exc, mrb_intern(mrb, "line"));
+  mesg = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "mesg", 4));
+  file = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "file", 4));
+  line = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "line", 4));
 
   if (!mrb_nil_p(file) && !mrb_nil_p(line)) {
     str = file;
-    mrb_str_cat2(mrb, str, ":");
+    mrb_str_cat(mrb, str, ":", 1);
     mrb_str_append(mrb, str, line);
-    mrb_str_cat2(mrb, str, ": ");
+    mrb_str_cat(mrb, str, ": ", 2);
     if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
       mrb_str_append(mrb, str, mesg);
-      mrb_str_cat2(mrb, str, " (");
+      mrb_str_cat(mrb, str, " (", 2);
     }
-    mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
+    mrb_str_cat_cstr(mrb, str, mrb_obj_classname(mrb, exc));
     if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
-      mrb_str_cat2(mrb, str, ")");
+      mrb_str_cat(mrb, str, ")", 1);
     }
   }
   else {
-    str = mrb_str_new2(mrb, mrb_obj_classname(mrb, exc));
+    str = mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, exc));
     if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
-      mrb_str_cat2(mrb, str, ": ");
+      mrb_str_cat(mrb, str, ": ", 2);
       mrb_str_append(mrb, str, mesg);
     } else {
-      mrb_str_cat2(mrb, str, ": ");
-      mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
+      mrb_str_cat(mrb, str, ": ", 2);
+      mrb_str_cat_cstr(mrb, str, mrb_obj_classname(mrb, exc));
     }
   }
   return str;
@@ -158,25 +160,29 @@ exc_equal(mrb_state *mrb, mrb_value exc)
 {
   mrb_value obj;
   mrb_value mesg;
-  mrb_sym id_mesg = mrb_intern(mrb, "mesg");
+  mrb_bool equal_p;
+  mrb_sym id_mesg = mrb_intern2(mrb, "mesg", 4);
 
   mrb_get_args(mrb, "o", &obj);
-  if (mrb_obj_equal(mrb, exc, obj)) return mrb_true_value();
-
-  if (mrb_obj_class(mrb, exc) != mrb_obj_class(mrb, obj)) {
-    if (mrb_respond_to(mrb, obj, mrb_intern(mrb, "message"))) {
-      mesg = mrb_funcall(mrb, obj, "message", 0);
-    }
-    else
-      return mrb_false_value();
+  if (mrb_obj_equal(mrb, exc, obj)) {
+    equal_p = 1;
   }
   else {
-    mesg = mrb_attr_get(mrb, obj, id_mesg);
+    if (mrb_obj_class(mrb, exc) != mrb_obj_class(mrb, obj)) {
+      if (mrb_respond_to(mrb, obj, mrb_intern2(mrb, "message", 7))) {
+        mesg = mrb_funcall(mrb, obj, "message", 0);
+      }
+      else
+        return mrb_false_value();
+    }
+    else {
+      mesg = mrb_attr_get(mrb, obj, id_mesg);
+    }
+
+    equal_p = mrb_equal(mrb, mrb_attr_get(mrb, exc, id_mesg), mesg);
   }
 
-  if (!mrb_equal(mrb, mrb_attr_get(mrb, exc, id_mesg), mesg))
-    return mrb_false_value();
-  return mrb_true_value();
+  return mrb_bool_value(equal_p);
 }
 
 static void
@@ -185,15 +191,15 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc)
   mrb_callinfo *ci = mrb->ci;
   mrb_code *pc = ci->pc;
 
-  mrb_obj_iv_set(mrb, exc, mrb_intern(mrb, "ciidx"), mrb_fixnum_value(ci - mrb->cibase));
+  mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "ciidx", 5), mrb_fixnum_value(ci - mrb->cibase));
   ci--;
   while (ci >= mrb->cibase) {
     if (ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) {
       mrb_irep *irep = ci->proc->body.irep;
 
       if (irep->filename && irep->lines && irep->iseq <= pc && pc < irep->iseq + irep->ilen) {
-        mrb_obj_iv_set(mrb, exc, mrb_intern(mrb, "file"), mrb_str_new_cstr(mrb, irep->filename));
-        mrb_obj_iv_set(mrb, exc, mrb_intern(mrb, "line"), mrb_fixnum_value(irep->lines[pc - irep->iseq - 1]));
+        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "file", 4), mrb_str_new_cstr(mrb, irep->filename));
+        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "line", 4), mrb_fixnum_value(irep->lines[pc - irep->iseq - 1]));
         return;
       }
     }
@@ -205,7 +211,7 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc)
 void
 mrb_exc_raise(mrb_state *mrb, mrb_value exc)
 {
-  mrb->exc = (struct RObject*)mrb_object(exc);
+  mrb->exc = mrb_obj_ptr(exc);
   exc_debug_info(mrb, mrb->exc);
   if (!mrb->jmp) {
     mrb_p(mrb, exc);
@@ -218,7 +224,7 @@ void
 mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg)
 {
   mrb_value mesg;
-  mesg = mrb_str_new2(mrb, msg);
+  mesg = mrb_str_new_cstr(mrb, msg);
   mrb_exc_raise(mrb, mrb_exc_new3(mrb, c, mesg));
 }
 
@@ -258,22 +264,6 @@ mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...)
   mrb_exc_raise(mrb, exc);
 }
 
-mrb_value
-mrb_sprintf(mrb_state *mrb, const char *fmt, ...)
-{
-  va_list args;
-  char buf[256];
-  int n;
-
-  va_start(args, fmt);
-  n = vsnprintf(buf, sizeof(buf), fmt, args);
-  va_end(args);
-  if (n < 0) {
-    n = 0;
-  }
-  return mrb_str_new(mrb, buf, n);
-}
-
 void
 mrb_warn(const char *fmt, ...)
 {
@@ -301,35 +291,10 @@ mrb_bug(const char *fmt, ...)
   exit(EXIT_FAILURE);
 }
 
-static const char *
-mrb_strerrno(int err)
-{
-#define defined_error(name, num) if (err == num) return name;
-#define undefined_error(name)
-//#include "known_errors.inc"
-#undef defined_error
-#undef undefined_error
-    return NULL;
-}
-
-void
-mrb_bug_errno(const char *mesg, int errno_arg)
-{
-  if (errno_arg == 0)
-    mrb_bug("%s: errno == 0 (NOERROR)", mesg);
-  else {
-    const char *errno_str = mrb_strerrno(errno_arg);
-    if (errno_str)
-      mrb_bug("%s: %s (%s)", mesg, strerror(errno_arg), errno_str);
-    else
-      mrb_bug("%s: %s (%d)", mesg, strerror(errno_arg), errno_arg);
-  }
-}
-
 int
 sysexit_status(mrb_state *mrb, mrb_value err)
 {
-  mrb_value st = mrb_iv_get(mrb, err, mrb_intern(mrb, "status"));
+  mrb_value st = mrb_iv_get(mrb, err, mrb_intern2(mrb, "status", 6));
   return mrb_fixnum(st);
 }
 
@@ -367,7 +332,7 @@ make_exception(mrb_state *mrb, int argc, mrb_value *argv, int isstr)
       n = 1;
 exception_call:
       {
-        mrb_sym exc = mrb_intern(mrb, "exception");
+        mrb_sym exc = mrb_intern2(mrb, "exception", 9);
         if (mrb_respond_to(mrb, argv[0], exc)) {
           mesg = mrb_funcall_argv(mrb, argv[0], exc, n, argv+1);
         }
@@ -401,7 +366,20 @@ mrb_make_exception(mrb_state *mrb, int argc, mrb_value *argv)
 void
 mrb_sys_fail(mrb_state *mrb, const char *mesg)
 {
-  mrb_raise(mrb, E_RUNTIME_ERROR, mesg);
+  struct RClass *sce;
+  mrb_int no;
+
+  no = (mrb_int)errno;
+  if (mrb_class_defined(mrb, "SystemCallError")) {
+    sce = mrb_class_get(mrb, "SystemCallError");
+    if (mesg != NULL) {
+      mrb_funcall(mrb, mrb_obj_value(sce), "_sys_fail", 2, mrb_fixnum_value(no), mrb_str_new_cstr(mrb, mesg));
+    } else {
+      mrb_funcall(mrb, mrb_obj_value(sce), "_sys_fail", 1, mrb_fixnum_value(no));
+    }
+  } else {
+    mrb_raise(mrb, E_RUNTIME_ERROR, mesg);
+  }
 }
 
 void