packaging cleanup: get rid of ancient debhelpers, use dh_install

[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 24b4af1d98cf0aa0177605d4d2b06b0c923b9e1f..e4145e118984e5311195000ea52d9b5edd7720b9 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationUtil.ml
+++ b/helm/ocaml/cic_notation/cicNotationUtil.ml
@@ -25,13 +25,6 @@
 
 open CicNotationPt
 
-  (* TODO ensure that names generated by fresh_var do not clash with user's *)
-let fresh_name =
-  let index = ref ~-1 in
-  fun () ->
-    incr index;
-    "fresh" ^ string_of_int !index
-
 (* let meta_names_of term = *)
 (*   let rec names = ref [] in *)
 (*   let add_name n = *)
@@ -100,12 +93,12 @@ let fresh_name =
 
 let visit_ast ?(special_k = fun _ -> assert false) k =
   let rec aux = function
-
     | Appl terms -> Appl (List.map k terms)
     | Binder (kind, var, body) ->
         Binder (kind, aux_capture_variable var, k body) 
     | Case (term, indtype, typ, patterns) ->
         Case (k term, indtype, aux_opt typ, aux_patterns patterns)
+    | Cast (t1, t2) -> Cast (k t1, k t2)
     | LetIn (var, t1, t2) -> LetIn (aux_capture_variable var, k t1, k t2)
     | LetRec (kind, definitions, term) ->
         let definitions =
@@ -117,13 +110,11 @@ let visit_ast ?(special_k = fun _ -> assert false) k =
     | Ident (name, Some substs) -> Ident (name, Some (aux_substs substs))
     | Uri (name, Some substs) -> Uri (name, Some (aux_substs substs))
     | Meta (index, substs) -> Meta (index, List.map aux_opt substs)
-
     | (AttributedTerm _
       | Layout _
       | Literal _
       | Magic _
       | Variable _) as t -> special_k t
-
     | (Ident _
       | Implicit
       | Num _
@@ -131,24 +122,16 @@ let visit_ast ?(special_k = fun _ -> assert false) k =
       | Symbol _
       | Uri _
       | UserInput) as t -> t
-
   and aux_opt = function
     | None -> None
     | Some term -> Some (k term)
-
   and aux_capture_variable (term, typ_opt) = k term, aux_opt typ_opt
-
   and aux_patterns patterns = List.map aux_pattern patterns
-
   and aux_pattern ((head, vars), term) =
     ((head, List.map aux_capture_variable vars), k term)
-
   and aux_subst (name, term) = (name, k term)
-
   and aux_substs substs = List.map aux_subst substs
-
   in
-
   aux
 
 let visit_layout k = function
@@ -163,6 +146,7 @@ let visit_layout k = function
   | Root (arg, index) -> Root (k arg, k index)
   | Break -> Break
   | Box (kind, terms) -> Box (kind, List.map k terms)
+  | Group terms -> Group (List.map k terms)
 
 let visit_magic k = function
   | List0 (t, l) -> List0 (k t, l)
@@ -207,6 +191,23 @@ let names_of_term t =
   in
     List.map aux (variables_of_term t)
 
+let keywords_of_term t =
+  let rec keywords = ref [] in
+  let add_keyword k = keywords := k :: !keywords in
+  let rec aux = function
+    | AttributedTerm (_, t) -> aux t
+    | Layout l -> Layout (visit_layout aux l)
+    | Literal (`Keyword k) as t ->
+        add_keyword k;
+        t
+    | Literal _ as t -> t
+    | Magic m -> Magic (visit_magic aux m)
+    | Variable _ as v -> v
+    | t -> visit_ast aux t
+  in
+    ignore (aux t) ;
+    !keywords
+
 let rec strip_attributes t =
   let special_k = function
     | AttributedTerm (_, term) -> strip_attributes term
@@ -318,6 +319,41 @@ let boxify = function
   | [ a ] -> a
   | l -> Layout (Box ((H, false, false), l))
 
+let unboxify = function
+  | Layout (Box ((H, false, false), [ a ])) -> a
+  | l -> l
+
+let group = function
+  | [ a ] -> a
+  | l -> Layout (Group l)
+
+let ungroup =
+  let rec aux acc =
+    function
+       [] -> List.rev acc
+      | Layout (Group terms) :: terms' -> aux acc (terms @ terms')
+      | term :: terms -> aux (term :: acc) terms
+  in
+    aux []
+
+let dress ~sep:sauce =
+  let rec aux =
+    function
+      | [] -> []
+      | [hd] -> [hd]
+      | hd :: tl -> hd :: sauce :: aux tl
+  in
+    aux
+
+let dressn ~sep:sauces =
+  let rec aux =
+    function
+      | [] -> []
+      | [hd] -> [hd]
+      | hd :: tl -> hd :: sauces @ aux tl
+  in
+    aux
+
 let find_appl_pattern_uris ap =
   let rec aux acc =
     function
@@ -326,6 +362,7 @@ let find_appl_pattern_uris ap =
           ignore (List.find (fun uri' -> UriManager.eq uri uri') acc);
           acc
         with Not_found -> uri :: acc)
+    | ImplicitPattern
     | VarPattern _ -> acc
     | ApplPattern apl -> List.fold_left aux acc apl
   in
@@ -336,3 +373,26 @@ let rec find_branch =
       Magic (If (_, Magic Fail, t)) -> find_branch t
     | Magic (If (_, t, _)) -> find_branch t
     | t -> t
+
+let cic_name_of_name = function
+  | CicNotationPt.Ident ("_", None) -> Cic.Anonymous
+  | CicNotationPt.Ident (name, None) -> Cic.Name name
+  | _ -> assert false
+
+let name_of_cic_name =
+  let add_dummy_xref t = CicNotationPt.AttributedTerm (`IdRef "", t) in
+  function
+  | Cic.Name s -> add_dummy_xref (CicNotationPt.Ident (s, None))
+  | Cic.Anonymous -> add_dummy_xref (CicNotationPt.Ident ("_", None))
+
+let fresh_index = ref ~-1
+
+type notation_id = int
+
+let fresh_id () =
+  incr fresh_index;
+  !fresh_index
+
+  (* TODO ensure that names generated by fresh_var do not clash with user's *)
+let fresh_name () = "fresh" ^ string_of_int (fresh_id ())
+