From 0c6508d2181dde9ba4ccb6f3e7ff9a3ba02ad77b Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 23 Aug 2001 06:02:15 +0000
Subject: * eval.c (is_defined): should not dump core for "defined?(())".

* eval.c (umethod_bind): recv can be an instance of descender of
  oklass if oklass is a Module.

* hash.c (rb_hash_equal): check identiry equality first.

* file.c (group_member): should check real gid only.

* file.c (eaccess): do not cache euid, since effective euid may be
  changed via Process.euid=().

* file.c (eaccess): return -1 unless every specified access mode
  is permitted.

* eval.c (rb_eval): while/until returns the value which is given
  to break.

* parse.y (value_expr): using while/until/class/def as an
  expression is now gives a warning, not an error.

* range.c (range_eqq): should compare strings based on magical
  increment (using String#upto), not dictionary order.

* enum.c (enum_sort_by): new method for Schewartzian transformed
  stable sort.

* variable.c (mod_av_set): detect constant overriding for built-in
  classes/modules.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'eval.c')

diff --git a/eval.c b/eval.c
index d4a8f6f5f..f88510e15 100644
--- a/eval.c
+++ b/eval.c
@@ -1748,6 +1748,7 @@ is_defined(self, node, buf)
     VALUE val;			/* OK */
     int state;
 
+    if (!node) return "expression";
     switch (nd_type(node)) {
       case NODE_SUPER:
       case NODE_ZSUPER:
@@ -2272,7 +2273,7 @@ rb_eval(self, n)
 	switch (state = EXEC_TAG()) {
 	  case 0:
 	    ruby_sourceline = nd_line(node);
-	    if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond)))
+	    if (node->nd_state && !RTEST(result = rb_eval(self, node->nd_cond)))
 		goto while_out;
 	    do {
 	      while_redo:
@@ -2290,19 +2291,20 @@ rb_eval(self, n)
 	    goto while_next;
 	  case TAG_BREAK:
 	    state = 0;
+	    result = prot_tag->retval;
 	  default:
 	    break;
 	}
       while_out:
 	POP_TAG();
 	if (state) JUMP_TAG(state);
-	RETURN(Qnil);
+	RETURN(result);
 
       case NODE_UNTIL:
 	PUSH_TAG(PROT_NONE);
 	switch (state = EXEC_TAG()) {
 	  case 0:
-	    if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
+	    if (node->nd_state && RTEST(result = rb_eval(self, node->nd_cond)))
 		goto until_out;
 	    do {
 	      until_redo:
@@ -2320,6 +2322,7 @@ rb_eval(self, n)
 	    goto until_next;
 	  case TAG_BREAK:
 	    state = 0;
+	    result = prot_tag->retval;
 	  default:
 	    break;
 	}
@@ -6804,7 +6807,9 @@ umethod_bind(method, recv)
 	    st_lookup(RCLASS(CLASS_OF(recv))->m_tbl, data->oid, 0)) {
 	    rb_raise(rb_eTypeError, "method `%s' overridden", rb_id2name(data->oid));
 	}
-	if (!rb_obj_is_instance_of(recv, data->oklass)) {
+	if (!((TYPE(data->oklass) == T_MODULE) ?
+	      rb_obj_is_kind_of(recv, data->oklass) :
+	      rb_obj_is_instance_of(recv, data->oklass))) {
 	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
 		     rb_class2name(data->oklass));
 	}
-- 
cgit