From 5e686f8ba3a7728398f4ed4d89bdde54fad7554d Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 29 Jun 2008 08:24:20 +0000
Subject: merge revision(s) 17497: 	* lib/rdoc/parsers/parse_rb.rb
 (RDoc#collect_first_comment): skip 	  magic comment.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/parsers/parse_rb.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 58ba06084e..750c483c15 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1546,10 +1546,15 @@ module RDoc
 
       tk = get_tk
       while tk.kind_of?(TkCOMMENT)
-        if first_line && tk.text[0,2] == "#!"
+        if first_line && /\A#!/ =~ tk.text
+          skip_tkspace
+          tk = get_tk
+        elsif first_line && /\A#\s*-\*-/ =~ tk.text
+          first_line = false
           skip_tkspace
           tk = get_tk
         else
+          first_line = false
           res << tk.text << "\n"
           tk = get_tk
           if tk.kind_of? TkNL
@@ -1557,7 +1562,6 @@ module RDoc
             tk = get_tk
           end
         end
-        first_line = false
       end
       unget_tk(tk)
       res
-- 
cgit v1.2.3