From 0b145dd4b0ab0ac5ed56121663a25801f20bed67 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 28 Jan 2022 21:34:55 +0100 Subject: Make minor modifications --- src/PureMicroPasses.ml | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/PureMicroPasses.ml b/src/PureMicroPasses.ml index 99c8341c..82e5ecd2 100644 --- a/src/PureMicroPasses.ml +++ b/src/PureMicroPasses.ml @@ -669,22 +669,31 @@ let unit_vars_to_unit (def : fun_def) : fun_def = let unfold_monadic_let_bindings (ctx : trans_ctx) (def : fun_def) : fun_def = def (* (* It is a very simple map *) - let obj = - object - inherit [_] map_expression as super - - method! visit_Let env monadic lv e re = - if not monadic then super#visit_Let env monadic lv e re - else - let fail_pat = mk_result_fail_lvalue lv.ty in - let success_pat = mk_result_return_lvalue lv in - let e = Switch - - end - in - (* Update the body *) - let body = obj#visit_expression () def.body in - (* Return *) + let obj = + object + inherit [_] map_expression as super + + method! visit_Let env monadic lv re e = + if not monadic then super#visit_Let env monadic lv re e + else + let fail_pat = mk_result_fail_lvalue lv.ty in + let fail_value = mk_result_fail_rvalue .. in + let fail_branch = {pat=fail_pat; branch=Value(fail_value,None)} in + let success_pat = mk_result_return_lvalue lv in + let success_branch = {pat=success_pat; branch=e} in + let switch_body = + Match [ fail_branch; success_branch + + ] + in + let e = Switch (lv, switch_body) in + self#visit_expression e + + end + in + (* Update the body *) + let body = obj#visit_expression () def.body in + (* Return *) { def with body}*) (** Apply all the micro-passes to a function. -- cgit v1.2.3