nobu	2014-07-25 00:28:14 +0900 (Fri, 25 Jul 2014)

  New Revision: 46931

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

  Log:
    parse.y: dynamic const assign_error in ripper
    
    * parse.y (mlhs_node): dynamic constant assignment in massign
      should cause assign_error, like as single assign and backref
      assignment in massign.

  Modified files:
    trunk/parse.y
    trunk/test/ripper/test_parser_events.rb
Index: parse.y
===================================================================
--- parse.y	(revision 46930)
+++ parse.y	(revision 46931)
@@ -1672,9 +1672,10 @@ mlhs_node	: user_variable https://github.com/ruby/ruby/blob/trunk/parse.y#L1672
 			    yyerror("dynamic constant assignment");
 			$$ = NEW_CDECL(0, 0, NEW_COLON2($1, $3));
 		    /*%
-			if (in_def || in_single)
-			    yyerror("dynamic constant assignment");
 			$$ = dispatch2(const_path_field, $1, $3);
+			if (in_def || in_single) {
+			    $$ = dispatch1(assign_error, $$);
+			}
 		    %*/
 		    }
 		| tCOLON3 tCONSTANT
@@ -1685,6 +1686,9 @@ mlhs_node	: user_variable https://github.com/ruby/ruby/blob/trunk/parse.y#L1686
 			$$ = NEW_CDECL(0, 0, NEW_COLON3($2));
 		    /*%
 			$$ = dispatch1(top_const_field, $2);
+			if (in_def || in_single) {
+			    $$ = dispatch1(assign_error, $$);
+			}
 		    %*/
 		    }
 		| backref
Index: test/ripper/test_parser_events.rb
===================================================================
--- test/ripper/test_parser_events.rb	(revision 46930)
+++ test/ripper/test_parser_events.rb	(revision 46931)
@@ -183,29 +183,48 @@ class TestRipper::ParserEvents < Test::U https://github.com/ruby/ruby/blob/trunk/test/ripper/test_parser_events.rb#L183
   end
 
   def test_assign_error
+    # for test_coverage
+  end
+
+  def test_assign_error_backref
     thru_assign_error = false
     parse('$` = 1', :on_assign_error) {thru_assign_error = true}
     assert_equal true, thru_assign_error
     thru_assign_error = false
     parse('$`, _ = 1', :on_assign_error) {thru_assign_error = true}
     assert_equal true, thru_assign_error
+  end
 
+  def test_assign_error_const_qualified
     thru_assign_error = false
     parse('self::X = 1', :on_assign_error) {thru_assign_error = true}
     assert_equal false, thru_assign_error
-    parse('def m\n self::X = 1\nend', :on_assign_error) {thru_assign_error = true}
+    parse("def m\n self::X = 1\nend", :on_assign_error) {thru_assign_error = true}
     assert_equal true, thru_assign_error
+    thru_assign_error = false
+    parse("def m\n self::X, a = 1, 2\nend", :on_assign_error) {thru_assign_error = true}
+    assert_equal true, thru_assign_error
+  end
 
+  def test_assign_error_const
     thru_assign_error = false
     parse('X = 1', :on_assign_error) {thru_assign_error = true}
     assert_equal false, thru_assign_error
-    parse('def m\n X = 1\nend', :on_assign_error) {thru_assign_error = true}
+    parse("def m\n X = 1\nend", :on_assign_error) {thru_assign_error = true}
     assert_equal true, thru_assign_error
+    thru_assign_error = false
+    parse("def m\n X, a = 1, 2\nend", :on_assign_error) {thru_assign_error = true}
+    assert_equal true, thru_assign_error
+  end
 
+  def test_assign_error_const_toplevel
     thru_assign_error = false
     parse('::X = 1', :on_assign_error) {thru_assign_error = true}
     assert_equal false, thru_assign_error
-    parse('def m\n ::X = 1\nend', :on_assign_error) {thru_assign_error = true}
+    parse("def m\n ::X = 1\nend", :on_assign_error) {thru_assign_error = true}
+    assert_equal true, thru_assign_error
+    thru_assign_error = false
+    parse("def m\n ::X, a = 1, 2\nend", :on_assign_error) {thru_assign_error = true}
     assert_equal true, thru_assign_error
   end
 

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