mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
a22bb18e3e
commit
09af9d7f7f
11 changed files with 71 additions and 17 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue