Cope with .erlang files that print to stdout

Don't redirect standard output when auto-generating the asn1ct_rtt.erl
and asn1ct_eval*.erl source files, because anything printed form
.erlang will end up in them, probably causing a compilation error.

1 files changed, 40 insertions, 32 deletions

diff --git a/lib/asn1/src/prepare_templates.erl b/lib/asn1/src/prepare_templates.erl
index 83155b2e52..ccd15548d8 100644
--- a/lib/asn1/src/prepare_templates.erl
+++ b/lib/asn1/src/prepare_templates.erl
@@ -21,69 +21,77 @@
 -export([gen_asn1ct_rtt/1,gen_asn1ct_eval/1]).
 
 gen_asn1ct_rtt(Ms) ->
-    io:format("%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
+    {ok,Fd} = file:open("asn1ct_rtt.erl", [write]),
+    io:format(Fd,
+	      "%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
 	      "%%\n"
 	      "%% Input files:\n", [?MODULE]),
-    [io:put_chars(["%%  ",M,$\n]) || M <- Ms],
-    io:nl(),
-    io:put_chars("-module(asn1ct_rtt).\n"
+    [io:put_chars(Fd, ["%%  ",M,$\n]) || M <- Ms],
+    io:nl(Fd),
+    io:put_chars(Fd,
+		 "-module(asn1ct_rtt).\n"
 		 "-export([assert_defined/1,dependencies/1,code/0]).\n"
 		 "\n"),
     Forms = lists:sort(lists:append([abstract(M) || M <- Ms])),
     Exp = lists:sort(exports(Forms)),
-    defined(Exp),
-    io:nl(),
+    defined(Fd, Exp),
+    io:nl(Fd),
     Calls = calls(Forms),
     R = sofs:relation(Calls),
     Fam0 = sofs:relation_to_family(R),
     Fam = sofs:to_external(Fam0),
-    dependencies(Fam),
-    io:nl(),
+    dependencies(Fd, Fam),
+    io:nl(Fd),
     Funcs = [begin
 		 Bin = list_to_binary([$\n|erl_pp:function(Func)]),
 		 {{M,F,A},Bin}
 	     end || {M,{function,_,F,A,_}=Func} <- Forms],
-    io:format("code() ->\n~p.\n\n", [Funcs]),
+    io:format(Fd, "code() ->\n~p.\n\n", [Funcs]),
+    ok = file:close(Fd),
     halt(0).
 
 gen_asn1ct_eval([File]) ->
+    Output = filename:rootname(File, ".funcs") ++ ".erl",
+    {ok,Fd} = file:open(Output, [write]),
     {ok,Funcs} = file:consult(File),
     asn1ct_func:start_link(),
     [asn1ct_func:need(MFA) || MFA <- Funcs],
-    io:format("%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
+    io:format(Fd,
+	      "%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
 	      "%%\n"
 	      "%% Input file: ~s\n\n", [?MODULE,File]),
-    io:format("-module(~s).\n", [filename:rootname(File)]),
-    gen_asn1ct_eval_exp(Funcs),
-    asn1ct_func:generate(group_leader()),
+    io:format(Fd, "-module(~s).\n", [filename:rootname(File)]),
+    gen_asn1ct_eval_exp(Fd, Funcs),
+    asn1ct_func:generate(Fd),
+    ok = file:close(Fd),
     halt(0).
 
-gen_asn1ct_eval_exp(Funcs) ->
-    io:put_chars("-export(["),
-    gen_asn1ct_eval_exp_1(Funcs, ""),
-    io:put_chars("]).\n").
+gen_asn1ct_eval_exp(Fd, Funcs) ->
+    io:put_chars(Fd, "-export(["),
+    gen_asn1ct_eval_exp_1(Fd, Funcs, ""),
+    io:put_chars(Fd, "]).\n").
 
-gen_asn1ct_eval_exp_1([{_,F,A}|T], Sep) ->
-    io:put_chars(Sep),
-    io:format("~p/~p", [F,A]),
-    gen_asn1ct_eval_exp_1(T, ",\n");
-gen_asn1ct_eval_exp_1([], _) -> ok.
+gen_asn1ct_eval_exp_1(Fd, [{_,F,A}|T], Sep) ->
+    io:put_chars(Fd, Sep),
+    io:format(Fd, "~p/~p", [F,A]),
+    gen_asn1ct_eval_exp_1(Fd, T, ",\n");
+gen_asn1ct_eval_exp_1(_, [], _) -> ok.
 
-defined([H|T]) ->
-    io:format("assert_defined(~p) -> ok", [H]),
+defined(Fd, [H|T]) ->
+    io:format(Fd, "assert_defined(~p) -> ok", [H]),
     case T of
 	[] ->
-	    io:put_chars(".\n");
+	    io:put_chars(Fd, ".\n");
 	[_|_] ->
-	    io:put_chars(";\n"),
-	    defined(T)
+	    io:put_chars(Fd, ";\n"),
+	    defined(Fd, T)
     end.
 
-dependencies([{K,V}|T]) ->
-    io:format("dependencies(~p) ->\n~p;\n", [K,V]),
-    dependencies(T);
-dependencies([]) ->
-    io:put_chars("dependencies(_) -> [].\n").
+dependencies(Fd, [{K,V}|T]) ->
+    io:format(Fd, "dependencies(~p) ->\n~p;\n", [K,V]),
+    dependencies(Fd, T);
+dependencies(Fd, []) ->
+    io:put_chars(Fd, "dependencies(_) -> [].\n").
 
 abstract(File) ->
     {ok,{M0,[{abstract_code,Abstract}]}} =