From 3d5910995881b671b031b95afe19bbc2a040c1d3 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 2 Jul 2001 08:46:28 +0000
Subject: * error.c (exc_exception): clone the receiver exception instead of  
 creating brand new exception object of the receiver.

* eval.c (rb_eval_string_wrap): extend new ruby_top_self, not
  original self.

* eval.c (rb_eval_cmd): respect ruby_wrapper if set.

* eval.c (eval): do not update ruby_class unless scope is not
  provided.

* eval.c (eval): preserve wrapper information.

* eval.c (proc_invoke): ditto.

* eval.c (block_pass): ditto.

* parse.y (void_expr): too much warnings for void context
  (e.g. foo[1] that can be mere Proc call).

* error.c (rb_name_error): new function to raise NameError with
  name attribute set.

* eval.c (rb_f_missing): set name and args in the exception
  object. [new]

* error.c (name_name): NameError#name - new method.

* error.c (nometh_args): NoMethodError#args - new method.

* lex.c (rb_reserved_word): lex_state after tRESCUE should be
  EXPR_MID.

* gc.c (add_heap): allocation size of the heap unit is doubled for
  each allocation.

* dir.c (isdelim): space, tab, and newline are no longer
  delimiters for glob patterns.

* eval.c (svalue_to_avalue): new conversion scheme between single
  value and array values.

* eval.c (avalue_to_svalue): ditto.

* eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return
  and yield too.

* eval.c (rb_yield_0): use avalue_to_svalue().

* eval.c (proc_invoke): Proc#call gives avaules, whereas
  Proc#yield gives mvalues.

* eval.c (bmcall): convert given value (svalue) to avalue.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 object.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'object.c')

diff --git a/object.c b/object.c
index 89b126538..2d70029f0 100644
--- a/object.c
+++ b/object.c
@@ -769,7 +769,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", rb_id2name(id));
+	rb_name_error(id, "wrong constant name %s", rb_id2name(id));
     }
     return rb_const_get(mod, id);
 }
@@ -781,7 +781,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", rb_id2name(id));
+	rb_name_error(id, "wrong constant name %s", rb_id2name(id));
     }
     rb_const_set(mod, id, value);
     return value;
@@ -794,7 +794,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", rb_id2name(id));
+	rb_name_error(id, "wrong constant name %s", rb_id2name(id));
     }
     return rb_const_defined_at(mod, id);
 }
@@ -866,8 +866,7 @@ rb_convert_type(val, type, tname, method)
     arg1.val = arg2.val = val;
     arg1.s = method;
     arg2.s = tname;
-    val = rb_rescue2(to_type, (VALUE)&arg1, fail_to_type, (VALUE)&arg2,
-		     rb_eStandardError, rb_eNameError, 0);
+    val = rb_rescue2(to_type, (VALUE)&arg1, fail_to_type, (VALUE)&arg2);
     if (TYPE(val) != type) {
 	rb_raise(rb_eTypeError, "%s#%s should return %s",
 		 rb_class2name(CLASS_OF(arg1.val)), method, tname);
@@ -886,8 +885,7 @@ rb_to_integer(val, method)
     arg1.val = arg2.val = val;
     arg1.s = method;
     arg2.s = "Integer";
-    val = rb_rescue2(to_type, (VALUE)&arg1, fail_to_type, (VALUE)&arg2,
-		     rb_eStandardError, rb_eNameError, 0);
+    val = rb_rescue(to_type, (VALUE)&arg1, fail_to_type, (VALUE)&arg2);
     if (!rb_obj_is_kind_of(val, rb_cInteger)) {
 	rb_raise(rb_eTypeError, "%s#%s should return Integer",
 		 rb_class2name(CLASS_OF(arg1.val)), method);
-- 
cgit