diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-26 04:32:11 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-26 04:32:11 +0000 |
| commit | b208787a4f70b5c89756e8a230ca946e83d3657c (patch) | |
| tree | 818c27946260c3a7d4971adafaad8c040f24a1f0 | |
| parent | d726c4d14bab5e8258bb330cae7bca4de8f84f5f (diff) | |
| download | ruby-b208787a4f70b5c89756e8a230ca946e83d3657c.tar.gz ruby-b208787a4f70b5c89756e8a230ca946e83d3657c.tar.xz ruby-b208787a4f70b5c89756e8a230ca946e83d3657c.zip | |
Fix problem with :section: and new 1.9
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rdoc/markup/simple_markup/preprocess.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Fri Nov 26 13:29:02 2004 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in): Break + out of preprocessing when we find a :section: directive (previously cleared out the + comment, but this apparently now generates an error in gsub!) + Fri Nov 26 00:17:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (io_read): move StringValue() check before GetOpenFile(). diff --git a/lib/rdoc/markup/simple_markup/preprocess.rb b/lib/rdoc/markup/simple_markup/preprocess.rb index 08ac66139..101c9bdeb 100644 --- a/lib/rdoc/markup/simple_markup/preprocess.rb +++ b/lib/rdoc/markup/simple_markup/preprocess.rb @@ -19,13 +19,11 @@ module SM def handle(text) text.gsub!(/^([ \t#]*):(\w+):\s*(.+)?\n/) do - prefix = $1 directive = $2.downcase param = $3 case directive - when "include" filename = param.split[0] include_file(filename, prefix) diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index 1a61c4bf1..2f76b95d3 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -2312,7 +2312,7 @@ module RDoc when "section" context.set_current_section(param, comment) comment.clear - "" + break else warn "Unrecognized directive '#{directive}'" break |