From be622e70f7d504dfbad41279ab77a5c8fdd21082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 11 Jan 2013 12:37:24 +0100
Subject: Cope with removed support for packages

Packages were removed in 34d865a7dfdb33ee1e69fc28885f68baeeadfd98.
---
 .../src/compiler/sys_pre_expand.erl                | 56 ++++------------------
 1 file changed, 8 insertions(+), 48 deletions(-)

(limited to 'lib/dialyzer/test/options1_SUITE_data/src/compiler')

diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
index 08bc6cb147..41b7cb248d 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
@@ -149,14 +149,12 @@ forms([], St) -> {[],St}.
 %%  Process an attribute, this just affects the state.
 
 attribute(module, {Module, As}, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-	      package = packages:strip_last(M),
+    true = is_atom(Module),
+    St#expand{module=Module,
 	      parameters=As};
 attribute(module, Module, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-	      package = packages:strip_last(M)};
+    true = is_atom(Module),
+    St#expand{module=Module};
 attribute(export, Es, St) ->
     St#expand{exports=union(from_list(Es), St#expand.exports)};
 attribute(import, Is, St) ->
@@ -226,8 +224,6 @@ pattern({tuple,Line,Ps}, St0) ->
 %%pattern({struct,Line,Tag,Ps}, St0) ->
 %%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|TPs]},TPsvs,St1};
-pattern({record_field,_,_,_}=M, St) ->
-    {expand_package(M, St), [], [], St};  % must be a package name
 pattern({record_index,Line,Name,Field}, St) ->
     {index_expr(Line, Field, Name, record_fields(Name, St)),[],[],St};
 pattern({record,Line,Name,Pfs}, St0) ->
@@ -401,8 +397,6 @@ expr({tuple,Line,Es0}, Vs, St0) ->
 %%expr({struct,Line,Tag,Es0}, Vs, St0) ->
 %%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|Es1]},Esvs,Esus,St1};
-expr({record_field,_,_,_}=M, _Vs, St) ->
-    {expand_package(M, St), [], [], St};  % must be a package name
 expr({record_index,Line,Name,F}, Vs, St) ->
     I = index_expr(Line, F, Name, record_fields(Name, St)),
     expr(I, Vs, St);
@@ -483,10 +477,7 @@ expr({call,Line,{atom,La,N},As0}, Vs, St0) ->
 		    end
 	    end
     end;
-expr({call,Line,{record_field,_,_,_}=M,As0}, Vs, St0) ->
-    expr({call,Line,expand_package(M, St0),As0}, Vs, St0);
-expr({call,Line,{remote,Lr,M,F},As0}, Vs, St0) ->
-    M1 = expand_package(M, St0),
+expr({call,Line,{remote,Lr,M1,F},As0}, Vs, St0) ->
     {[M2,F1|As1],Asvs,Asus,St1} = expr_list([M1,F|As0], Vs, St0),
     {{call,Line,{remote,Lr,M2,F1},As1},Asvs,Asus,St1};
 expr({call,Line,{tuple,_,[{atom,_,_}=M,{atom,_,_}=F]},As}, Vs, St) ->
@@ -922,32 +913,6 @@ string_to_conses(Line, Cs, Tail) ->
     foldr(fun (C, T) -> {cons,Line,{char,Line,C},T} end, Tail, Cs).
 
 
-%% In syntax trees, module/package names are atoms or lists of atoms.
-
-package_to_string(A) when atom(A) -> atom_to_list(A);
-package_to_string(L) when list(L) -> packages:concat(L).
-
-expand_package({atom,L,A} = M, St) ->
-    case dict:find(A, St#expand.mod_imports) of
-	{ok, A1} ->
-	    {atom,L,A1};
-	error ->
-	    case packages:is_segmented(A) of
-		true ->
-		    M;
-		false ->
-		    M1 = packages:concat(St#expand.package, A),
-		    {atom,L,list_to_atom(M1)}
-	    end
-    end;
-expand_package(M, _St) ->
-    case erl_parse:package_segments(M) of
-	error ->
-	    M;
-	M1 ->
-	    {atom,element(2,M),list_to_atom(package_to_string(M1))}
-    end.
-
 %% Create a case-switch on true/false, generating badarg for all other
 %% values.
 
@@ -1005,15 +970,10 @@ new_in_all(Before, Region) ->
 %%  Handle import declarations and est for imported functions. No need to
 %%  check when building imports as code is correct.
 
-import({Mod0,Fs}, St) ->
-    Mod = list_to_atom(package_to_string(Mod0)),
+import({Mod,Fs}, St) ->
+    true = is_atom(Mod),
     Mfs = from_list(Fs),
-    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)};
-import(Mod0, St) ->
-    Mod = package_to_string(Mod0),
-    Key = list_to_atom(packages:last(Mod)),
-    St#expand{mod_imports=dict:store(Key, list_to_atom(Mod),
-				     St#expand.mod_imports)}.
+    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)}.
 
 add_imports(Mod, [F|Fs], Is) ->
     add_imports(Mod, Fs, orddict:store(F, Mod, Is));
-- 
cgit v1.2.3