summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-07 13:14:58 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-07 13:14:58 +0000
commit1d9c5caf1af658d792d4288eede66654d3272898 (patch)
tree9403f0e2cd6d88f9accdb2beca77adca07893c38
parent9b91806f65e14365f29aea43a91705eb4c8c1b4c (diff)
downloadruby-1d9c5caf1af658d792d4288eede66654d3272898.tar.gz
ruby-1d9c5caf1af658d792d4288eede66654d3272898.tar.xz
ruby-1d9c5caf1af658d792d4288eede66654d3272898.zip
Allow multiple arguments to include
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/parsers/parse_rb.rb12
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d2083a718..66daef0c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 7 21:50:21 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
+ multiple arguments to 'include'
+
Fri May 7 21:31:56 2004 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 1a3874fe2..904475db2 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -2386,10 +2386,14 @@ module RDoc
end
def parse_include(context, comment)
- skip_tkspace_comment
- name = get_constant_with_optional_parens
- unless name.empty?
- context.add_include(Include.new(name, comment))
+ loop do
+ skip_tkspace_comment
+ name = get_constant_with_optional_parens
+ unless name.empty?
+ context.add_include(Include.new(name, comment))
+ end
+ return unless peek_tk.kind_of?(TkCOMMA)
+ get_tk
end
end