1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
matz 2003-09-30 00:21:14 +00:00
parent e377a12bff
commit 13ac4447f6
4 changed files with 24 additions and 6 deletions

View file

@ -1,3 +1,8 @@
Tue Sep 30 09:11:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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 <aamine@loveruby.net>
* lib/net/http.rb (finish): revert to 1.93.

14
eval.c
View file

@ -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;
}

View file

@ -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)) {

View file

@ -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;