summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-24 04:07:46 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-24 04:07:46 +0000
commit401077c47691ad25805d42e9829757b37a89cccd (patch)
tree7c28a637fdd37e3bd4a2a449fccf83fb43126413
parenta2f9f5aafea38ec419437175db0cd1fce38a2721 (diff)
downloadruby-401077c47691ad25805d42e9829757b37a89cccd.tar.gz
ruby-401077c47691ad25805d42e9829757b37a89cccd.tar.xz
ruby-401077c47691ad25805d42e9829757b37a89cccd.zip
Deal with case where first file processed contains a :stopdoc:
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--lib/rdoc/generators/html_generator.rb15
2 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c00015e71..a9a3c10a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Feb 24 07:23:30 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb: Deal with :stopdoc: when
+ choosing a default main page to display (ie. don't select a page
+ if we don't have documentation for it).
+
+Tue Feb 24 06:40:14 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
+ class variables in code listings
+
Tue Feb 24 06:40:14 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index a6a38f6a5..8db578b93 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -1276,7 +1276,20 @@ module Generators
end
end
- ref = @files[0].path unless ref
+ unless ref
+ for file in @files
+ if file.document_self
+ ref = file.path
+ break
+ end
+ end
+ end
+
+ unless ref
+ $stderr.puts "Couldn't find anything to document"
+ $stderr.puts "Perhaps you've used :stopdoc: in all classes"
+ exit(1)
+ end
ref
end