Skip to content

Fixed parse_transform pt_lazy_case #11

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
Gromobedg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed parse_transform pt_lazy_case #11

Show file tree
Hide file tree
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
35 changes: 23 additions & 12 deletions src/pt_lazy_case.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,16 @@ replace_line_ast(V1) ->
parser_case([{atom, Line, '@lazy_case'} | TailAST], File) ->
case TailAST of
[{match, L, V, {'case', _, _, _} = CaseAST} | TailAST2] ->
[{match, L, V, replace_case(parser_case(CaseAST, File), File)} | TailAST2];
NewData = create_case(replace_case(parser_case(CaseAST, File), File), L),
[{match, L, V, NewData} | TailAST2];
{match, L, V, {'case', _, _, _} = CaseAST} ->
{match, L, V, replace_case(parser_case(CaseAST, File), File)};
[{'case', _, _, _} | _] ->
replace_case(parser_case(TailAST, File), File);
{'case', _, _, _} ->
replace_case(parser_case(TailAST, File), File);
NewData = create_case(replace_case(parser_case(CaseAST, File), File), L),
{match, L, V, NewData};
[{'case', L, _, _} = CaseAST | TailAST2] ->
NewData = create_case(replace_case(parser_case(CaseAST, File), File), L),
[NewData | TailAST2];
{'case', L, _, _} = CaseAST ->
create_case(replace_case(parser_case(CaseAST, File), File), L);
_ ->
{ok, Cwd} = file:get_cwd(),
FullFile = filename:join(Cwd, File),
Expand Down Expand Up @@ -117,6 +120,11 @@ parser_case([V1 | TailAST], File) ->
parser_case(Data, _) ->
Data.

create_case({'case', _, _, _} = Data, _) ->
Data;
create_case(Data, L) ->
{'case', L, {nil, L}, [{clause, L, [{nil, L}], [], Data}]}.

parse_clause([{clause, V1, [{var, V2, D1}], Guard, _} = Data | TailASTClause], OtherAST, AccGuard) ->
case {TailASTClause, Guard} of
{[], []} ->
Expand Down Expand Up @@ -164,7 +172,7 @@ parse_clause(_, Acc, OtherAST, _, _) ->
parse_tuple(HeadAstTuple, ListASTClause, [], V1, _) ->
NewListASTClause = parse_clause(ListASTClause, [], []),
OffRepeateASTClause = delete_repeate(NewListASTClause, []),
case check_load_code(OffRepeateASTClause) of
case check_load_code(OffRepeateASTClause, HeadAstTuple) of
false ->
{'case', V1, HeadAstTuple, OffRepeateASTClause};
{true, Data} ->
Expand All @@ -179,7 +187,7 @@ parse_tuple(HeadAstTuple, ListASTClause, TailAstTuple, V1, File) ->
OffRepeateASTClause = delete_repeate(create_new_case(NewListASTClause, CountElems, TailAstTuple, [], V1), []),
NewCase = {'case', V1, HeadAstTuple, OffRepeateASTClause},
ChangeCase = parser_case(NewCase, File),
case check_load_code(ChangeCase) of
case check_load_code(ChangeCase, HeadAstTuple) of
false ->
ChangeCase;
{true, Data} ->
Expand Down Expand Up @@ -297,14 +305,17 @@ check_guard(Guard, [Guard | _], _) ->
check_guard(Guard, [HeadGuard | TailGuard], Acc) ->
check_guard(Guard, TailGuard, [HeadGuard | Acc]);
check_guard(Guard, _, Acc) ->

{true, [Guard | Acc]}.

check_load_code({'case', _, _, [{clause, _, [{var, _, _}], _, D3} | _]}) ->
check_load_code({'case', _, _, [{clause, _, [{var, _, '_'}], _, D3} | _]}, _HeadAstTuple) ->
{true, D3};
check_load_code([{clause, _, [{var, _, _}], _, D3} | _]) ->
check_load_code([{clause, _, [{var, _, '_'}], _, D3} | _], _HeadAstTuple) ->
{true, D3};
check_load_code(_) ->
check_load_code({'case', _, _, [{clause, _, [{var, Line, Var}], _, D3} | _]}, HeadAstTuple) ->
{true, [{match, Line, {var, Line, Var}, HeadAstTuple} | D3]};
check_load_code([{clause, _, [{var, Line, Var}], _, D3} | _], HeadAstTuple) ->
{true, [{match, Line, {var, Line, Var}, HeadAstTuple} | D3]};
check_load_code(_, _) ->
false.

delete_repeate([{clause, _, Data1, Guard1, _} = HeadASTClause | TailASTClause], Acc) ->
Expand Down
31 changes: 30 additions & 1 deletion test/pt_lazy_case_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ pt_lazy_case_test_() ->
?_test(ok = lazy_case_test3()),
?_test(ok = lazy_case_test4()),
?_test(ok = lazy_case_test5()),
?_test(ok = lazy_case_test6())
?_test(ok = lazy_case_test6()),
?_test(ok = lazy_case_test7()),
?_test(ok = lazy_case_test8()),
?_test(ok = lazy_case_test9())
].

lazy_case_test1() ->
Expand Down Expand Up @@ -109,3 +112,29 @@ lazy_case_test6() ->
{_V, _} -> ?assert(false)
end,
X.

lazy_case_test7() ->
'@lazy_case',
X =
case {[], ok} of
{[], _V} -> _V;
{_V, _} -> ?assert(false)
end,
X.

lazy_case_test8() ->
'@lazy_case',
X =
case {[], [], ok} of
{_A, _V1, V2} -> V2;
{_V, [], _} -> false
end,
X.

lazy_case_test9() ->
'@lazy_case',
case {[], [], ok} of
{_A, _V1, V2} -> V2;
{_V, [], _} -> false
end,
ok.