mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* parse.y (parser_yylex): wrong token was generated. [ruby-dev:32498]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f4592d7bb0
commit
6e12ae857e
3 changed files with 9 additions and 5 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Mon Dec 10 07:48:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* parse.y (parser_yylex): wrong token was generated. [ruby-dev:32498]
|
||||||
|
|
||||||
Mon Dec 10 06:44:47 2007 Tanaka Akira <akr@fsij.org>
|
Mon Dec 10 06:44:47 2007 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* re.c (rb_reg_expr_str): use \xHH instead of \OOO.
|
* re.c (rb_reg_expr_str): use \xHH instead of \OOO.
|
||||||
|
|
|
@ -169,9 +169,9 @@ assert_equal %q{11}, %q{
|
||||||
Thread.current[:a]
|
Thread.current[:a]
|
||||||
}.value + Thread.current[:a]
|
}.value + Thread.current[:a]
|
||||||
}
|
}
|
||||||
assert_equal %q{1000}, %q{
|
assert_equal %q{100}, %q{
|
||||||
begin
|
begin
|
||||||
1000.times do |i|
|
100.times do |i|
|
||||||
begin
|
begin
|
||||||
Thread.start(Thread.current) {|u| u.raise }
|
Thread.start(Thread.current) {|u| u.raise }
|
||||||
raise
|
raise
|
||||||
|
@ -180,6 +180,6 @@ begin
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue
|
rescue
|
||||||
1000
|
100
|
||||||
end
|
end
|
||||||
}, '[ruby-dev:31371]'
|
}, '[ruby-dev:31371]'
|
||||||
|
|
4
parse.y
4
parse.y
|
@ -6087,8 +6087,8 @@ parser_yylex(struct parser_params *parser)
|
||||||
c = nextc();
|
c = nextc();
|
||||||
if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
|
if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
|
||||||
lex_state = EXPR_ARG;
|
lex_state = EXPR_ARG;
|
||||||
if (c != '@') {
|
if (c == '@') {
|
||||||
pushback(c);
|
return '!';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Add table
Reference in a new issue