From 0dbdf207bfa4e72e24837e527cba1efb66d4bd52 Mon Sep 17 00:00:00 2001 From: Gaith Hallak Date: Fri, 26 Aug 2022 19:53:00 +0300 Subject: [PATCH] Fix typos --- src/aeso_ast_to_fcode.erl | 14 +++++++------- src/aeso_fcode_to_fate.erl | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/aeso_ast_to_fcode.erl b/src/aeso_ast_to_fcode.erl index e6ed05b..8ffa1e7 100644 --- a/src/aeso_ast_to_fcode.erl +++ b/src/aeso_ast_to_fcode.erl @@ -1294,14 +1294,14 @@ optimize_fcode(Code = #{ functions := Funs }, Options) -> -spec optimize_fun(fcode(), fun_name(), fun_def(), [option()]) -> fun_def(). optimize_fun(Fcode, Fun, Def = #{ body := Body0 }, Options) -> - All = proplists:get_value(optimizate_all, Options, true), + All = proplists:get_value(optimize_all, Options, true), - Inliner = proplists:get_value(optimizate_inliner, Options, All), - InlineLocalFunctions = proplists:get_value(optimizate_inline_local_functions, Options, All), - BindSubexpressions = proplists:get_value(optimizate_bind_subexpressions, Options, All), - LetFloating = proplists:get_value(optimizate_let_floating, Options, All), - Simplifier = proplists:get_value(optimizate_simplifier, Options, All), - DropUnusedLets = proplists:get_value(optimizate_drop_unused_lets, Options, All), + Inliner = proplists:get_value(optimize_inliner, Options, All), + InlineLocalFunctions = proplists:get_value(optimize_inline_local_functions, Options, All), + BindSubexpressions = proplists:get_value(optimize_bind_subexpressions, Options, All), + LetFloating = proplists:get_value(optimize_let_floating, Options, All), + Simplifier = proplists:get_value(optimize_simplifier, Options, All), + DropUnusedLets = proplists:get_value(optimize_drop_unused_lets, Options, All), Body1 = if Inliner -> inliner (Fcode, Fun, Body0); true -> Body0 end, Body2 = if InlineLocalFunctions -> inline_local_functions(Body1); true -> Body1 end, diff --git a/src/aeso_fcode_to_fate.erl b/src/aeso_fcode_to_fate.erl index 48b7609..4688e6f 100644 --- a/src/aeso_fcode_to_fate.erl +++ b/src/aeso_fcode_to_fate.erl @@ -77,7 +77,7 @@ compile(ChildContracts, FCode, Options) -> #{ contract_name := ContractName, functions := Functions } = FCode, SFuns = functions_to_scode(ChildContracts, ContractName, Functions, Options), - SFuns1 = proplists:get_value(optimize_scode, Options, true) andalso optimize_scode(SFuns, Options), + SFuns1 = optimize_scode(SFuns, Options), FateCode = to_basic_blocks(SFuns1), ?debug(compile, Options, "~s\n", [aeb_fate_asm:pp(FateCode)]), FateCode. @@ -708,6 +708,8 @@ tuple(N) -> aeb_fate_ops:tuple(?a, N). %% Optimize optimize_scode(Funs, Options) -> + All = proplists:get_value(optimize_all, Options, true), + OptimizeScode = proplists:get_value(optimize_scode, Options, All), maps:map(fun(Name, Def) -> optimize_fun(Funs, Name, Def, Options) end, Funs).