From 27f15990add9196eb04e3a6b4da951e7e4280beb Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 16 Jan 2011 06:30:28 +0000
Subject: [PATCH] merges r30381 from trunk into ruby_1_9_2. -- * parse.y
 (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.  
 http://twitter.com/#!/wannabe53/status/18797576396472321  
 http://twitter.com/#!/wannabe53/status/18798416150663168

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                         |  6 ++++++
 parse.y                           |  6 ++++++
 test/ripper/dummyparser.rb        | 14 ++++++++------
 test/ripper/test_parser_events.rb | 17 +++++++++++++----
 version.h                         |  2 +-
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db064b2624..ffec148bf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 26 11:39:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.
+	  http://twitter.com/#!/wannabe53/status/18797576396472321
+	  http://twitter.com/#!/wannabe53/status/18798416150663168
+
 Sun Dec 26 04:31:15 2010  Luis Lavena  <luislavena@gmail.com>
 
 	* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
diff --git a/parse.y b/parse.y
index ff683a38b4..7ef894df48 100644
--- a/parse.y
+++ b/parse.y
@@ -1171,8 +1171,14 @@ stmt		: keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| primary_value tCOLON2 tCONSTANT tOP_ASGN command_call
 		    {
+		    /*%%%*/
 			yyerror("constant re-assignment");
 			$$ = 0;
+		    /*%
+			$$ = dispatch2(const_path_field, $1, $3);
+			$$ = dispatch3(opassign, $$, $4, $5);
+			$$ = dispatch1(assign_error, $$);
+		    %*/
 		    }
 		| primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_call
 		    {
diff --git a/test/ripper/dummyparser.rb b/test/ripper/dummyparser.rb
index ffc1f78ac6..07a7eda023 100644
--- a/test/ripper/dummyparser.rb
+++ b/test/ripper/dummyparser.rb
@@ -10,7 +10,7 @@ class Node
     @children = nodes
   end
 
-  attr_reader :children
+  attr_reader :name, :children
 
   def to_s
     "#{@name}(#{Node.trim_nil(@children).map {|n| n.to_s }.join(',')})"
@@ -47,12 +47,14 @@ class NodeList
 end
 
 class DummyParser < Ripper
-  def hook(name)
+  def hook(*names)
     class << self; self; end.class_eval do
-      define_method(name) do |*a, &b|
-        result = super(*a, &b)
-        yield(*a)
-        result
+      names.each do |name|
+        define_method(name) do |*a, &b|
+          result = super(*a, &b)
+          yield(name, *a)
+          result
+        end
       end
     end
     self
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
index 2ac623f76d..15a5d2b3a9 100644
--- a/test/ripper/test_parser_events.rb
+++ b/test/ripper/test_parser_events.rb
@@ -20,7 +20,7 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
 
   def parse(str, nm = nil, &bl)
     dp = DummyParser.new(str)
-    dp.hook(nm, &bl) if nm
+    dp.hook(*nm, &bl) if nm
     dp.parse.to_s
   end
 
@@ -347,10 +347,10 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
     assert_equal true, thru_heredoc_beg
     assert_match(/string_content\(\),heredoc\n/, tree, bug1921)
     heredoc = nil
-    parse("<<EOS\nheredoc1\nheredoc2\nEOS\n", :on_string_add) {|n, s| heredoc = s}
+    parse("<<EOS\nheredoc1\nheredoc2\nEOS\n", :on_string_add) {|e, n, s| heredoc = s}
     assert_equal("heredoc1\nheredoc2\n", heredoc, bug1921)
     heredoc = nil
-    parse("<<-EOS\nheredoc1\nheredoc2\n\tEOS\n", :on_string_add) {|n, s| heredoc = s}
+    parse("<<-EOS\nheredoc1\nheredoc2\n\tEOS\n", :on_string_add) {|e, n, s| heredoc = s}
     assert_equal("heredoc1\nheredoc2\n", heredoc, bug1921)
   end
 
@@ -676,6 +676,15 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
     assert_equal true, thru_opassign
   end
 
+  def test_opassign_error
+    thru_opassign = []
+    events = [:on_opassign, :on_assign_error]
+    parse('a::X ||= c 1', events) {|a,*b|
+      thru_opassign << a
+    }
+    assert_equal events, thru_opassign
+  end
+
   def test_param_error
     thru_param_error = false
     parse('def foo(A) end', :on_param_error) {thru_param_error = true}
@@ -1104,7 +1113,7 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
 
   def test_unterminated_regexp
     compile_error = false
-    parse('/', :compile_error) {|msg| compile_error = msg}
+    parse('/', :compile_error) {|e, msg| compile_error = msg}
     assert_equal("unterminated regexp meets end of file", compile_error)
   end
 end if ripper_test
diff --git a/version.h b/version.h
index afc89d02d1..928327c28d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 140
+#define RUBY_PATCHLEVEL 141
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1