1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-04-02 15:03:18 +00:00
parent 232ced7342
commit 58a93ce441
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,6 @@
Fri Apr 2 22:28:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Apr 3 00:03:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.
* lib/rdoc/parser/c.rb (RDoc#handle_method): see source files in * lib/rdoc/parser/c.rb (RDoc#handle_method): see source files in
source directory. source directory.

7
lib/rdoc/class_module.rb
View File

@ -145,12 +145,13 @@ class RDoc::ClassModule < RDoc::Context
# Merges +class_module+ into this ClassModule # Merges +class_module+ into this ClassModule
def merge class_module def merge class_module
if class_module.comment then comment = class_module.comment
if comment then
document = parse @comment document = parse @comment
class_module.comment.parts.push(*document.parts) comment.parts.concat(document.parts)
@comment = class_module.comment @comment = comment
end end
class_module.each_attribute do |attr| class_module.each_attribute do |attr|