* eval.c (rb_eval): add CHECK_INTS before next, redo, retry to

  avoid potential uninterruptable infinite loop.

* file.c (rb_file_s_expand_path): should not expand "." and ".."
  not following dirsep.

* eval.c (rb_provide_feature): should not tweak extension used for
  loading.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/object.c b/object.c
index 8a247eac9d..23a374fdd1 100644
--- a/object.c
+++ b/object.c
@@ -765,7 +765,7 @@ rb_mod_const_get(mod, name)
     ID id = rb_to_id(name);
 
     if (!rb_is_const_id(id)) {
-	rb_raise(rb_eNameError, "wrong constant name %s", name);
+	rb_raise(rb_eNameError, "wrong constant name %s", rb_id2name(id));
     }
     return rb_const_get(mod, id);
 }
@@ -777,7 +777,7 @@ rb_mod_const_set(mod, name, value)
     ID id = rb_to_id(name);
 
     if (!rb_is_const_id(id)) {
-	rb_raise(rb_eNameError, "wrong constant name %s", name);
+	rb_raise(rb_eNameError, "wrong constant name %s", rb_id2name(id));
     }
     rb_const_set(mod, id, value);
     return value;
@@ -790,7 +790,7 @@ rb_mod_const_defined(mod, name)
     ID id = rb_to_id(name);
 
     if (!rb_is_const_id(id)) {
-	rb_raise(rb_eNameError, "wrong constant name %s", name);
+	rb_raise(rb_eNameError, "wrong constant name %s", rb_id2name(id));
     }
     return rb_const_defined_at(mod, id);
 }