drbrain	2013-12-03 09:42:49 +0900 (Tue, 03 Dec 2013)

  New Revision: 43962

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43962

  Log:
    * lib/rdoc:  Update to RDoc master 900de99.  Changes include:
    
      Fixed documentation display of constants
    
      Fixed handling of unknown parsers
    
    * test/rdoc:  ditto.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/constant.rb
    trunk/lib/rdoc/parser.rb
    trunk/lib/rdoc.rb
    trunk/test/rdoc/test_rdoc_parser.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43961)
+++ ChangeLog	(revision 43962)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Dec  3 09:42:27 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rdoc:  Update to RDoc master 900de99.  Changes include:
+
+	  Fixed documentation display of constants
+
+	  Fixed handling of unknown parsers
+
+	* test/rdoc:  ditto.
+
 Mon Dec  2 22:30:10 2013  NAKAMURA Usaku  <usa@r...>
 
 	* hash.c (getenv): fixed test failures introduced by r43950.
Index: lib/rdoc.rb
===================================================================
--- lib/rdoc.rb	(revision 43961)
+++ lib/rdoc.rb	(revision 43962)
@@ -64,7 +64,7 @@ module RDoc https://github.com/ruby/ruby/blob/trunk/lib/rdoc.rb#L64
   ##
   # RDoc version you are using
 
-  VERSION = '4.1.0.preview.2'
+  VERSION = '4.1.0.preview.3'
 
   ##
   # Method visibilities
Index: lib/rdoc/constant.rb
===================================================================
--- lib/rdoc/constant.rb	(revision 43961)
+++ lib/rdoc/constant.rb	(revision 43962)
@@ -63,15 +63,7 @@ class RDoc::Constant < RDoc::CodeObject https://github.com/ruby/ruby/blob/trunk/lib/rdoc/constant.rb#L63
   # for a documented class or module.
 
   def documented?
-    return true if super
-    return false unless @is_alias_for
-    case @is_alias_for
-    when String then
-      found = @store.find_class_or_module @is_alias_for
-      return false unless found
-      @is_alias_for = found
-    end
-    @is_alias_for.documented?
+    super or is_alias_for && is_alias_for.documented?
   end
 
   ##
Index: lib/rdoc/parser.rb
===================================================================
--- lib/rdoc/parser.rb	(revision 43961)
+++ lib/rdoc/parser.rb	(revision 43962)
@@ -268,9 +268,11 @@ class RDoc::Parser https://github.com/ruby/ruby/blob/trunk/lib/rdoc/parser.rb#L268
 
     markup = Regexp.escape markup
 
-    RDoc::Parser.parsers.find do |_, parser|
+    _, selected = RDoc::Parser.parsers.find do |_, parser|
       /^#{markup}$/i =~ parser.name.sub(/.*:/, '')
-    end.last
+    end
+
+    selected
   end
 
   ##
Index: test/rdoc/test_rdoc_parser.rb
===================================================================
--- test/rdoc/test_rdoc_parser.rb	(revision 43961)
+++ test/rdoc/test_rdoc_parser.rb	(revision 43962)
@@ -292,6 +292,16 @@ class TestRDocParser < RDoc::TestCase https://github.com/ruby/ruby/blob/trunk/test/rdoc/test_rdoc_parser.rb#L292
     assert_nil parser
   end
 
+  def test_class_use_markup_unknown
+    content = <<-CONTENT
+# :markup: RDoc
+    CONTENT
+
+    parser = @RP.use_markup content
+
+    assert_nil parser
+  end
+
   def test_initialize
     @RP.new @top_level, @fn, '', @options, nil
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/