merged cic_notation with disambiguation: good luck!

[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 4dbc83f9eb7d4ffd275fd0be51b7f0bdacd0e2d0..4489344f53b58728d3b49fec4829350a05594b2b 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 = *)
@@ -105,6 +98,7 @@ let visit_ast ?(special_k = fun _ -> assert false) k =
         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 =
@@ -350,13 +344,14 @@ let dress sauce =
 let find_appl_pattern_uris ap =
   let rec aux acc =
     function
-    | GrafiteAst.UriPattern uri ->
+    | UriPattern uri ->
         (try
           ignore (List.find (fun uri' -> UriManager.eq uri uri') acc);
           acc
         with Not_found -> uri :: acc)
-    | GrafiteAst.VarPattern _ -> acc
-    | GrafiteAst.ApplPattern apl -> List.fold_left aux acc apl
+    | ImplicitPattern
+    | VarPattern _ -> acc
+    | ApplPattern apl -> List.fold_left aux acc apl
   in
   aux [] ap
 
@@ -365,3 +360,24 @@ 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 = function
+  | Cic.Name s -> CicNotationPt.Ident (s, None)
+  | Cic.Anonymous -> 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 ())
+