From 93d2c2c88e88168354782f356bdf572d0c3aa462 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 13 Dec 2012 09:49:13 +0100 Subject: Prepare OTP files for Unicode as default encoding --- lib/stdlib/test/re_SUITE.erl | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'lib/stdlib/test/re_SUITE.erl') diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl index 8ee0a13f4c..500f5fadb9 100644 --- a/lib/stdlib/test/re_SUITE.erl +++ b/lib/stdlib/test/re_SUITE.erl @@ -1,3 +1,4 @@ +%% -*- coding: utf-8 -*- %% %% %CopyrightBegin% %% @@ -291,10 +292,10 @@ global_capture(Config) when is_list(Config) -> ?line match = re:run("ABCabcdABCabcdA","a(?bcd)",[global,{capture,none,index}]), ?line match = re:run("ABCabcdABCabcdA","a(?bcd)",[global,{capture,none,binary}]), ?line match = re:run("ABCabcdABCabcdA","a(?bcd)",[global,{capture,none,list}]), - ?line {match,[[<<195,133,98,99,100>>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABCĹbcdABCabcdA",".(?bcd)",[global,{capture,all,binary},unicode]), - ?line {match,[["Ĺbcd","bcd"],["abcd","bcd"]]} = re:run(<<"ABC",8#303,8#205,"bcdABCabcdA">>,".(?bcd)",[global,{capture,all,list},unicode]), - ?line {match,[["Ĺbcd","bcd"],["abcd","bcd"]]} = re:run("ABCĹbcdABCabcdA",".(?bcd)",[global,{capture,all,list},unicode]), - ?line {match,[[{3,5},{5,3}],[{11,4},{12,3}]]} = re:run("ABCĹbcdABCabcdA",".(?bcd)",[global,{capture,all,index},unicode]), + ?line {match,[[<<195,133,98,99,100>>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABCĂ…bcdABCabcdA",".(?bcd)",[global,{capture,all,binary},unicode]), + ?line {match,[["Ă…bcd","bcd"],["abcd","bcd"]]} = re:run(<<"ABC",8#303,8#205,"bcdABCabcdA">>,".(?bcd)",[global,{capture,all,list},unicode]), + ?line {match,[["Ă…bcd","bcd"],["abcd","bcd"]]} = re:run("ABCĂ…bcdABCabcdA",".(?bcd)",[global,{capture,all,list},unicode]), + ?line {match,[[{3,5},{5,3}],[{11,4},{12,3}]]} = re:run("ABCĂ…bcdABCabcdA",".(?bcd)",[global,{capture,all,index},unicode]), ?t:timetrap_cancel(Dog), ok. @@ -314,17 +315,17 @@ replace_return(Config) when is_list(Config) -> Dog = ?t:timetrap(?t:minutes(3)), ?line {'EXIT',{badarg,_}} = (catch re:replace("na","(a","")), ?line <<"nasse">> = re:replace(<<"nisse">>,"i","a",[{return,binary}]), - ?line <<"ABCĹXABCXA">> = re:replace("ABC\305abcdABCabcdA","a(?bcd)","X",[global,{return,binary}]), + ?line <<"ABCĂ…XABCXA">> = re:replace("ABC\305abcdABCabcdA","a(?bcd)","X",[global,{return,binary}]), - ?line [<<"ABCĹ">>, + ?line [<<"ABCĂ…">>, <<"X">>, <<"ABC">>, <<"X">> | <<"A">> ] = - re:replace("ABCĹabcdABCabcdA","a(?bcd)","X",[global,{return,iodata}]), - ?line "ABCĹXABCXA" = re:replace("ABCĹabcdABCabcdA","a(?bcd)","X",[global,{return,list},unicode]), - ?line <<65,66,67,195,133,88,65,66,67,88,65>> = re:replace("ABCĹabcdABCabcdA","a(?bcd)","X",[global,{return,binary},unicode]), - ?line <<65,66,67,195,133,88,65,66,67,97,98,99,100,65>> = re:replace("ABCĹabcdABCabcdA","a(?bcd)","X",[{return,binary},unicode]), + re:replace("ABCĂ…abcdABCabcdA","a(?bcd)","X",[global,{return,iodata}]), + ?line "ABCĂ…XABCXA" = re:replace("ABCĂ…abcdABCabcdA","a(?bcd)","X",[global,{return,list},unicode]), + ?line <<65,66,67,195,133,88,65,66,67,88,65>> = re:replace("ABCĂ…abcdABCabcdA","a(?bcd)","X",[global,{return,binary},unicode]), + ?line <<65,66,67,195,133,88,65,66,67,97,98,99,100,65>> = re:replace("ABCĂ…abcdABCabcdA","a(?bcd)","X",[{return,binary},unicode]), ?line <<"iXk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\9X",[{return,binary}]), ?line <<"jXk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\10X",[{return,binary}]), ?line <<"Xk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\11X",[{return,binary}]), -- cgit v1.2.3