balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaning

Browse Source
This commit is contained in:
Lesenechal Remi 2019-10-11 17:47:04 +02:00
parent d8e44476ba
commit b7961fc8ec
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/passes/2-simplify/pascaligo.ml
View File

@ -669,39 +669,36 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
return_statement @@ e_loop cond body return_statement @@ e_loop cond body
| Loop (For (ForInt fi)) -> | Loop (For (ForInt fi)) ->
(* cond part *) (* cond part *)
let%bind _var = ok @@ e_variable fi.value.assign.value.name.value in let%bind var = ok @@ e_variable fi.value.assign.value.name.value in
let%bind _value = simpl_expression fi.value.assign.value.expr in let%bind value = simpl_expression fi.value.assign.value.expr in
let%bind _bound = simpl_expression fi.value.bound in let%bind bound = simpl_expression fi.value.bound in
let%bind _comp = match fi.value.down with let%bind comp = match fi.value.down with
| Some _ -> ok @@ e_annotation (e_constant "GE" [_var ; _bound]) t_bool | Some _ -> ok @@ e_annotation (e_constant "GE" [var ; bound]) t_bool
| None -> ok @@ e_annotation (e_constant "LE" [_var ; _bound]) t_bool | None -> ok @@ e_annotation (e_constant "LE" [var ; bound]) t_bool
in in
(* body part *) (* body part *)
let%bind _body = simpl_block fi.value.block.value in let%bind body = simpl_block fi.value.block.value in
let%bind _body = _body None in let%bind body = body None in
let%bind _step = match fi.value.step with let%bind step = match fi.value.step with
| Some (_,e) -> simpl_expression e | Some (_,e) -> simpl_expression e
| None -> ok (e_int 1) in | None -> ok (e_int 1) in
let%bind _ctrl = match fi.value.down with let%bind ctrl = match fi.value.down with
| Some _ -> | Some _ ->
let%bind _addi = ok @@ e_constant "SUB" [ _var ; _step ] in let%bind _addi = ok @@ e_constant "SUB" [ var ; step ] in
ok @@ e_assign fi.value.assign.value.name.value [] _addi ok @@ e_assign fi.value.assign.value.name.value [] _addi
| None -> | None ->
let%bind _subi = ok @@ e_constant "ADD" [ _var ; _step ] in let%bind _subi = ok @@ e_constant "ADD" [ var ; step ] in
ok @@ e_assign fi.value.assign.value.name.value [] _subi ok @@ e_assign fi.value.assign.value.name.value [] _subi
in in
let rec add_to_seq expr = match expr.expression with let rec add_to_seq expr = match expr.expression with
| E_sequence (_,a) -> add_to_seq a | E_sequence (_,a) -> add_to_seq a
| _ -> e_sequence _body _ctrl in | _ -> e_sequence body ctrl in
let%bind _body' = ok @@ add_to_seq _body in let%bind body' = ok @@ add_to_seq body in
let%bind loop = ok @@ e_loop comp body' in
let%bind _loop = ok @@ e_loop _comp _body' in
let _ = Format.printf " -> %a\n" Ast_simplified.PP.expression _body' in
return_statement @@ return_statement @@
e_let_in (fi.value.assign.value.name.value, Some t_int) _value _loop e_let_in (fi.value.assign.value.name.value, Some t_int) value loop
| Loop (For (ForCollect {region ; _})) -> | Loop (For (ForCollect {region ; _})) ->
fail @@ unsupported_for_loops region fail @@ unsupported_for_loops region
| Cond c -> ( | Cond c -> (