snapshot

[helm.git] / helm / ocaml / cic_notation / cicNotationUtil.ml

diff --git a/helm/ocaml/cic_notation/cicNotationUtil.ml b/helm/ocaml/cic_notation/cicNotationUtil.ml
index f10efa7545d82ff152d40af057fd4c188533b9e6..24b4af1d98cf0aa0177605d4d2b06b0c923b9e1f 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationUtil.ml
+++ b/helm/ocaml/cic_notation/cicNotationUtil.ml
@@ -161,7 +161,7 @@ let visit_layout k = function
   | Frac (t1, t2) -> Frac (k t1, k t2)
   | Sqrt t -> Sqrt (k t)
   | Root (arg, index) -> Root (k arg, k index)
-(*   | Break -> Break *)
+  | Break -> Break
   | Box (kind, terms) -> Box (kind, List.map k terms)
 
 let visit_magic k = function
@@ -170,8 +170,8 @@ let visit_magic k = function
   | Opt t -> Opt (k t)
   | Fold (kind, t1, names, t2) -> Fold (kind, k t1, names, k t2)
   | Default (t1, t2) -> Default (k t1, k t2)
-  | If (t1, t2) -> If (k t1, k t2)
-  | Unless (t1, t2) -> Unless (k t1, k t2)
+  | If (t1, t2, t3) -> If (k t1, k t2, k t3)
+  | Fail -> Fail
 
 let variables_of_term t =
   let rec vars = ref [] in
@@ -277,6 +277,11 @@ let meta_names_of_term term =
     | Fold (_, t1, _, t2) ->
         aux t1 ;
         aux t2
+    | If (t1, t2, t3) ->
+        aux t1 ;
+        aux t2 ;
+       aux t3
+    | Fail -> ()
     | _ -> assert false
   in
   aux term ;
@@ -326,3 +331,8 @@ let find_appl_pattern_uris ap =
   in
   aux [] ap
 
+let rec find_branch =
+  function
+      Magic (If (_, Magic Fail, t)) -> find_branch t
+    | Magic (If (_, t, _)) -> find_branch t
+    | t -> t