usa	2013-04-11 11:21:43 +0900 (Thu, 11 Apr 2013)

  New Revision: 40228

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

  Log:
    merge revision(s) 34022: [Backport #5753]
    
    * parse.y (parser_magic_comment): should pass the proper value.
      [ruby-dev:44984][Bug #5753]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/parse.y
    branches/ruby_1_9_3/test/ripper/test_parser_events.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 40227)
+++ ruby_1_9_3/ChangeLog	(revision 40228)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Apr 11 11:21:25 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (parser_magic_comment): should pass the proper value.
+	  [ruby-dev:44984][Bug #5753]
+
 Thu Apr 11 11:18:57 2013  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_core.c: [ruby-core:52303]
Index: ruby_1_9_3/parse.y
===================================================================
--- ruby_1_9_3/parse.y	(revision 40227)
+++ ruby_1_9_3/parse.y	(revision 40228)
@@ -6545,6 +6545,7 @@ parser_magic_comment(struct parser_param https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/parse.y#L6545
 	    }
 	} while (++p < magic_comments + numberof(magic_comments));
 #else
+	str_copy(val, vbeg, vend - vbeg);
 	dispatch2(magic_comment, name, val);
 #endif
     }
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40227)
+++ ruby_1_9_3/version.h	(revision 40228)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 412
+#define RUBY_PATCHLEVEL 413
 
 #define RUBY_RELEASE_DATE "2013-04-11"
 #define RUBY_RELEASE_YEAR 2013
Index: ruby_1_9_3/test/ripper/test_parser_events.rb
===================================================================
--- ruby_1_9_3/test/ripper/test_parser_events.rb	(revision 40227)
+++ ruby_1_9_3/test/ripper/test_parser_events.rb	(revision 40228)
@@ -592,8 +592,8 @@ class TestRipper::ParserEvents < Test::U https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/ripper/test_parser_events.rb#L592
 
   def test_magic_comment
     thru_magic_comment = false
-    parse('# -*- foo:bar -*-', :on_magic_comment) {thru_magic_comment = true}
-    assert_equal true, thru_magic_comment
+    parse('# -*- bug-5753: ruby-dev:44984 -*-', :on_magic_comment) {|*x|thru_magic_comment = x}
+    assert_equal [:on_magic_comment, "bug_5753", "ruby-dev:44984"], thru_magic_comment
   end
 
   def test_method_add_block

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r34022


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