aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/compile.erl
diff options
context:
space:
mode:
Diffstat (limited to 'lib/compiler/src/compile.erl')
-rw-r--r--lib/compiler/src/compile.erl25
1 files changed, 4 insertions, 21 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index fbaacc08da..7365706b94 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -41,7 +41,7 @@
-type option() :: atom() | {atom(), term()} | {'d', atom(), term()}.
--type err_info() :: erl_scan:error_info(). %% ErrorDescriptor
+-type err_info() :: {erl_scan:line(), module(), term()}. %% ErrorDescriptor
-type errors() :: [{file:filename(), [err_info()]}].
-type warnings() :: [{file:filename(), [err_info()]}].
-type mod_ret() :: {'ok', module()}
@@ -363,17 +363,7 @@ messages_per_file(Ms) ->
(_) -> false
end, A)
end, T, PrioMs),
- Prio = lists:sort(fun({_,{As1,_,_}}, {_,{As2,_,_}}) ->
- {location, Loc1} =
- erl_scan:attributes_info(As1, location),
- {location, Loc2} =
- erl_scan:attributes_info(As2, location),
- case {Loc1, Loc2} of
- {{L1, _}, L2} when is_integer(L2) -> L1 < L2;
- {L1, {L2, _}} when is_integer(L1) -> L1 =< L2;
- {_, _} -> Loc1 =< Loc2
- end
- end,
+ Prio = lists:sort(fun({_,{L1,_,_}}, {_,{L2,_,_}}) -> L1 =< L2 end,
lists:append(Prio0)),
flatmap(fun mpf/1, [Prio, Rest]).
@@ -783,8 +773,7 @@ parse_module(St) ->
Opts = St#compile.options,
Cwd = ".",
IncludePath = [Cwd, St#compile.dir|inc_paths(Opts)],
- AtPos = initial_position(Opts),
- R = epp:parse_file(St#compile.ifile, AtPos, IncludePath, pre_defs(Opts)),
+ R = epp:parse_file(St#compile.ifile, IncludePath, pre_defs(Opts)),
case R of
{ok,Forms} ->
{ok,St#compile{code=Forms}};
@@ -1434,7 +1423,7 @@ report_warnings(#compile{options=Opts,warnings=Ws0}) ->
end.
format_message(F, P, [{{Line,Column}=Loc,Mod,E}|Es]) ->
- M = {{F,Loc},io_lib:format("~s:~w:~w: ~s~s\n",
+ M = {{F,Loc},io_lib:format("~s:~w:~w ~s~s\n",
[F,Line,Column,P,Mod:format_error(E)])},
[M|format_message(F, P, Es)];
format_message(F, P, [{Line,Mod,E}|Es]) ->
@@ -1490,12 +1479,6 @@ objfile(Base, St) ->
tmpfile(Ofile) ->
reverse([$#|tl(reverse(Ofile))]).
-initial_position(Opts) ->
- case lists:member(column, Opts) of
- true -> {1, 1};
- false -> 1
- end.
-
%% pre_defs(Options)
%% inc_paths(Options)
%% Extract the predefined macros and include paths from the option list.