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

Fixed letrec and letfun env management

Browse Source
This commit is contained in:
radrow 2019-04-19 16:24:45 +02:00
parent faa0ef9772
commit 982571d7fe
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/aeso_ast_infer_types.erl
View File

@ -1109,10 +1109,13 @@ infer_block(_Env, Attrs, [], BlockType) ->
error({impossible, empty_block, Attrs, BlockType}); error({impossible, empty_block, Attrs, BlockType});
infer_block(Env, Attrs, [Def={letfun, _, _, _, _, _}|Rest], BlockType) -> infer_block(Env, Attrs, [Def={letfun, _, _, _, _, _}|Rest], BlockType) ->
NewDef = infer_letfun(Env, Def), NewDef = infer_letfun(Env, Def),
[NewDef|infer_block(Env, Attrs, Rest, BlockType)]; {{Name, TypeSig}, _} = NewDef,
NewE = bind_fun(Name, TypeSig, Env),
[NewDef|infer_block(NewE, Attrs, Rest, BlockType)];
infer_block(Env, Attrs, [Def={letrec, _, _}|Rest], BlockType) -> infer_block(Env, Attrs, [Def={letrec, _, _}|Rest], BlockType) ->
NewDef = infer_letrec(Env, Def), NewDefs = {DefList, _} = infer_letrec(Env, Def),
[NewDef|infer_block(Env, Attrs, Rest, BlockType)]; NewE = bind_funs(DefList, Env),
[NewDefs|infer_block(NewE, Attrs, Rest, BlockType)];
infer_block(Env, _, [{letval, Attrs, Pattern, Type, E}|Rest], BlockType) -> infer_block(Env, _, [{letval, Attrs, Pattern, Type, E}|Rest], BlockType) ->
NewE = {typed, _, _, PatType} = infer_expr(Env, {typed, Attrs, E, arg_type(Type)}), NewE = {typed, _, _, PatType} = infer_expr(Env, {typed, Attrs, E, arg_type(Type)}),
{'case', _, NewPattern, {typed, _, {block, _, NewRest}, _}} = {'case', _, NewPattern, {typed, _, {block, _, NewRest}, _}} =