From 09af9d7f7ffe1bde891040e0232038130266ccbc Mon Sep 17 00:00:00 2001 From: drbrain Date: Thu, 29 Nov 2012 23:34:29 +0000 Subject: * lib/rdoc/generator/darkfish.rb: Silenced warning * test/rdoc/test_rdoc_rdoc.rb: ditto * lib/rdoc/markup/parser.rb: Use byteslice when available for performance * test/rdoc/test_rdoc_markup_parser.rb: Test for above * lib/rdoc/test_case.rb: ditto * lib/rdoc/parser/ruby.rb: Fixed bug parsing yield({}) * test/rdoc/test_rdoc_parser_ruby.rb (end): * lib/rdoc/rubygems_hook.rb: Skip default gems. Display generator name properly. * test/rdoc/test_rdoc_rubygems_hook.rb: Test for above * lib/rdoc/servlet.rb: Fixed typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rdoc/test_rdoc_markup_parser.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'test/rdoc/test_rdoc_markup_parser.rb') diff --git a/test/rdoc/test_rdoc_markup_parser.rb b/test/rdoc/test_rdoc_markup_parser.rb index 45f911acd1..b367b23bcc 100644 --- a/test/rdoc/test_rdoc_markup_parser.rb +++ b/test/rdoc/test_rdoc_markup_parser.rb @@ -7,13 +7,15 @@ class TestRDocMarkupParser < RDoc::TestCase def setup super + @have_byteslice = ''.respond_to? :byteslice + @RMP = @RM::Parser end def mu_pp(obj) s = '' s = PP.pp obj, s - s = s.force_encoding(Encoding.default_external) if defined? Encoding + s = s.force_encoding(Encoding.default_external) if @have_encoding s.chomp end @@ -34,7 +36,7 @@ class TestRDocMarkupParser < RDoc::TestCase s.scan(/\S+/) - if Object.const_defined? :Encoding then + if @have_byteslice or @have_encoding then assert_equal 3, parser.char_pos(s.pos) else assert_equal 4, parser.char_pos(s.pos) @@ -1364,7 +1366,7 @@ cat:: end def test_tokenize_note_utf_8 - skip 'Encoding not implemented' unless Object.const_defined? :Encoding + skip 'Encoding not implemented' unless @have_encoding str = <<-STR cät:: l1a @@ -1630,7 +1632,7 @@ Example heading: s.scan(/\S+/) - if Object.const_defined? :Encoding then + if @have_encoding or @have_byteslice then assert_equal [3, 0], parser.token_pos(s.pos) else assert_equal [4, 0], parser.token_pos(s.pos) -- cgit v1.2.3