diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-29 08:03:51 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-29 08:03:51 +0000 |
commit | 82cab5f01a71016ef77a90fe15b0c4b49fff9576 (patch) | |
tree | ec9fda92b59a605bc0a836f625a71e871a23a6a7 /test/ruby/test_m17n.rb | |
parent | 816f0b103f52009bc1f6fbbdacab1b09c36a7703 (diff) | |
download | ruby-82cab5f01a71016ef77a90fe15b0c4b49fff9576.tar.gz ruby-82cab5f01a71016ef77a90fe15b0c4b49fff9576.tar.xz ruby-82cab5f01a71016ef77a90fe15b0c4b49fff9576.zip |
* insns.def (toregexp): generate a regexp from strings instead of one
string.
* re.c (rb_reg_new_ary): defined for toregexp. it concatenates
strings after each string is preprocessed.
* compile.c (compile_dstr_fragments): split from compile_dstr.
(compile_dstr): call compile_dstr_fragments.
(compile_dregx): defined for dynamic regexp.
(iseq_compile_each): use compile_dregx for dynamic regexp.
[ruby-dev:33400]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_m17n.rb')
-rw-r--r-- | test/ruby/test_m17n.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 056f4f3df..922af05d5 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -442,14 +442,14 @@ class TestM17N < Test::Unit::TestCase assert_raise(ArgumentError) { eval(s("/\#{r}\xc2\xa1/s")) } r = /\xc2\xa1/e - #assert_raise(ArgumentError) { eval(s("/\xc2\xa1\#{r}/s")) } - #assert_raise(ArgumentError) { eval(s("/\#{r}\xc2\xa1/s")) } + assert_raise(ArgumentError) { eval(s("/\xc2\xa1\#{r}/s")) } + assert_raise(ArgumentError) { eval(s("/\#{r}\xc2\xa1/s")) } r = eval(e("/\xc2\xa1/")) - #assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } + assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } r = /\xc2\xa1/e - #assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } + assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } end def test_begin_end_offset @@ -574,7 +574,7 @@ class TestM17N < Test::Unit::TestCase } assert_regexp_fixed_ascii8bit(/#{}\xc2\xa1/n) assert_regexp_fixed_ascii8bit(/\xc2\xa1#{}/n) - #assert_raise(SyntaxError) { s1, s2 = s('\xc2'), s('\xa1'); /#{s1}#{s2}/ } + assert_nothing_raised { s1, s2 = a('\xc2'), a('\xa1'); /#{s1}#{s2}/ } end def test_dynamic_eucjp_regexp @@ -584,7 +584,7 @@ class TestM17N < Test::Unit::TestCase assert_raise(SyntaxError) { eval('/\xc2#{}/e') } assert_raise(SyntaxError) { eval('/#{}\xc2/e') } assert_raise(SyntaxError) { eval('/\xc2#{}\xa1/e') } - #assert_raise(SyntaxError) { s1, s2 = e('\xc2'), e('\xa1'); /#{s1}#{s2}/ } + assert_raise(ArgumentError) { s1, s2 = e('\xc2'), e('\xa1'); /#{s1}#{s2}/ } end def test_dynamic_sjis_regexp @@ -594,7 +594,7 @@ class TestM17N < Test::Unit::TestCase assert_raise(SyntaxError) { eval('/\x81#{}/s') } assert_raise(SyntaxError) { eval('/#{}\x81/s') } assert_raise(SyntaxError) { eval('/\x81#{}\xa1/s') } - #assert_raise(SyntaxError) { s1, s2 = s('\x81'), s('\xa1'); /#{s1}#{s2}/ } + assert_raise(ArgumentError) { s1, s2 = s('\x81'), s('\xa1'); /#{s1}#{s2}/ } end def test_dynamic_utf8_regexp @@ -604,7 +604,7 @@ class TestM17N < Test::Unit::TestCase assert_raise(SyntaxError) { eval('/\xc2#{}/u') } assert_raise(SyntaxError) { eval('/#{}\xc2/u') } assert_raise(SyntaxError) { eval('/\xc2#{}\xa1/u') } - #assert_raise(SyntaxError) { s1, s2 = u('\xc2'), u('\xa1'); /#{s1}#{s2}/ } + assert_raise(ArgumentError) { s1, s2 = u('\xc2'), u('\xa1'); /#{s1}#{s2}/ } end def test_regexp_unicode @@ -1080,6 +1080,6 @@ class TestM17N < Test::Unit::TestCase assert_regexp_usascii_literal('/\u1234#{%q"\x80"}/', nil, SyntaxError) assert_regexp_usascii_literal('/\u1234#{"\x80"}/', nil, SyntaxError) assert_regexp_usascii_literal('/\u1234\x80/', nil, SyntaxError) - assert_regexp_usascii_literal('/\u1234#{}\x80/', nil, RegexpError) + assert_regexp_usascii_literal('/\u1234#{}\x80/', nil, ArgumentError) end end |