summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-07 12:51:18 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-07 12:51:18 +0000
commit2ef65d76fa4f618d1a40e473eb18e0095912723d (patch)
treeaa3eedd067c0af0a9f015d740b0490e716f649c2
parent15193e110bded2f218c993f60c258fbb9c0233c7 (diff)
downloadruby-2ef65d76fa4f618d1a40e473eb18e0095912723d.tar.gz
ruby-2ef65d76fa4f618d1a40e473eb18e0095912723d.tar.xz
ruby-2ef65d76fa4f618d1a40e473eb18e0095912723d.zip
Allow multiple arguments to include
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6270 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 8374f60cd..13c0e77a6 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:03:51 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