basic_rg: improved interface, unwind removed from applicability check

[helm.git] / helm / software / lambda-delta / lib / log.ml

diff --git a/helm/software/lambda-delta/lib/log.ml b/helm/software/lambda-delta/lib/log.ml
index 9c2ecefa2721f90b8365651527a0314c93951a5e..e28ea326ab2cbd9cb98d65f670e3225e2068addc 100644 (file)
--- a/helm/software/lambda-delta/lib/log.ml
+++ b/helm/software/lambda-delta/lib/log.ml
@@ -71,10 +71,10 @@ let t_items1 st c t =
 let ct_items1 sc c st t =
    [Warn sc; Context c; Warn st; Term (c, t)]
 
-let ct_items2 sc c st1 t1 st2 t2 =
-   ct_items1 sc c st1 t1 @ [Warn st2; Term (c, t2)]
+let ct_items2 sc1 c1 st1 t1 sc2 c2 st2 t2 =
+   ct_items1 sc1 c1 st1 t1 @ ct_items1 sc2 c2 st2 t2 
 
 let ct_items3 sc c st1 t1 st2 t2 st3 t3 =
-   ct_items2 sc c st1 t1 st2 t2 @ [Warn st3; Term (c, t3)]
+   ct_items1 sc c st1 t1 @ [Warn st2; Term (c, t2); Warn st3; Term (c, t3)]
 
 let warn msg = F.fprintf std "@,%s" msg