Fix lazy evaluation of and/or in the OCaml backend (#769)

CatalaLang · Jan 10, 2025 · 0422f5c · 0422f5c
2 parents 66c5df5 + 05d177d
commit 0422f5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/compiler/lcalc/to_ocaml.ml b/compiler/lcalc/to_ocaml.ml
@@ -380,6 +380,10 @@ let rec format_expr (ctx : decl_ctx) (fmt : Format.formatter) (e : 'm expr) :
     Format.fprintf fmt
       "@[<hov 2> if@ @[<hov 2>%a@]@ then@ @[<hov 2>%a@]@ else@ @[<hov 2>%a@]@]"
       format_with_parens cond format_with_parens etrue format_with_parens efalse
+  | EAppOp { op = ((And | Or) as op), _; args = [e1; e2]; _ } ->
+    Format.fprintf fmt "@[<hov 2>%a %s@ %a@]" format_with_parens e1
+      (if op = And then "&&" else "||")
+      format_with_parens e2
   | EAppOp { op = op, pos; args; _ } ->
     Format.fprintf fmt "@[<hov 2>%s@ %t%a@]" (Operator.name op)
       (fun ppf ->

diff --git a/tests/name_resolution/good/conflicts-module.catala_en b/tests/name_resolution/good/conflicts-module.catala_en
@@ -94,7 +94,7 @@ end
 
 let closure_scoppe__2 : Obj.t -> bool -> integer -> bool =
   fun (_: Obj.t) (acc: bool) (x: integer) ->
-    o_and acc (o_gt_int_int x (integer_of_string "2"))
+    acc && (o_gt_int_int x (integer_of_string "2"))
 
 let closure_scoppe (_: Closure_scoppe_in.t) : Closure_scoppe.t =
   let scoppe: bool =

diff --git a/tests/name_resolution/good/let_in2.catala_en b/tests/name_resolution/good/let_in2.catala_en
@@ -61,7 +61,7 @@ let s (s_in: S_in.t) : S.t =
               (match
                  (Eoption.ESome (let a__2 : bool = false
                     in
-                    (let a__3 : bool = (o_or a__2 true) in
+                    (let a__3 : bool = (a__2 || true) in
                     a__3)))
                with
                | Eoption.ENone _ -> (raise