summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 08:24:20 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 08:24:20 +0000
commit5e686f8ba3a7728398f4ed4d89bdde54fad7554d (patch)
tree4e278773db5da1c8a235c4f0e0daf9ec28092a4e /lib
parentdf1b7c729fc0701b2c371b78650f26acf0ec3398 (diff)
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
Diffstat (limited to 'lib')
-rw-r--r--lib/rdoc/parsers/parse_rb.rb8
1 files changed, 6 insertions, 2 deletions
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