diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 09:37:26 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 09:37:26 +0000 |
| commit | 0d069bd2df3ea467efb1d9d3a64ae2334b5cc241 (patch) | |
| tree | 1ca4965823c024528de6a7bb96c3cccc9ecf932e /lib | |
| parent | 8ebcdf9ddf925fdda191a8ac23eb6dc0f7b91143 (diff) | |
merges r29140 and r29141 from trunk into ruby_1_9_2.
--
* lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
name signleton class. [Bug #3759], [ruby-dev:42154]
--
* lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
include assignment. [Bug #3759], [ruby-dev:42154]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/parser/ruby.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index 1876c339fa..bfb118c416 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -526,7 +526,7 @@ class RDoc::Parser::Ruby < RDoc::Parser else break unless @scanner.continue end - when TkCOMMENT + when TkCOMMENT, TkASSIGN, TkOPASGN unget_tk(tk) break when nil then @@ -568,7 +568,7 @@ class RDoc::Parser::Ruby < RDoc::Parser case name = get_class_specification when "self", container.name parse_statements container, SINGLE - else + when /\A[A-Z]/ other = RDoc::TopLevel.find_class_named name unless other then |