From 69492b4dcf5eb3e8c38f94bdbb4ea42ed32a2a96 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 9 Aug 2013 07:22:51 +0000 Subject: merge revision(s) 40606,40607,40635: [Backport #8375] test_scanner_events.rb: assert_location * test/ripper/test_scanner_events.rb (TestRipper#assert_location): rename so skipped in backtraces. * parse.y (parser_yylex): fail if $, @, @@ are not followed by a valid name character. [ruby-core:54846] [Bug #8375]. * parse.y (parser_peek_variable_name): treat invalid global, class, and instance variable names as mere strings rather than errors. [ruby-core:54885] [Bug #8375] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 5afcec1cca..883f0fed76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Fri Aug 9 15:59:22 2013 Nobuyoshi Nakada + + * parse.y (parser_peek_variable_name): treat invalid global, class, + and instance variable names as mere strings rather than errors. + [ruby-core:54885] [Bug #8375] + +Fri Aug 9 15:59:22 2013 Nobuyoshi Nakada + + * parse.y (parser_yylex): fail if $, @, @@ are not followed by a valid + name character. [ruby-core:54846] [Bug #8375]. + Fri Aug 9 15:56:05 2013 NAKAMURA Usaku * lib/net/http.rb (Net::HTTP#send_request_with_body_stream): use -- cgit v1.2.3