From 58a93ce44169f20c6e9c104a26c99d51768c2eb7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Apr 2010 15:03:18 +0000
Subject: * lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/class_module.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb
index c3029bfe9b..321aaee57d 100644
--- a/lib/rdoc/class_module.rb
+++ b/lib/rdoc/class_module.rb
@@ -145,12 +145,13 @@ class RDoc::ClassModule < RDoc::Context
   # 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|
-- 
cgit v1.2.3