compiler: Use module erl_anno

6 files changed, 51 insertions, 57 deletions

diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 427b7071ac..2a15c1ddf3 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2015. 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
@@ -615,7 +615,7 @@ collect_warnings_instr([_|Is], D, Acc) ->
 collect_warnings_instr([], _, Acc) -> Acc.
 
 add_warning(Term, Anno, Ws) ->
-    Line = abs(get_line(Anno)),
+    Line = get_line(Anno),
     File = get_file(Anno),
     [{File,[{Line,?MODULE,Term}]}|Ws].
 
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 5bd33c4d18..b54d125774 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. 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
@@ -41,7 +41,7 @@
 
 -type option() :: atom() | {atom(), term()} | {'d', atom(), term()}.
 
--type err_info() :: {erl_scan:line() | 'none',
+-type err_info() :: {erl_anno:line() | 'none',
 		     module(), term()}. %% ErrorDescriptor
 -type errors()   :: [{file:filename(), [err_info()]}].
 -type warnings() :: [{file:filename(), [err_info()]}].
@@ -132,7 +132,8 @@ env_default_opts() ->
 	Str when is_list(Str) ->
 	    case erl_scan:string(Str) of
 		{ok,Tokens,_} ->
-		    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
+                    Dot = {dot, erl_anno:new(1)},
+		    case erl_parse:parse_term(Tokens ++ [Dot]) of
 			{ok,List} when is_list(List) -> List;
 			{ok,Term} -> [Term];
 			{error,_Reason} ->
@@ -1237,7 +1238,8 @@ save_abstract_code(#compile{ifile=File}=St) ->
 	    {error,St#compile{errors=St#compile.errors ++ [{File,Es}]}}
     end.
 
-abstract_code(#compile{code=Code,options=Opts,ofile=OFile}) ->
+abstract_code(#compile{code=Code0,options=Opts,ofile=OFile}) ->
+    Code = erl_parse:anno_to_term(Code0),
     Abstr = erlang:term_to_binary({raw_abstract_v1,Code}, [compressed]),
     case member(encrypt_debug_info, Opts) of
 	true ->
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index 6cc849a9d5..4c4628d580 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. 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
@@ -115,7 +115,8 @@ is_fa_list(_) -> false.
 module_predef_funcs(St) ->
     {Mpf1,St1}=module_predef_func_beh_info(St),
     {Mpf2,St2}=module_predef_funcs_mod_info(St1),
-    {Mpf1++Mpf2,St2}.
+    Mpf = [erl_parse:new_anno(F) || F <- Mpf1++Mpf2],
+    {Mpf,St2}.
 
 module_predef_func_beh_info(#expand{callbacks=[]}=St) ->
     {[], St};
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index 2d12d832a3..ecaecb0ff6 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2015. 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
@@ -83,8 +83,6 @@
 
 -include("core_parse.hrl").
 
--define(REC_OFFSET, 100000000). % Also in erl_expand_records.
-
 %% Internal core expressions and help functions.
 %% N.B. annotations fields in place as normal Core expressions.
 
@@ -170,8 +168,10 @@ form({attribute,_,file,{File,_Line}}, {Fs,As,Ws,_}, _Opts) ->
 form({attribute,_,_,_}=F, {Fs,As,Ws,File}, _Opts) ->
     {Fs,[attribute(F)|As],Ws,File}.
 
-attribute({attribute,Line,Name,Val}) ->
-    {#c_literal{val=Name, anno=[Line]}, #c_literal{val=Val, anno=[Line]}}.
+attribute(Attribute) ->
+    Fun = fun(A) ->  [erl_anno:location(A)] end,
+    {attribute,Line,Name,Val} = erl_parse:map_anno(Fun, Attribute),
+    {#c_literal{val=Name, anno=Line}, #c_literal{val=Val, anno=Line}}.
 
 %% function_dump(module_info,_,_,_) -> ok;
 %% function_dump(Name,Arity,Format,Terms) ->
@@ -729,7 +729,7 @@ make_bool_switch(L, E, V, T, F, #core{}) ->
     make_bool_switch_body(L, E, V, T, F).
 
 make_bool_switch_body(L, E, V, T, F) ->
-    NegL = neg_line(abs_line(L)),
+    NegL = no_compiler_warning(L),
     Error = {tuple,NegL,[{atom,NegL,badarg},V]},
     {'case',NegL,E,
      [{clause,NegL,[{atom,NegL,true}],[],[T]},
@@ -740,7 +740,7 @@ make_bool_switch_body(L, E, V, T, F) ->
 
 make_bool_switch_guard(_, E, _, {atom,_,true}, {atom,_,false}) -> E;
 make_bool_switch_guard(L, E, V, T, F) ->
-    NegL = neg_line(abs_line(L)),
+    NegL = no_compiler_warning(L),
     {'case',NegL,E,
      [{clause,NegL,[{atom,NegL,true}],[],[T]},
       {clause,NegL,[{atom,NegL,false}],[],[F]},
@@ -919,7 +919,7 @@ verify_suitable_fields([]) -> ok.
 %% (We don't need an exact result for this purpose.)
 
 count_bits(Int) -> 
-    count_bits_1(abs_line(Int), 64).
+    count_bits_1(abs(Int), 64).
 
 count_bits_1(0, Bits) -> Bits;
 count_bits_1(Int, Bits) -> count_bits_1(Int bsr 64, Bits+64).
@@ -2311,22 +2311,15 @@ bitstr_vars(Segs, Vs) ->
  		  lit_vars(V, lit_vars(S, Vs0))
 	  end, Vs, Segs).
 
-record_anno(L, St) when L >= ?REC_OFFSET ->
-    case member(dialyzer, St#core.opts) of
-        true ->
-            [record | lineno_anno(L - ?REC_OFFSET, St)];
-        false ->
-            full_anno(L, St)
-    end;
-record_anno(L, St) when L < -?REC_OFFSET ->
-    case member(dialyzer, St#core.opts) of
+record_anno(L, St) ->
+    case
+        erl_anno:record(L) andalso member(dialyzer, St#core.opts)
+    of
         true ->
-            [record | lineno_anno(L + ?REC_OFFSET, St)];
+            [record | lineno_anno(L, St)];
         false ->
             full_anno(L, St)
-    end;
-record_anno(L, St) ->
-    full_anno(L, St).
+    end.
 
 full_anno(L, #core{wanted=false}=St) ->
     [result_not_wanted|lineno_anno(L, St)];
@@ -2334,13 +2327,10 @@ full_anno(L, #core{wanted=true}=St) ->
     lineno_anno(L, St).
 
 lineno_anno(L, St) ->
-    {line, Line} = erl_parse:get_attribute(L, line),
-    if
-	Line < 0 ->
-	    [-Line] ++ St#core.file ++ [compiler_generated];
-	true ->
-	    [Line] ++ St#core.file
-    end.
+    Line = erl_anno:line(L),
+    Generated = erl_anno:generated(L),
+    CompilerGenerated = [compiler_generated || Generated],
+    [Line] ++ St#core.file ++ CompilerGenerated.
 
 get_lineno_anno(Ce) ->
     case get_anno(Ce) of
@@ -2348,15 +2338,8 @@ get_lineno_anno(Ce) ->
 	A when is_list(A) -> A
     end.
 
-location(L) ->
-    {location,Location} = erl_parse:get_attribute(L, location),
-    Location.
-
-abs_line(L) ->
-    erl_parse:set_line(L, fun(Line) -> abs(Line) end).
-
-neg_line(L) ->
-    erl_parse:set_line(L, fun(Line) -> -abs(Line) end).
+no_compiler_warning(Anno) ->
+    erl_anno:set_generated(true, Anno).
 
 %%
 %% The following three functions are used both with cerl:cerl() and with i()'s
@@ -2400,6 +2383,10 @@ format_error(bad_binary) ->
 format_error(badmap) ->
     "map construction will fail because of a type mismatch".
 
-add_warning(Line, Term, #core{ws=Ws,file=[{file,File}]}=St) when Line >= 0 ->
-    St#core{ws=[{File,[{location(Line),?MODULE,Term}]}|Ws]};
-add_warning(_, _, St) -> St.
+add_warning(Anno, Term, #core{ws=Ws,file=[{file,File}]}=St) ->
+    case erl_anno:generated(Anno) of
+        false ->
+            St#core{ws=[{File,[{erl_anno:location(Anno),?MODULE,Term}]}|Ws]};
+        true ->
+            St
+    end.
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 6d4fde662b..6b0369bf98 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. 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
@@ -126,7 +126,8 @@ file_1(Config) when is_list(Config) ->
 forms_2(Config) when is_list(Config) ->
     Src = "/foo/bar",
     AbsSrc = filename:absname(Src),
-    {ok,simple,Binary} = compile:forms([{attribute,1,module,simple}],
+    Anno = erl_anno:new(1),
+    {ok,simple,Binary} = compile:forms([{attribute,Anno,module,simple}],
 				       [binary,{source,Src}]),
     code:load_binary(simple, Src, Binary),
     Info = simple:module_info(compile),
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index d91ee7ea08..512207898e 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2015. 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
@@ -1373,10 +1373,11 @@ literal_type_tests_1(Config) ->
 			    [{is_function,L1,L2} || 
 				L1 <- literals(), L2 <- literals()]),
     ?line Mod = literal_test,
-    ?line Func = {function, 0, test, 0, [{clause,0,[],[],Tests}]},
-    ?line Form = [{attribute,0,module,Mod},
-		  {attribute,0,compile,export_all},
-		  Func, {eof,0}],
+    Anno = erl_anno:new(0),
+    Func = {function, Anno, test, 0, [{clause,Anno,[],[],Tests}]},
+    Form = [{attribute,Anno,module,Mod},
+            {attribute,Anno,compile,export_all},
+            Func, {eof,Anno}],
 
     %% Print generated code for inspection.
     ?line lists:foreach(fun (F) -> io:put_chars([erl_pp:form(F),"\n"]) end, Form),
@@ -1411,7 +1412,8 @@ test(T, L) ->
     {ok,Toks,_Line} = erl_scan:string(S),
     {ok,E} = erl_parse:parse_exprs(Toks),
     {value,Val,_Bs} = erl_eval:exprs(E, []),
-    {match,0,{atom,0,Val},hd(E)}.
+    Anno = erl_anno:new(0),
+    {match,Anno,{atom,Anno,Val},hd(E)}.
 
 test(T, L1, L2) ->
     S0 = io_lib:format("begin io:format(\"~~p~n\", [{~p,~p,~p}]), if ~w(~w, ~w) -> true; true -> false end end. ", [T,L1,L2,T,L1,L2]),
@@ -1419,7 +1421,8 @@ test(T, L1, L2) ->
     {ok,Toks,_Line} = erl_scan:string(S),
     {ok,E} = erl_parse:parse_exprs(Toks),
     {value,Val,_Bs} = erl_eval:exprs(E, []),
-    {match,0,{atom,0,Val},hd(E)}.
+    Anno = erl_anno:new(0),
+    {match,Anno,{atom,Anno,Val},hd(E)}.
 
 smoke_disasm(Config, Mod, Bin) ->
     Priv = ?config(priv_dir, Config),