yugui	2009-10-28 23:14:59 +0900 (Wed, 28 Oct 2009)

  New Revision: 25534

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25534

  Log:
    merges r24557 from trunk into ruby_1_9_1.
    --
    * parse.y (yylex): should dispatch scan-event even when follows
      just after delayed-token.  [ruby-dev:37855] [Bug #1071]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/parse.y
    branches/ruby_1_9_1/test/ripper/test_scanner_events.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25533)
+++ ruby_1_9_1/ChangeLog	(revision 25534)
@@ -1,3 +1,8 @@
+Sun Aug 16 23:58:22 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* lib/csv.rb: Change magic comment to US-ASCII in order to
Index: ruby_1_9_1/parse.y
===================================================================
--- ruby_1_9_1/parse.y	(revision 25533)
+++ ruby_1_9_1/parse.y	(revision 25534)
@@ -7666,7 +7666,6 @@
 #ifdef RIPPER
     if (!NIL_P(parser->delayed)) {
 	ripper_dispatch_delayed_token(parser, t);
-	return t;
     }
     if (t != 0)
 	ripper_dispatch_scan_event(parser, t);
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25533)
+++ ruby_1_9_1/version.h	(revision 25534)
@@ -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
Index: ruby_1_9_1/test/ripper/test_scanner_events.rb
===================================================================
--- ruby_1_9_1/test/ripper/test_scanner_events.rb	(revision 25533)
+++ ruby_1_9_1/test/ripper/test_scanner_events.rb	(revision 25534)
@@ -63,6 +63,11 @@
                   [[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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/