From 5940b1f6fc6745e4cb7516345a24b9b45567d21b Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 24 Oct 2014 13:49:44 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ parse.y | 6 ++++++ test/ripper/test_scanner_events.rb | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1299853391..51b8ebb9be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 24 22:49:42 2014 Nobuyoshi Nakada + + * 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 * signal.c (check_reserved_signal_): fix write count since r47991. diff --git a/parse.y b/parse.y index fd26f5563c..291addf6c5 100644 --- a/parse.y +++ b/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; } } diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb index 3044d20049..e57300ed0f 100644 --- a/test/ripper/test_scanner_events.rb +++ b/test/ripper/test_scanner_events.rb @@ -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