[reltool] Fix reconstruct source from debug_info to handle unicode

Also changing from using erl_syntax and erl_prettypr to using erl_pp
in order to get better handling of specs.

1 files changed, 38 insertions, 31 deletions

diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index 899423bb6d..a6abf2deb3 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -335,23 +335,37 @@ find_regular_bin(App, Mod) ->
     SrcDir = filename:join([ActiveDir, "src"]),
     ModStr = atom_to_list(Mod#mod.name),
     Base = "^" ++ ModStr ++ "\\.erl$",
-    Find = fun(F, _Acc) -> throw(file:read_file(F)) end,
+    Find = fun(F, _Acc) -> throw({file:read_file(F),epp:read_encoding(F)}) end,
     case catch filelib:fold_files(SrcDir, Base, true, Find, {error, enoent}) of
-	{ok, Bin} ->
-	    Bin;
+	{{ok, Bin},Encoding0} ->
+	    Encoding =
+		case Encoding0 of
+		    none -> epp:default_encoding();
+		    _ -> Encoding0
+		end,
+	    unicode:characters_to_binary(Bin,Encoding,utf8);
 	{error, enoent} ->
 	    %% Reconstructing the source code from debug info if possible
 	    BeamFile = filename:join([ActiveDir, "ebin", ModStr ++ ".beam"]),
-	    case beam_lib:chunks(BeamFile, [abstract_code]) of
-		{ok,{_,[{abstract_code,{_,AC}}]}} ->
-		    IoList = erl_prettypr:format(erl_syntax:form_list(AC)),
-		    list_to_binary(IoList);
-		_ ->
-		    list_to_binary(["%% Bad luck, cannot find any "
-				    "debug info in the file \"", BeamFile])
+	    case source_from_beam(BeamFile) of
+		{ok,Source} ->
+		    Source;
+		error ->
+		    unicode:characters_to_binary(
+		      ["%% Bad luck, cannot find any "
+		       "debug info in the file \"", BeamFile])
 	    end
     end.
 
+source_from_beam(Beam) ->
+    case beam_lib:chunks(Beam, [abstract_code]) of
+	{ok,{_,[{abstract_code,{_,AC}}]}} ->
+	    IoList = [erl_pp:form(F,[{encoding,utf8}]) || F <- AC],
+	    {ok,unicode:characters_to_binary(IoList)};
+	_ ->
+	    error
+    end.
+
 find_escript_bin(#app{active_dir = ActiveDir}, Mod) ->
     NotFound = false,
     ModName = Mod#mod.name,
@@ -366,16 +380,10 @@ find_escript_bin(#app{active_dir = ActiveDir}, Mod) ->
 				 case beam_lib:version(Bin) of
 				     {ok,{M, _}} when M =:= ModName;
 						      FullName =:= "." ->
-					 case beam_lib:chunks(Bin,
-							      [abstract_code]) of
-					     {ok,{_,[{abstract_code,{_,AC}}]}} ->
-						 Form =
-						     erl_syntax:form_list(AC),
-						 IoList =
-						     erl_prettypr:format(Form),
-						 {obj,
-						  list_to_binary(IoList)};
-					     _ ->
+					 case source_from_beam(Bin) of
+					     {ok,Source} ->
+						 {obj,Source};
+					     error ->
 						 Acc
 					 end;
 				     _ ->
@@ -396,12 +404,9 @@ find_escript_bin(#app{active_dir = ActiveDir}, Mod) ->
 			 case filename:split(FullName) of
 			     [_AppName, "ebin", F]
 			       when F =:= ObjFile, Acc =:= NotFound ->
-				 case beam_lib:chunks(GetBin(),
-						      [abstract_code]) of
-				     {ok,{_,[{abstract_code,{_,AC}}]}} ->
-					 Form = erl_syntax:form_list(AC),
-					 IoList = erl_prettypr:format(Form),
-					 {obj, list_to_binary(IoList)};
+				 case source_from_beam(GetBin()) of
+				     {ok,Source} ->
+					 {obj,Source};
 				     _ ->
 					 Acc
 				 end;
@@ -420,13 +425,15 @@ find_escript_bin(#app{active_dir = ActiveDir}, Mod) ->
 	    {ok, {obj, Bin}} ->
 		Bin;
 	    _ ->
-		list_to_binary(["%% Bad luck, cannot find the "
-				"code in the escript ", Escript, "."])
+		unicode:characters_to_binary(
+		  ["%% Bad luck, cannot find the "
+		   "code in the escript ", Escript, "."])
 	end
     catch
 	throw:Reason when is_list(Reason) ->
-	    list_to_binary(["%% Bad luck, cannot find the code "
-			    "in the escript ", Escript, ": ", Reason])
+	    unicode:characters_to_binary(
+	      ["%% Bad luck, cannot find the code "
+	       "in the escript ", Escript, ": ", Reason])
     end.
 
 create_config_page(S) ->