From 336a8301f725bd8fbf5f1e0c4fee162382a76d0f Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Apr 2010 03:45:22 +0000
Subject: Import RDoc 2.5.7.  Fixes #1318 and ruby-core:29780

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/parser/c.rb      | 5 +----
 lib/rdoc/parser/ruby.rb   | 5 +----
 lib/rdoc/parser/simple.rb | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'lib/rdoc/parser')

diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb
index 05b1e77925..f30167aafc 100644
--- a/lib/rdoc/parser/c.rb
+++ b/lib/rdoc/parser/c.rb
@@ -661,7 +661,7 @@ class RDoc::Parser::C < RDoc::Parser
   def look_for_directives_in(context, comment)
     preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
 
-    preprocess.handle comment do |directive, param|
+    preprocess.handle comment, context do |directive, param|
       case directive
       when 'main' then
         @options.main_page = param
@@ -669,9 +669,6 @@ class RDoc::Parser::C < RDoc::Parser
       when 'title' then
         @options.title = param
         ''
-      else
-        context.metadata[directive] = param
-        false
       end
     end
 
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
index c8bab57607..1876c339fa 100644
--- a/lib/rdoc/parser/ruby.rb
+++ b/lib/rdoc/parser/ruby.rb
@@ -379,7 +379,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
   def look_for_directives_in(context, comment)
     preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
 
-    preprocess.handle comment do |directive, param|
+    preprocess.handle comment, context do |directive, param|
       case directive
       when 'enddoc' then
         throw :enddoc
@@ -403,9 +403,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
       when 'title' then
         @options.title = param
         ''
-      else
-        @top_level.metadata[directive] = param
-        false
       end
     end
 
diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb
index 25fa3c5159..e99d2d4319 100644
--- a/lib/rdoc/parser/simple.rb
+++ b/lib/rdoc/parser/simple.rb
@@ -17,10 +17,7 @@ class RDoc::Parser::Simple < RDoc::Parser
 
     preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
 
-    preprocess.handle @content do |directive, param|
-      top_level.metadata[directive] = param
-      false
-    end
+    preprocess.handle @content, @top_level
   end
 
   ##
-- 
cgit v1.2.3