QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Fix renaming bug

Browse Source
This commit is contained in:
Ulf Norell 2019-04-09 09:32:51 +02:00
parent f73a0934d4
commit cca83a5dfa
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/aeso_ast_to_fcode.erl
View File

@ -289,8 +289,10 @@ merge_alt(I, X, {P, A}, [{Q, As} | Rest]) ->
expand(I, X, Q, {'case', Ps, E}) -> expand(I, X, Q, {'case', Ps, E}) ->
{Ps0, [{var, Y} | Ps1]} = lists:split(I - 1, Ps), {Ps0, [{var, Y} | Ps1]} = lists:split(I - 1, Ps),
Splice = fun(Qs) -> Ps0 ++ Qs ++ Ps1 end, {Ps0r, Ren1} = rename_pats([{Y, X}], Ps0),
E1 = rename([{Y, X}], E), {Ps1r, Ren2} = rename_pats(Ren1, Ps1),
E1 = rename(Ren2, E),
Splice = fun(Qs) -> Ps0r ++ Qs ++ Ps1r end,
case Q of case Q of
{tuple, Xs} -> [{Q, {'case', Splice([{var, "_"} || _ <- Xs]), E1}}]; {tuple, Xs} -> [{Q, {'case', Splice([{var, "_"} || _ <- Xs]), E1}}];
{bool, _} -> [{{bool, B}, {'case', Splice([]), E1}} || B <- [false, true]] {bool, _} -> [{{bool, B}, {'case', Splice([]), E1}} || B <- [false, true]]
@ -348,6 +350,12 @@ rename_bindings(Ren, [X | Xs]) ->
{Zs, Ren2} = rename_bindings(Ren1, Xs), {Zs, Ren2} = rename_bindings(Ren1, Xs),
{[Z | Zs], Ren2}. {[Z | Zs], Ren2}.
rename_pats(Ren, []) -> {[], Ren};
rename_pats(Ren, [P | Ps]) ->
{Q, Ren1} = rename_pat(Ren, P),
{Qs, Ren2} = rename_pats(Ren1, Ps),
{[Q | Qs], Ren2}.
rename_pat(Ren, P = {bool, _}) -> {P, Ren}; rename_pat(Ren, P = {bool, _}) -> {P, Ren};
rename_pat(Ren, {var, X}) -> rename_pat(Ren, {var, X}) ->
{Z, Ren1} = rename_binding(Ren, X), {Z, Ren1} = rename_binding(Ren, X),