stdlib test: Eliminate export_all from re_SUITE and friends

There is no actual need to use export_all, since very few functions
are actually called from the outside. While we are it, remove the
unused functions in run_pcre_tests.erl.

1 files changed, 6 insertions, 67 deletions

diff --git a/lib/stdlib/test/run_pcre_tests.erl b/lib/stdlib/test/run_pcre_tests.erl
index ae56db59d6..b62674d6e0 100644
--- a/lib/stdlib/test/run_pcre_tests.erl
+++ b/lib/stdlib/test/run_pcre_tests.erl
@@ -18,8 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(run_pcre_tests).
-
--compile(export_all).
+-export([test/1,gen_split_test/1,gen_repl_test/1]).
 
 test(RootDir) ->
     put(verbose,false),
@@ -119,49 +118,6 @@ test([{RE0,Line,Options0,Tests}|T],PreCompile,XMode,REAsList) ->
 	    end
     end.
 
-loopexec(_,_,X,Y,_,_) when X > Y ->
-    {match,[]};
-loopexec(P,Chal,X,Y,Unicode,Xopt) ->
-    case re:run(Chal,P,[{offset,X}]++Xopt) of
-	nomatch ->
-	    {match,[]};
-	{match,[{A,B}|More]} ->
-	    {match,Rest} = 
-		case B>0 of
-		    true ->
-			loopexec(P,Chal,A+B,Y,Unicode,Xopt);
-		    false ->
-			{match,M} = case re:run(Chal,P,[{offset,X},notempty,anchored]++Xopt) of
-				      nomatch ->
-					  {match,[]};
-				      {match,Other} ->
-					  {match,fixup(Chal,Other,0)}
-				  end,
-			NewA = forward(Chal,A,1,Unicode),
-			{match,MM} = loopexec(P,Chal,NewA,Y,Unicode,Xopt),
-			{match,M ++ MM}
-		end,
-	    {match,fixup(Chal,[{A,B}|More],0)++Rest}
-    end.
-
-forward(_Chal,A,0,_) ->
-    A;
-forward(_Chal,A,N,false) ->
-    A+N;
-forward(Chal,A,N,true) ->
-    <<_:A/binary,Tl/binary>> = Chal,
-    Forw = case Tl of
-	       <<1:1,1:1,0:1,_:5,_/binary>>  ->
-		   2;
-	       <<1:1,1:1,1:1,0:1,_:4,_/binary>>  ->
-		   3;
-	       <<1:1,1:1,1:1,1:1,0:1,_:3,_/binary>>  ->
-		   4;
-	       _ ->
-		   1
-	   end,
-    forward(Chal,A+Forw,N-1,true).
-    
 contains_eightbit(<<>>) ->
     false;
 contains_eightbit(<<X:8,_/binary>>) when X >= 128 ->
@@ -201,23 +157,6 @@ clean_duplicates([X|T],L) ->
     end.
 
 
-global_fixup(_,nomatch) ->
-    nomatch;
-global_fixup(P,{match,M}) ->
-    {match,lists:flatten(global_fixup2(P,M))}.
-
-global_fixup2(_,[]) ->
-    [];
-global_fixup2(P,[H|T]) ->
-    [gfixup_one(P,0,H)|global_fixup2(P,T)].
-
-gfixup_one(_,_,[]) ->
-    [];
-gfixup_one(P,I,[{Start,Len}|T]) ->
-    <<_:Start/binary,R:Len/binary,_/binary>> = P,
-    [{I,R}|gfixup_one(P,I+1,T)].
-
-
 press([]) ->
     [];
 press([H|T]) ->
@@ -981,7 +920,7 @@ gen_split_test(OneFile) ->
     ErlFileName = ErlModule++".erl",
     {ok,F}= file:open(ErlFileName,[write]),
     io:format(F,"-module(~s).~n",[ErlModule]),
-    io:format(F,"-compile(export_all).~n",[]),
+    io:format(F,"-export([run/0]).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_split_test(~p)~n",
 	      [?MODULE,OneFile]),
@@ -1024,7 +963,7 @@ dumponesplit(F,{RE,Line,O,TS}) ->
 			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
 			   "print \"    <<\\\"$x\\\">> = "
 			   "iolist_to_binary(join(re:split(\\\"~s\\\","
-			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   "\\\"~s\\\",~p))),\\n\";'~n",
 			   [zsafe(safe(RE)),
 			    SSS,
 			    ysafe(safe(Str)),
@@ -1035,7 +974,7 @@ dumponesplit(F,{RE,Line,O,TS}) ->
 			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
 			   "print \"    <<\\\"$x\\\">> = "
 			   "iolist_to_binary(join(re:split(\\\"~s\\\","
-			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   "\\\"~s\\\",~p))),\\n\";'~n",
 			   [zsafe(safe(RE)),
 			    SSS,
 			    ysafe(safe(Str)),
@@ -1046,7 +985,7 @@ dumponesplit(F,{RE,Line,O,TS}) ->
 			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
 			   "print \"    <<\\\"$x\\\">> = "
 			   "iolist_to_binary(join(re:split(\\\"~s\\\","
-			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   "\\\"~s\\\",~p))),\\n\";'~n",
 			   [zsafe(safe(RE)),
 			    SSS,
 			    ysafe(safe(Str)),
@@ -1071,7 +1010,7 @@ gen_repl_test(OneFile) ->
     ErlFileName = ErlModule++".erl",
     {ok,F}= file:open(ErlFileName,[write]),
     io:format(F,"-module(~s).~n",[ErlModule]),
-    io:format(F,"-compile(export_all).~n",[]),
+    io:format(F,"-export([run/0]).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_repl_test(~p)~n",
 	      [?MODULE,OneFile]),