From a052ef75abbf7cc6035083a8af05cf4051ca0110 Mon Sep 17 00:00:00 2001 From: dave Date: Fri, 26 Nov 2004 04:32:11 +0000 Subject: [PATCH] Fix problem with :section: and new 1.9 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/rdoc/markup/simple_markup/preprocess.rb | 2 -- lib/rdoc/parsers/parse_rb.rb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d90edb722..0b9fb920b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 26 13:29:02 2004 Dave Thomas + + * 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 * 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 08ac66139b..101c9bdeb1 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 1a61c4bf1e..2f76b95d31 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