mirror of
https://github.com/ruby/ruby.git
synced 2025-09-17 17:43:59 +02:00
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
This commit is contained in:
parent
8ebcdf9ddf
commit
0d069bd2df
4 changed files with 13 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue