diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 1 | ||||
| -rw-r--r-- | test/ripper/test_scanner_events.rb | 5 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Aug 16 23:58:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (yylex): should dispatch scan-event even when follows + just after delayed-token. [ruby-dev:37855] [Bug #1071] + Sun Aug 16 15:25:26 2009 NARUSE, Yui <naruse@ruby-lang.org> * lib/csv.rb: Change magic comment to US-ASCII in order to @@ -7666,7 +7666,6 @@ yylex(void *p) #ifdef RIPPER if (!NIL_P(parser->delayed)) { ripper_dispatch_delayed_token(parser, t); - return t; } if (t != 0) ripper_dispatch_scan_event(parser, t); diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb index 438994610..659916570 100644 --- a/test/ripper/test_scanner_events.rb +++ b/test/ripper/test_scanner_events.rb @@ -63,6 +63,11 @@ class TestRipper_ScannerEvents < Test::Unit::TestCase [[2, 0], :on_tstring_content, "heredoc\n"], [[3, 0], :on_heredoc_end, "EOS"]], Ripper.lex("<<EOS\nheredoc\nEOS") + assert_equal [[[1, 0], :on_regexp_beg, "/"], + [[1, 1], :on_tstring_content, "foo\n"], + [[2, 0], :on_tstring_content, "bar"], + [[2, 3], :on_regexp_end, "/"]], + Ripper.lex("/foo\nbar/") end def test_location @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 293 +#define RUBY_PATCHLEVEL 294 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |