* marshal.c (w_object): instance variable dump do not cause error

  for objects that cannot be dumped, if they traversed from
  marshal_dump.  they are just ignored.

* gc.c (Init_stack): cast "space" (doble value) into unsigned
  int.  should run on PowerPC.

* eval.c (rb_eval): should not execute else part if any exception
  is caught. [ruby-dev:21482]

* parse.y (f_args): should allow unparenthesized block argument.

* parse.y (f_rest_arg): should allow unparenthesized rest
  argument.

* lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
  'class ::Foo' syntax. [ruby-talk:83514]


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

1 files changed, 1 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index e14215f7a7..bc10513a56 100644
--- a/eval.c
+++ b/eval.c
@@ -2828,7 +2828,7 @@ rb_eval(self, n)
 	    POP_TAG();
 	    if (state) JUMP_TAG(state);
 	    /* no exception raised */
-	    if (node = node->nd_else) { /* else clause given */
+	    if (!rescuing && (node = node->nd_else)) { /* else clause given */
 		goto again;
 	    }
 	}