Fix CaseOfCase UPLC transform.

IntersectMBO · May 8, 2024 · f3d65a7 · f3d65a7
1 parent f79ed35
commit f3d65a7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/CaseOfCase.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/CaseOfCase.hs
@@ -27,11 +27,15 @@ import Control.Lens
 caseOfCase :: (fun ~ PLC.DefaultFun) => Term name uni fun a -> Term name uni fun a
 caseOfCase = transformOf termSubterms $ \case
   Case ann scrut alts
-    | ( ite@(Force _ (Builtin _ PLC.IfThenElse))
+    | ( ite@(Force a (Builtin _ PLC.IfThenElse))
         , [cond, (trueAnn, true@Constr{}), (falseAnn, false@Constr{})]
         ) <-
         splitApplication scrut ->
-        mkIterApp
-          ite
-          [cond, (trueAnn, Case ann true alts), (falseAnn, Case ann false alts)]
+        Force a $
+          mkIterApp
+            ite
+            [ cond
+            , (trueAnn, Delay trueAnn (Case ann true alts))
+            , (falseAnn, Delay falseAnn (Case ann false alts))
+            ]
   other -> other
diff --git a/plutus-core/untyped-plutus-core/test/Transform/CaseOfCase/1.uplc.golden b/plutus-core/untyped-plutus-core/test/Transform/CaseOfCase/1.uplc.golden
@@ -1,7 +1,9 @@
-[
+(force
   [
-    [ (force (builtin ifThenElse)) b_0 ]
-    (case (constr 0) (con integer 1) (con integer 2))
+    [
+      [ (force (builtin ifThenElse)) b_0 ]
+      (delay (case (constr 0) (con integer 1) (con integer 2)))
+    ]
+    (delay (case (constr 1) (con integer 1) (con integer 2)))
   ]
-  (case (constr 1) (con integer 1) (con integer 2))
-]
+)
diff --git a/plutus-core/untyped-plutus-core/test/Transform/CaseOfCase/3.uplc.golden b/plutus-core/untyped-plutus-core/test/Transform/CaseOfCase/3.uplc.golden
@@ -1,7 +1,9 @@
-[
+(force
   [
-    [ (force (builtin ifThenElse)) b_0 ]
-    (case (constr 0 x_1 xs_2) f_3 (con integer 2))
+    [
+      [ (force (builtin ifThenElse)) b_0 ]
+      (delay (case (constr 0 x_1 xs_2) f_3 (con integer 2)))
+    ]
+    (delay (case (constr 1) f_3 (con integer 2)))
   ]
-  (case (constr 1) f_3 (con integer 2))
-]
+)
diff --git a/plutus-core/untyped-plutus-core/test/Transform/CaseOfCase/withError.uplc.golden b/plutus-core/untyped-plutus-core/test/Transform/CaseOfCase/withError.uplc.golden
@@ -1,7 +1,9 @@
-[
+(force
   [
-    [ (force (builtin ifThenElse)) (con bool True) ]
-    (case (constr 0) (con unit ()) (error))
+    [
+      [ (force (builtin ifThenElse)) (con bool True) ]
+      (delay (case (constr 0) (con unit ()) (error)))
+    ]
+    (delay (case (constr 1) (con unit ()) (error)))
   ]
-  (case (constr 1) (con unit ()) (error))
-]
+)