nobu	2010-04-03 00:03:18 +0900 (Sat, 03 Apr 2010)

  New Revision: 27193

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27193

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

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/class_module.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27192)
+++ ChangeLog	(revision 27193)
@@ -1,5 +1,7 @@
-Fri Apr  2 22:28:03 2010  Nobuyoshi Nakada  <nobu@r...>
+Sat Apr  3 00:03:11 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.
+
 	* lib/rdoc/parser/c.rb (RDoc#handle_method): see source files in
 	  source directory.
 
Index: lib/rdoc/class_module.rb
===================================================================
--- lib/rdoc/class_module.rb	(revision 27192)
+++ lib/rdoc/class_module.rb	(revision 27193)
@@ -145,12 +145,13 @@
   # Merges +class_module+ into this ClassModule
 
   def merge class_module
-    if class_module.comment then
+    comment = class_module.comment
+    if comment then
       document = parse @comment
 
-      class_module.comment.parts.push(*document.parts)
+      comment.parts.concat(document.parts)
 
-      @comment = class_module.comment
+      @comment = comment
     end
 
     class_module.each_attribute do |attr|

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/