X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FcicUtil.ml;h=81834251577822662c5121c70ea0cf98a11aaf5f;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=e686b6b35accbf4d4626b8d0fc9617ed356edbd4;hpb=72f2faebd85bf6a191325b1ac39f051b22e8d838;p=helm.git

diff --git a/helm/ocaml/cic/cicUtil.ml b/helm/ocaml/cic/cicUtil.ml
index e686b6b35..818342515 100644
--- a/helm/ocaml/cic/cicUtil.ml
+++ b/helm/ocaml/cic/cicUtil.ml
@@ -138,12 +138,12 @@ let rec is_meta_closed =
 let xpointer_RE = Str.regexp "\\([^#]+\\)#xpointer(\\(.*\\))"
 let slash_RE = Str.regexp "/"
 
-let term_of_uri s =
-  let uri = UriManager.uri_of_string s in
+let term_of_uri uri =
+  let s = UriManager.string_of_uri uri in
   try
-    (if String.sub s (String.length s - 4) 4 = ".con" then
+    (if UriManager.uri_is_con uri then
       Cic.Const (uri, [])
-    else if String.sub s (String.length s - 4) 4 = ".var" then
+    else if UriManager.uri_is_var uri then
       Cic.Var (uri, [])
     else if not (Str.string_match xpointer_RE s 0) then
       raise (UriManager.IllFormedUri s)
@@ -163,93 +163,18 @@ let term_of_uri s =
 
 let uri_of_term = function
   | Cic.Const (uri, [])
-  | Cic.Var (uri, []) -> UriManager.string_of_uri uri
+  | Cic.Var (uri, []) -> uri
   | Cic.MutInd (baseuri, tyno, []) ->
-      sprintf "%s#xpointer(1/%d)" (UriManager.string_of_uri baseuri) (tyno + 1)
+     UriManager.uri_of_string
+      (sprintf "%s#xpointer(1/%d)" (UriManager.string_of_uri baseuri) (tyno+1))
   | Cic.MutConstruct (baseuri, tyno, consno, []) ->
-      sprintf "%s#xpointer(1/%d/%d)" (UriManager.string_of_uri baseuri)
-        (tyno + 1) consno
+     UriManager.uri_of_string
+      (sprintf "%s#xpointer(1/%d/%d)" (UriManager.string_of_uri baseuri)
+        (tyno + 1) consno)
   | _ -> raise (Invalid_argument "uri_of_term")
 
-let select ~term ~context =
-  let rec aux context term =
-    match (context, term) with
-    | Cic.Implicit (Some `Hole), t -> [t]
-    | Cic.Implicit None,_ -> []
-    | Cic.Meta (_, ctxt1), Cic.Meta (_, ctxt2) ->
-        List.concat
-          (List.map2
-            (fun t1 t2 ->
-              (match (t1, t2) with Some t1, Some t2 -> aux t1 t2 | _ -> []))
-            ctxt1 ctxt2)
-    | Cic.Cast (te1, ty1), Cic.Cast (te2, ty2) -> aux te1 te2 @ aux ty1 ty2
-    | Cic.Prod (_, s1, t1), Cic.Prod (_, s2, t2)
-    | Cic.Lambda (_, s1, t1), Cic.Lambda (_, s2, t2)
-    | Cic.LetIn (_, s1, t1), Cic.LetIn (_, s2, t2) -> aux s1 s2 @ aux t1 t2
-    | Cic.Appl terms1, Cic.Appl terms2 -> auxs terms1 terms2
-    | Cic.Var (_, subst1), Cic.Var (_, subst2)
-    | Cic.Const (_, subst1), Cic.Const (_, subst2)
-    | Cic.MutInd (_, _, subst1), Cic.MutInd (_, _, subst2)
-    | Cic.MutConstruct (_, _, _, subst1), Cic.MutConstruct (_, _, _, subst2) ->
-        auxs (List.map snd subst1) (List.map snd subst2)
-    | Cic.MutCase (_, _, out1, t1, pat1), Cic.MutCase (_ , _, out2, t2, pat2) ->
-        aux out1 out2 @ aux t1 t2 @ auxs pat1 pat2
-    | Cic.Fix (_, funs1), Cic.Fix (_, funs2) ->
-        List.concat
-          (List.map2
-            (fun (_, _, ty1, bo1) (_, _, ty2, bo2) -> aux ty1 ty2 @ aux bo1 bo2)
-            funs1 funs2)
-    | Cic.CoFix (_, funs1), Cic.CoFix (_, funs2) ->
-        List.concat
-          (List.map2
-            (fun (_, ty1, bo1) (_, ty2, bo2) -> aux ty1 ty2 @ aux bo1 bo2)
-            funs1 funs2)
-    | _ -> assert false
-  and auxs terms1 terms2 =  (* as aux for list of terms *)
-    List.concat (List.map2 aux terms1 terms2)
-  in
-  aux context term
-
-let context_of ?(equality=(==)) ~term terms =
-  let (===) x y = equality x y in
-  let rec aux t =
-    match t with
-    | t when List.exists (fun t' -> t === t') terms -> Cic.Implicit (Some `Hole)
-    | Cic.Var (uri, subst) -> Cic.Var (uri, aux_subst subst)
-    | Cic.Meta (i, ctxt) ->
-        let ctxt =
-          List.map (function None -> None | Some t -> Some (aux t)) ctxt
-        in
-        Cic.Meta (i, ctxt)
-    | Cic.Cast (t, ty) -> Cic.Cast (aux t, aux ty)
-    | Cic.Prod (name, s, t) -> Cic.Prod (name, aux s, aux t)
-    | Cic.Lambda (name, s, t) -> Cic.Lambda (name, aux s, aux t)
-    | Cic.LetIn (name, s, t) -> Cic.LetIn (name, aux s, aux t)
-    | Cic.Appl terms -> Cic.Appl (List.map aux terms)
-    | Cic.Const (uri, subst) -> Cic.Const (uri, aux_subst subst)
-    | Cic.MutInd (uri, tyno, subst) -> Cic.MutInd (uri, tyno, aux_subst subst)
-    | Cic.MutConstruct (uri, tyno, consno, subst) ->
-        Cic.MutConstruct (uri, tyno, consno, aux_subst subst)
-    | Cic.MutCase (uri, tyno, outty, t, pat) ->
-        Cic.MutCase (uri, tyno, aux outty, aux t, List.map aux pat)
-    | Cic.Fix (funno, funs) ->
-        let funs =
-          List.map (fun (name, i, ty, bo) -> (name, i, aux ty, aux bo)) funs
-        in
-        Cic.Fix (funno, funs)
-    | Cic.CoFix (funno, funs) ->
-        let funs =
-          List.map (fun (name, ty, bo) -> (name, aux ty, aux bo)) funs
-        in
-        Cic.CoFix (funno, funs)
-    | Cic.Rel _
-    | Cic.Sort _
-    | Cic.Implicit _ -> t
-  and aux_subst subst =
-    List.map (fun (uri, t) -> (uri, aux t)) subst
-  in
-  aux term
 
+(*
 let pack terms =
   List.fold_right
     (fun term acc -> Cic.Prod (Cic.Anonymous, term, acc))
@@ -259,6 +184,7 @@ let rec unpack = function
   | Cic.Prod (Cic.Anonymous, term, Cic.Sort (Cic.Type _)) -> [term]
   | Cic.Prod (Cic.Anonymous, term, tgt) -> term :: unpack tgt
   | _ -> assert false
+*)
 
 let rec strip_prods n = function
   | t when n = 0 -> t
@@ -278,9 +204,26 @@ let attributes_of_obj = function
   | Cic.CurrentProof (_, _, _, _, _, attributes)
   | Cic.InductiveDefinition (_, _, _, attributes) ->
       attributes
-      
 let rec mk_rels howmany from =
   match howmany with 
   | 0 -> []
   | _ -> (Cic.Rel (howmany + from)) :: (mk_rels (howmany-1) from)
 
+let id_of_annterm =
+  function
+  | Cic.ARel (id,_,_,_)
+  | Cic.AVar (id,_,_)
+  | Cic.AMeta (id,_,_)
+  | Cic.ASort (id,_)
+  | Cic.AImplicit (id,_)
+  | Cic.ACast (id,_,_)
+  | Cic.AProd (id,_,_,_)
+  | Cic.ALambda (id,_,_,_)
+  | Cic.ALetIn (id,_,_,_)
+  | Cic.AAppl (id,_)
+  | Cic.AConst (id,_,_)
+  | Cic.AMutInd (id,_,_,_)
+  | Cic.AMutConstruct (id,_,_,_,_)
+  | Cic.AMutCase (id,_,_,_,_,_)
+  | Cic.AFix (id,_,_)
+  | Cic.ACoFix (id,_,_) -> id