* re.c (rb_reg_search): should clear last_match if pos is out of

  string range.

* string.c (rb_str_index_m): ditto.

* string.c (rb_str_rindex): ditto.

* class.c (rb_define_class): should handle autoload.

* class.c (rb_define_module): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/error.c b/error.c
index b6c330748d..e52f2e91c7 100644
--- a/error.c
+++ b/error.c
@@ -434,14 +434,14 @@ rb_name_error(id, fmt, va_alist)
 }
 
 static VALUE
-name_name(self)
+name_err_name(self)
     VALUE self;
 {
     return rb_iv_get(self, "name");
 }
 
 static VALUE
-nometh_args(self)
+nometh_err_args(self)
     VALUE self;
 {
     return rb_iv_get(self, "args");
@@ -633,9 +633,9 @@ Init_Exception()
     rb_eIndexError    = rb_define_class("IndexError", rb_eStandardError);
     rb_eRangeError    = rb_define_class("RangeError", rb_eStandardError);
     rb_eNameError     = rb_define_class("NameError", rb_eStandardError);
-    rb_define_method(rb_eNameError, "name", name_name, 0);
+    rb_define_method(rb_eNameError, "name", name_err_name, 0);
     rb_eNoMethodError = rb_define_class("NoMethodError", rb_eNameError);
-    rb_define_method(rb_eNoMethodError, "args", nometh_args, 0);
+    rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
 
     rb_eScriptError = rb_define_class("ScriptError", rb_eException);
     rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);