@@ -13,17 +13,51 @@ describe "Regexps with encoding modifiers" do match.to_a.should == ["\303\251"] end + it 'supports /e (EUC encoding) with interpolation' do + match = /#{/./}/e.match("\303\251") + match.to_a.should == ["\303\251"] + end + + it 'supports /e (EUC encoding) with interpolation and /o' do + match = /#{/./}/e.match("\303\251") + match.to_a.should == ["\303\251"] + end + it 'supports /n (Normal encoding)' do /./n.match("\303\251").to_a.should == ["\303"] end + it 'supports /n (Normal encoding) with interpolation' do + /#{/./}/n.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /n (Normal encoding) with interpolation and /o' do + /#{/./}/no.match("\303\251").to_a.should == ["\303"] + end + it 'supports /s (SJIS encoding)' do /./s.match("\303\251").to_a.should == ["\303"] end + it 'supports /s (SJIS encoding) with interpolation' do + /#{/./}/s.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /s (SJIS encoding) with interpolation and /o' do + /#{/./}/so.match("\303\251").to_a.should == ["\303"] + end + it 'supports /u (UTF8 encoding)' do /./u.match("\303\251").to_a.should == ["\303\251"] end + + it 'supports /u (UTF8 encoding) with interpolation' do + /#{/./}/u.match("\303\251").to_a.should == ["\303\251"] + end + + it 'supports /u (UTF8 encoding) with interpolation and /o' do + /#{/./}/uo.match("\303\251").to_a.should == ["\303\251"] + end it 'selects last of multiple encoding specifiers' do /foo/ensuensuens.should == /foo/s @@ -37,19 +71,55 @@ describe "Regexps with encoding modifiers" do match.to_a.should == ["\303\251".force_encoding(Encoding::EUC_JP)] end + it 'supports /e (EUC encoding) with interpolation' do + match = /#{/./}/e.match("\303\251".force_encoding(Encoding::EUC_JP)) + match.to_a.should == ["\303\251".force_encoding(Encoding::EUC_JP)] + end + + it 'supports /e (EUC encoding) with interpolation /o' do + match = /#{/./}/e.match("\303\251".force_encoding(Encoding::EUC_JP)) + match.to_a.should == ["\303\251".force_encoding(Encoding::EUC_JP)] + end + it 'supports /n (No encoding)' do /./n.match("\303\251").to_a.should == ["\303"] end + it 'supports /n (No encoding) with interpolation' do + /#{/./}/n.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /n (No encoding) with interpolation /o' do + /#{/./}/n.match("\303\251").to_a.should == ["\303"] + end + it 'supports /s (Windows_31J encoding)' do match = /./s.match("\303\251".force_encoding(Encoding::Windows_31J)) match.to_a.should == ["\303".force_encoding(Encoding::Windows_31J)] end + it 'supports /s (Windows_31J encoding) with interpolation' do + match = /#{/./}/s.match("\303\251".force_encoding(Encoding::Windows_31J)) + match.to_a.should == ["\303".force_encoding(Encoding::Windows_31J)] + end + + it 'supports /s (Windows_31J encoding) with interpolation and /o' do + match = /#{/./}/s.match("\303\251".force_encoding(Encoding::Windows_31J)) + match.to_a.should == ["\303".force_encoding(Encoding::Windows_31J)] + end + it 'supports /u (UTF8 encoding)' do /./u.match("\303\251".force_encoding('utf-8')).to_a.should == ["\u{e9}"] end + it 'supports /u (UTF8 encoding) with interpolation' do + /#{/./}/u.match("\303\251".force_encoding('utf-8')).to_a.should == ["\u{e9}"] + end + + it 'supports /u (UTF8 encoding) with interpolation and /o' do + /#{/./}/u.match("\303\251".force_encoding('utf-8')).to_a.should == ["\u{e9}"] + end + # Fails on 1.9; reported as bug #2052 it 'selects last of multiple encoding specifiers' do /foo/ensuensuens.should == /foo/s language/regexp/encoding_spec.rb 4f6a302c2ef8739e65c06291f11b7304dced931d Charles Oliver Nutter headius@headius.com http://github.com/rubyspec/rubyspec/commit/2d102bae115e11719ff355d99ef336c0889b769a 2d102bae115e11719ff355d99ef336c0889b769a 2009-10-15T10:21:14-07:00 2009-10-15T10:21:14-07:00 Add additional specs for literal regexp encoding with /o and interpolation 490f515890174a7723620cc52227669c39d1a04b Charles Oliver Nutter headius@headius.com