diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | eval.c | 7 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Tue Apr 17 16:46:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (rb_yield_0): should not clear state on TAG_NEXT when + it's invoked from within lambda body. [ruby-talk:248136] + + * eval.c (proc_invoke): handle TAG_NEXT which would be caused by + next in the lambda body as well. + Mon Apr 16 22:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * ext/pty/expect_sample.rb: avoid symbolic link representation for @@ -5005,8 +5005,10 @@ rb_yield_0(val, self, klass, flags, avalue) CHECK_INTS; goto redo; case TAG_NEXT: - state = 0; - result = prot_tag->retval; + if (!lambda) { + state = 0; + result = prot_tag->retval; + } break; case TAG_BREAK: if (TAG_DST()) { @@ -8605,6 +8607,7 @@ proc_invoke(proc, args, self, klass) proc_jump_error(TAG_RETRY, Qnil); /* xxx */ JUMP_TAG(state); break; + case TAG_NEXT: case TAG_BREAK: if (!pcall && result != Qundef) { proc_jump_error(state, result); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-04-16" +#define RUBY_RELEASE_DATE "2007-04-17" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070416 +#define RUBY_RELEASE_CODE 20070417 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |