diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 02:21:43 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 02:21:43 +0000 |
commit | ccb84f7b04861339be7130b0dccc9de3a52a3436 (patch) | |
tree | 6132efdad26047f77c729ddb543e7f34e5ac272c | |
parent | 116843c6f00e3a5dca5437b6b9364d4466fdb542 (diff) |
merge revision(s) 34022: [Backport #5753]
* parse.y (parser_magic_comment): should pass the proper value.
[ruby-dev:44984][Bug #5753]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 1 | ||||
-rw-r--r-- | test/ripper/test_parser_events.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Thu Apr 11 11:21:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@dotrb.org> * ext/date/date_core.c: [ruby-core:52303] @@ -6545,6 +6545,7 @@ parser_magic_comment(struct parser_params *parser, const char *str, long len) } } while (++p < magic_comments + numberof(magic_comments)); #else + str_copy(val, vbeg, vend - vbeg); dispatch2(magic_comment, name, val); #endif } diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb index e6968e1a17..af41d3e6a4 100644 --- a/test/ripper/test_parser_events.rb +++ b/test/ripper/test_parser_events.rb @@ -592,8 +592,8 @@ class TestRipper::ParserEvents < Test::Unit::TestCase 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 @@ -1,5 +1,5 @@ #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 |