From 0d3f9dbfe1ab1696d1c9b1ef46c9da4af786e629 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 Mar 2008 00:59:23 +0000
Subject: * lib/rdoc/code_objects.rb: Remove debugging Kernel#p.  Patch by
 Lincoln Stoll   <lstoll at lstoll.net> * lib/rdoc/generator/html.rb: Fully
 qualify AllReferences.  Patch by Lincoln   Stoll <lstoll at lstoll.net> *
 lib/rdoc/ri/writer.rb: Fix 1.8 backwards compatibility.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/code_objects.rb   | 4 ++--
 lib/rdoc/generator/html.rb | 2 +-
 lib/rdoc/ri/writer.rb      | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index da383d69c4..b93ec99007 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -410,8 +410,8 @@ module RDoc
       end
       if result && method
         if !result.respond_to?(:find_local_symbol)
-          p result.name
-          p method
+          #p result.name
+          #p method
           fail
         end
         result = result.find_local_symbol(method)
diff --git a/lib/rdoc/generator/html.rb b/lib/rdoc/generator/html.rb
index 95617725e9..f035857aff 100644
--- a/lib/rdoc/generator/html.rb
+++ b/lib/rdoc/generator/html.rb
@@ -247,7 +247,7 @@ class RDoc::Generator::HTML
     @main_page = @options.main_page
     @main_page_ref = nil
     if @main_page
-      @main_page_ref = AllReferences[@main_page]
+      @main_page_ref = RDoc::Generator::AllReferences[@main_page]
       if @main_page_ref then
         @main_page_path = @main_page_ref.path
       else
diff --git a/lib/rdoc/ri/writer.rb b/lib/rdoc/ri/writer.rb
index 2d14942bdd..92aaa1c2da 100644
--- a/lib/rdoc/ri/writer.rb
+++ b/lib/rdoc/ri/writer.rb
@@ -12,7 +12,11 @@ class RDoc::RI::Writer
   # form (where punctuation is replaced by %xx)
 
   def self.internal_to_external(name)
-    name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+    if ''.respond_to? :ord then
+      name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+    else
+      name.gsub(/\W/) { "%%%02x" % $&[0] }
+    end
   end
 
   ##
-- 
cgit v1.2.3