X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FcicUtil.ml;h=149a9bc2e1f2b028c7c30dfb0ed0d2d30984bc0b;hb=e2fb8962f72096d3f0bb19f40b00a3502a11e932;hp=5e0d6d4a94869989f6b9012a06d070caa2672413;hpb=b24d13c4dcc96a204951857ddfa18c5ded4cecd0;p=helm.git

diff --git a/helm/ocaml/cic/cicUtil.ml b/helm/ocaml/cic/cicUtil.ml
index 5e0d6d4a9..149a9bc2e 100644
--- a/helm/ocaml/cic/cicUtil.ml
+++ b/helm/ocaml/cic/cicUtil.ml
@@ -23,10 +23,11 @@
  * http://helm.cs.unibo.it/
  *)
 
+open Printf
+
 exception Meta_not_found of int
 exception Subst_not_found of int
 
-
 let lookup_meta index metasenv =
   try
     List.find (fun (index', _, _) -> index = index') metasenv
@@ -137,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)
@@ -160,43 +161,59 @@ let term_of_uri s =
   | Failure _
   | Not_found -> raise (UriManager.IllFormedUri s)
 
+let uri_of_term = function
+  | Cic.Const (uri, [])
+  | Cic.Var (uri, []) -> uri
+  | Cic.MutInd (baseuri, tyno, []) ->
+     UriManager.uri_of_string
+      (sprintf "%s#xpointer(1/%d)" (UriManager.string_of_uri baseuri) (tyno+1))
+  | Cic.MutConstruct (baseuri, tyno, 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 =
+  (* i is the number of binder traversed *) 
+  let rec aux i context term =
     match (context, term) with
-    | Cic.Implicit (Some `Hole), t -> [t]
+    | Cic.Implicit (Some `Hole), t -> [i,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 | _ -> []))
+              (match (t1, t2) with Some t1, Some t2 -> aux i t1 t2 | _ -> []))
             ctxt1 ctxt2)
-    | Cic.Cast (te1, ty1), Cic.Cast (te2, ty2) -> aux te1 te2 @ aux ty1 ty2
+    | Cic.Cast (te1, ty1), Cic.Cast (te2, ty2) -> aux i te1 te2 @ aux i 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.LetIn (_, s1, t1), Cic.LetIn (_, s2, t2) -> 
+        aux i s1 s2 @ aux (i+1) t1 t2
+    | Cic.Appl terms1, Cic.Appl terms2 -> auxs i 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)
+        auxs i (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
+        aux i out1 out2 @ aux i t1 t2 @ auxs i pat1 pat2
     | Cic.Fix (_, funs1), Cic.Fix (_, funs2) ->
         List.concat
           (List.map2
-            (fun (_, _, ty1, bo1) (_, _, ty2, bo2) -> aux ty1 ty2 @ aux bo1 bo2)
+            (fun (_, _, ty1, bo1) (_, _, ty2, bo2) -> 
+              aux i ty1 ty2 @ aux i 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)
+            (fun (_, ty1, bo1) (_, ty2, bo2) -> aux i ty1 ty2 @ aux i bo1 bo2)
             funs1 funs2)
     | _ -> assert false
-  and auxs terms1 terms2 =  (* as aux for list of terms *)
-    List.concat (List.map2 aux terms1 terms2)
+  and auxs i terms1 terms2 =  (* as aux for list of terms *)
+    List.concat (List.map2 (fun t1 t2 -> aux i t1 t2) terms1 terms2)
   in
-  aux context term
+  aux 0 context term
 
 let context_of ?(equality=(==)) ~term terms =
   let (===) x y = equality x y in
@@ -238,6 +255,7 @@ let context_of ?(equality=(==)) ~term terms =
   in
   aux term
 
+(*
 let pack terms =
   List.fold_right
     (fun term acc -> Cic.Prod (Cic.Anonymous, term, acc))
@@ -247,9 +265,43 @@ 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
   | Cic.Prod (_, _, tgt) when n > 0 -> strip_prods (n-1) tgt
   | _ -> failwith "not enough prods"
 
+let params_of_obj = function
+  | Cic.Constant (_, _, _, params, _)
+  | Cic.Variable (_, _, _, params, _)
+  | Cic.CurrentProof (_, _, _, _, params, _)
+  | Cic.InductiveDefinition (_, params, _, _) ->
+      params
+
+let attributes_of_obj = function
+  | Cic.Constant (_, _, _, _, attributes)
+  | Cic.Variable (_, _, _, _, attributes)
+  | 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 profile =
+ function s ->
+  let total = ref 0.0 in
+  let profile f x =
+   let before = Unix.gettimeofday () in
+   let res = f x in
+   let after = Unix.gettimeofday () in
+    total := !total +. (after -. before);
+    res
+  in
+  at_exit
+   (fun () ->
+     print_endline
+      ("!! TOTAL TIME SPENT IN " ^ s ^ ": " ^ string_of_float !total));
+  profile