Skip to content

Ensure parser always returns erl_anno:location() in errors #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gomoripeti wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ensure parser always returns erl_anno:location() in errors #325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/erlfmt_parse.yrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ Erlang code.

%% XXX. To be refined.
-type error_description() :: term().
-type error_info() :: {erl_anno:line(), module(), error_description()}.
-type error_info() :: {erl_anno:location(), module(), error_description()}.
-type token() :: erlfmt_scan:token().

%% mkop(Op, Arg) -> {op,Anno,Op,Arg}.
Expand Down Expand Up @@ -1026,10 +1026,10 @@ Erlang code.
ErrorInfo :: error_info().
parse_node([{'-', A1}, {atom, A2, spec} | Tokens]) ->
NewTokens = [{'-', A1}, {'spec', A2} | Tokens],
parse(NewTokens);
ensure_error_location(parse(NewTokens));
parse_node([{'-', A1}, {atom, A2, callback} | Tokens]) ->
NewTokens = [{'-', A1}, {'callback', A2} | Tokens],
parse(NewTokens);
ensure_error_location(parse(NewTokens));
parse_node([{'-', A1}, {atom, A2, define} | Tokens]) ->
NewTokens1 = [{'-', A1}, {define_expr, A2} | Tokens],
case parse(NewTokens1) of
Expand All @@ -1042,7 +1042,7 @@ parse_node([{'-', A1}, {atom, A2, define} | Tokens]) ->
Res;
_ ->
NewTokens3 = [{'-', A1}, {define_clause, A2} | Tokens],
parse(NewTokens3)
ensure_error_location(parse(NewTokens3))
end
end;
parse_node(Tokens) ->
Expand All @@ -1052,10 +1052,21 @@ parse_node(Tokens) ->
Error ->
case parse([{standalone_exprs, element(2, hd(Tokens))} | Tokens]) of
{ok, _} = Res -> Res;
_ -> Error
_ -> ensure_error_location(Error)
end
end.

ensure_error_location({ok, _} = Res) ->
Res;
ensure_error_location({error, {AnnoOrLoc, Mod, Description}}) ->
{error, {error_location(AnnoOrLoc), Mod, Description}}.

-spec error_location(erlfmt_scan:anno() | erl_anno:location()) -> erl_anno:location().
error_location(#{location := Loc}) ->
Loc;
error_location(Loc) ->
Loc.

%% unwrap single-expr definitions, wrapped in guards by the parser
build_macro_def(
{'-', Anno},
Expand Down