diff options
-rw-r--r-- | parse.y | 8 | ||||
-rw-r--r-- | test/ripper/test_parser_events.rb | 25 |
2 files changed, 28 insertions, 5 deletions
@@ -1672,9 +1672,10 @@ mlhs_node : user_variable 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 $$ = NEW_CDECL(0, 0, NEW_COLON3($2)); /*% $$ = dispatch1(top_const_field, $2); + if (in_def || in_single) { + $$ = dispatch1(assign_error, $$); + } %*/ } | backref diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb index c9b5690245..537d3fc406 100644 --- a/test/ripper/test_parser_events.rb +++ b/test/ripper/test_parser_events.rb @@ -183,29 +183,48 @@ class TestRipper::ParserEvents < Test::Unit::TestCase 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 |