Merge pull request #1132 from monaka/pr-support-NameError.name

Support NameError#name

8 files changed, 38 insertions, 14 deletions

diff --git a/include/mruby.h b/include/mruby.h
index 5272d0400..9bfb31e39 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -282,6 +282,7 @@ void mrb_exc_raise(mrb_state *mrb, mrb_value exc);
 
 void mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg);
 void mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...);
+void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...);
 void mrb_warn(const char *fmt, ...);
 void mrb_bug(const char *fmt, ...);
 
diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c
index 20ea8b5c5..bd902db7d 100644
--- a/mrbgems/mruby-struct/src/struct.c
+++ b/mrbgems/mruby-struct/src/struct.c
@@ -125,7 +125,7 @@ mrb_struct_getmember(mrb_state *mrb, mrb_value obj, mrb_sym id)
       return ptr[i];
     }
   }
-  mrb_raisef(mrb, E_NAME_ERROR, "%S is not struct member", mrb_sym2str(mrb, id));
+  mrb_name_error(mrb, id, "%S is not struct member", mrb_sym2str(mrb, id));
   return mrb_nil_value();       /* not reached */
 }
 
@@ -204,7 +204,7 @@ mrb_struct_set(mrb_state *mrb, mrb_value obj, mrb_value val)
       return ptr[i] = val;
     }
   }
-  mrb_raisef(mrb, E_NAME_ERROR, "`%S' is not a struct member",
+  mrb_name_error(mrb, mid, "`%S' is not a struct member",
              mrb_sym2str(mrb, mid));
   return mrb_nil_value();            /* not reached */
 }
@@ -249,7 +249,7 @@ make_struct(mrb_state *mrb, mrb_value name, mrb_value members, struct RClass * k
     name = mrb_str_to_str(mrb, name);
     id = mrb_to_id(mrb, name);
     if (!mrb_is_const_id(id)) {
-      mrb_raisef(mrb, E_NAME_ERROR, "identifier %S needs to be constant", name);
+      mrb_name_error(mrb, id, "identifier %S needs to be constant", name);
     }
     if (mrb_const_defined_at(mrb, klass, id)) {
       mrb_warn("redefining constant Struct::%s", mrb_string_value_ptr(mrb, name));
@@ -544,7 +544,7 @@ mrb_struct_aref_id(mrb_state *mrb, mrb_value s, mrb_sym id)
       return ptr[i];
     }
   }
-  mrb_raisef(mrb, E_NAME_ERROR, "no member '%S' in struct", mrb_sym2str(mrb, id));
+  mrb_name_error(mrb, id, "no member '%S' in struct", mrb_sym2str(mrb, id));
   return mrb_nil_value();       /* not reached */
 }
 
@@ -619,7 +619,7 @@ mrb_struct_aset_id(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val)
       return val;
     }
   }
-  mrb_raisef(mrb, E_NAME_ERROR, "no member '%S' in struct", mrb_sym2str(mrb, id));
+  mrb_name_error(mrb, id, "no member '%S' in struct", mrb_sym2str(mrb, id));
   return val;                   /* not reach */
 }
 
diff --git a/mrblib/error.rb b/mrblib/error.rb
index 32b50da92..9e5a3daeb 100644
--- a/mrblib/error.rb
+++ b/mrblib/error.rb
@@ -38,6 +38,16 @@ end
 
 # ISO 15.2.31
 class NameError < StandardError
+  attr_accessor :name
+
+  def new(message="NameError", name=nil)
+    initialize(message, name)
+  end
+
+  def initialize(message=nil, name=nil)
+    @name = name
+    super(message)
+  end
 end
 
 # ISO 15.2.32
diff --git a/src/class.c b/src/class.c
index 57cfae78f..377503c39 100644
--- a/src/class.c
+++ b/src/class.c
@@ -979,7 +979,7 @@ mrb_method_search(mrb_state *mrb, struct RClass* c, mrb_sym mid)
     if (RSTRING_LEN(inspect) > 64) {
       inspect = mrb_any_to_s(mrb, mrb_obj_value(c));
     }
-    mrb_raisef(mrb, E_NAME_ERROR, "undefined method '%S' for class %S",
+    mrb_name_error(mrb, mid, "undefined method '%S' for class %S",
                mrb_sym2str(mrb, mid), inspect);
   }
   return m;
diff --git a/src/error.c b/src/error.c
index 5f1476115..522901ff7 100644
--- a/src/error.c
+++ b/src/error.c
@@ -306,8 +306,8 @@ mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...)
   argv[0] = mrb_vformat(mrb, fmt, args);
   va_end(args);
 
-  argv[1] = mrb_symbol_value(id); /* ignore now */
-  exc = mrb_class_new_instance(mrb, 1, argv, E_NAME_ERROR);
+  argv[1] = mrb_symbol_value(id);
+  exc = mrb_class_new_instance(mrb, 2, argv, E_NAME_ERROR);
   mrb_exc_raise(mrb, exc);
 }
 
diff --git a/src/error.h b/src/error.h
index 83d0938aa..3726cb4c4 100644
--- a/src/error.h
+++ b/src/error.h
@@ -13,7 +13,6 @@ mrb_value mrb_exc_new3(mrb_state *mrb, struct RClass* c, mrb_value str);
 mrb_value make_exception(mrb_state *mrb, int argc, mrb_value *argv, int isstr);
 mrb_value mrb_make_exception(mrb_state *mrb, int argc, mrb_value *argv);
 mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
-void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...);
 void mrb_exc_print(mrb_state *mrb, struct RObject *exc);
 
 #endif  /* MRUBY_ERROR_H */
diff --git a/src/variable.c b/src/variable.c
index a9570db02..2057b69ef 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -691,7 +691,7 @@ mrb_mod_cv_get(mrb_state *mrb, struct RClass * c, mrb_sym sym)
     }
     c = c->super;
   }
-  mrb_raisef(mrb, E_NAME_ERROR, "uninitialized class variable %S in %S",
+  mrb_name_error(mrb, sym, "uninitialized class variable %S in %S",
              mrb_sym2str(mrb, sym), cls);
   /* not reached */
   return mrb_nil_value();
@@ -847,7 +847,7 @@ L_RETRY:
     }
     c = c->super;
   }
-  mrb_raisef(mrb, E_NAME_ERROR, "uninitialized constant %S",
+  mrb_name_error(mrb, sym, "uninitialized constant %S",
              mrb_sym2str(mrb, sym));
   /* not reached */
   return mrb_nil_value();
diff --git a/test/t/nameerror.rb b/test/t/nameerror.rb
index 8e57ac18b..30da74a15 100644
--- a/test/t/nameerror.rb
+++ b/test/t/nameerror.rb
@@ -9,10 +9,24 @@ assert('NameError superclass', '15.2.31.2') do
   NameError.superclass == StandardError
 end
 
-# TODO 15.2.31.2.1 NameError#name
+assert('NameError#name', '15.2.31.2.1') do
+
+  # This check is not duplicate with 15.2.31.2.2 check.
+  # Because the NameError in this test is generated in
+  # C API.
+  class TestDummy
+    alias foo bar
+  rescue NameError => e
+    $test_dummy_result = e.name
+  end
+
+  $test_dummy_result == :bar
+end
 
 assert('NameError#initialize', '15.2.31.2.2') do
-   e = NameError.new.initialize('a')
+   e = NameError.new('a', :foo)
 
-   e.class == NameError and e.message == 'a'
+   e.class == NameError and
+   e.message == 'a' and
+   e.name == :foo
 end