From 13ac4447f6a11498d84f668c636fa2b8eecb5d22 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 30 Sep 2003 00:21:14 +0000 Subject: * eval.c (rb_eval): while/until should not capture break unless they are destination of the break. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 14 ++++++++++---- process.c | 9 ++++++++- regex.c | 2 +- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28777e0645..4982b1fea1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 30 09:11:43 2003 Yukihiro Matsumoto + + * eval.c (rb_eval): while/until should not capture break unless + they are destination of the break. + Tue Sep 30 03:12:02 2003 Minero Aoki * lib/net/http.rb (finish): revert to 1.93. diff --git a/eval.c b/eval.c index 3ee0b4d5da..5c2ff1790f 100644 --- a/eval.c +++ b/eval.c @@ -2650,8 +2650,11 @@ rb_eval(self, n) state = 0; goto while_next; case TAG_BREAK: - state = 0; - result = prot_tag->retval; + if (TAG_DST()) { + state = 0; + result = prot_tag->retval; + } + /* fall through */ default: break; } @@ -2682,8 +2685,11 @@ rb_eval(self, n) state = 0; goto until_next; case TAG_BREAK: - state = 0; - result = prot_tag->retval; + if (TAG_DST()) { + state = 0; + result = prot_tag->retval; + } + /* fall through */ default: break; } diff --git a/process.c b/process.c index d1c9724094..e30818d0e7 100644 --- a/process.c +++ b/process.c @@ -159,7 +159,14 @@ pst_inspect(st) snprintf(buf, sizeof(buf), "#<%s: pid=%ld", rb_class2name(CLASS_OF(st)), NUM2LONG(pid)); str = rb_str_new2(buf); if (WIFSTOPPED(status)) { - snprintf(buf, sizeof(buf), ",stopped(%d)", WSTOPSIG(status)); + int stopsig = WSTOPSIG(status); + char *signame = ruby_signal_name(stopsig); + if (signame) { + snprintf(buf, sizeof(buf), ",signaled(SIG%s=%d)", signame, stopsig); + } + else { + snprintf(buf, sizeof(buf), ",signaled(%d)", stopsig); + } rb_str_cat2(str, buf); } if (WIFSIGNALED(status)) { diff --git a/regex.c b/regex.c index fea8bf9f7e..d684eca835 100644 --- a/regex.c +++ b/regex.c @@ -3196,7 +3196,7 @@ re_search(bufp, string, size, startpos, range, regs) } } if (bufp->options & RE_OPTIMIZE_ANCHOR) { - if (bufp->options&RE_OPTION_SINGLELINE) { + if (bufp->options&RE_OPTION_MULTILINE && range > 0) { goto begbuf_match; } anchor = 1; -- cgit v1.2.3