diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-11 02:53:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-11 02:53:31 +0000 |
commit | d311b7d0eb1e973c8d143f03e66ab72588f57a2a (patch) | |
tree | ff1cdd19d8da49467ed8319d3c7996fa6b61e7a6 | |
parent | 8322c36a9bb55a50faf03ffaf23e0ebf08f71e30 (diff) | |
download | ruby-d311b7d0eb1e973c8d143f03e66ab72588f57a2a.tar.gz |
parse.y: optional superclass
* parse.y (superclass): make superclass rule optional and allow
any contents without a terminator. [EXPERIMENTAL]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 14 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_markup_to_html.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_parse.rb | 4 |
4 files changed, 10 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Tue Aug 11 11:53:28 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (superclass): make superclass rule optional and allow + any contents without a terminator. [EXPERIMENTAL] + Tue Aug 11 10:58:42 2015 Juanito Fatas <juanitofatas@gmail.com> * string.c: [DOC] Make #end_with? example doc symmetry @@ -4465,15 +4465,7 @@ backref : tNTH_REF | tBACK_REF ; -superclass : term - { - /*%%%*/ - $$ = 0; - /*% - $$ = Qnil; - %*/ - } - | '<' +superclass : '<' { lex_state = EXPR_BEG; command_start = TRUE; @@ -4482,13 +4474,11 @@ superclass : term { $$ = $3; } - | error term + | /* none */ { /*%%%*/ - yyerrok; $$ = 0; /*% - yyerrok; $$ = Qnil; %*/ } diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb index 1e4b84fe9e..dbbd287188 100644 --- a/test/rdoc/test_rdoc_markup_to_html.rb +++ b/test/rdoc/test_rdoc_markup_to_html.rb @@ -619,6 +619,7 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase 'def x() end', 'def x; end', 'class C; end', + 'class C end', "module M end", 'a # => blah', 'x { |y| nil }', @@ -629,7 +630,6 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase ] invalid_syntax = [ 'def x end', - 'class C end', 'class C < end', 'module M < C end', 'a=># blah', diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb index 80d09c1e7b..673b0e7b74 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -206,9 +206,9 @@ class TestParse < Test::Unit::TestCase END end - assert_raise(SyntaxError) do + assert_nothing_raised(SyntaxError) do eval <<-END, nil, __FILE__, __LINE__+1 - class Foo Bar; end + class Foo 1; end END end end |