зеркало из https://github.com/github/ruby.git
parse.y: fix fluent interface identifier
* parse.y (parser_yylex): dispatch newline and space at fluent interface, so that the following identifier does not include the space. [ruby-dev:48684] [Bug #10411] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
fe4ed311d1
Коммит
5940b1f6fc
|
@ -1,3 +1,9 @@
|
|||
Fri Oct 24 22:49:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* parse.y (parser_yylex): dispatch newline and space at fluent
|
||||
interface, so that the following identifier does not include the
|
||||
space. [ruby-dev:48684] [Bug #10411]
|
||||
|
||||
Fri Oct 24 20:41:36 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
|
||||
|
||||
* signal.c (check_reserved_signal_): fix write count since r47991.
|
||||
|
|
6
parse.y
6
parse.y
|
@ -7763,9 +7763,15 @@ parser_yylex(struct parser_params *parser)
|
|||
space_seen = 1;
|
||||
break;
|
||||
case '.': {
|
||||
#ifdef RIPPER
|
||||
ripper_dispatch_delayed_token(parser, tIGNORED_NL);
|
||||
#endif
|
||||
if ((c = nextc()) != '.') {
|
||||
pushback(c);
|
||||
pushback('.');
|
||||
#ifdef RIPPER
|
||||
ripper_dispatch_scan_event(parser, tSP);
|
||||
#endif
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,6 +38,10 @@ class TestRipper::ScannerEvents < Test::Unit::TestCase
|
|||
Ripper.tokenize("print( <<""EOS)\nheredoc\nEOS\n")
|
||||
assert_equal ["\#\n", "\n", "\#\n", "\n", "nil", "\n"],
|
||||
Ripper.tokenize("\#\n\n\#\n\nnil\n")
|
||||
assert_equal ["1", " ", ".", "foo", "\n"],
|
||||
Ripper.tokenize("1 .foo\n")
|
||||
assert_equal ["1", "\n", " ", ".", "foo", "\n"],
|
||||
Ripper.tokenize("1\n .foo\n")
|
||||
end
|
||||
|
||||
def test_lex
|
||||
|
|
Загрузка…
Ссылка в новой задаче