mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/strscan/strscan.c (str_new): new function for allocate an string
with encoding propagation. (extract_range): use str_new. (extract_beg_len): ditto. (strscan_peek): ditto. (strscan_rest): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f413b83814
commit
1c0416e6ee
4 changed files with 31 additions and 9 deletions
|
@ -289,7 +289,7 @@ class TestStringScanner < Test::Unit::TestCase
|
|||
assert_nil s.getch
|
||||
|
||||
s = StringScanner.new("\244\242".force_encoding("euc-jp"))
|
||||
assert_equal "\244\242", s.getch
|
||||
assert_equal "\244\242".force_encoding("euc-jp"), s.getch
|
||||
assert_nil s.getch
|
||||
|
||||
s = StringScanner.new('test')
|
||||
|
@ -317,8 +317,8 @@ class TestStringScanner < Test::Unit::TestCase
|
|||
assert_nil s.get_byte
|
||||
|
||||
s = StringScanner.new("\244\242".force_encoding("euc-jp"))
|
||||
assert_equal "\244", s.get_byte
|
||||
assert_equal "\242", s.get_byte
|
||||
assert_equal "\244".force_encoding("euc-jp"), s.get_byte
|
||||
assert_equal "\242".force_encoding("euc-jp"), s.get_byte
|
||||
assert_nil s.get_byte
|
||||
|
||||
s = StringScanner.new('test')
|
||||
|
@ -414,7 +414,7 @@ class TestStringScanner < Test::Unit::TestCase
|
|||
|
||||
s = StringScanner.new("\244\242".force_encoding("euc-jp"))
|
||||
s.getch
|
||||
assert_equal "\244\242", s[0]
|
||||
assert_equal "\244\242".force_encoding("euc-jp"), s[0]
|
||||
|
||||
str = 'test'
|
||||
str.taint
|
||||
|
@ -536,4 +536,9 @@ class TestStringScanner < Test::Unit::TestCase
|
|||
s.terminate
|
||||
assert_nil s.matched_size
|
||||
end
|
||||
|
||||
def test_encoding
|
||||
ss = StringScanner.new("\xA1\xA2".force_encoding("euc-jp"))
|
||||
assert_equal(Encoding::EUC_JP, ss.scan(/./e).encoding)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue