X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FcicUtil.ml;h=f2ea4171bf356923effb70662b800f757f778c32;hb=2026624f827b29c35d54aa67b301250123ea7311;hp=36c266ba7b7054ebbfec0941c6e4a48d13262219;hpb=e466e614d63da993d6380cf166bbb041b46f04cd;p=helm.git

diff --git a/helm/ocaml/cic/cicUtil.ml b/helm/ocaml/cic/cicUtil.ml
index 36c266ba7..f2ea4171b 100644
--- a/helm/ocaml/cic/cicUtil.ml
+++ b/helm/ocaml/cic/cicUtil.ml
@@ -46,7 +46,7 @@ canonical context *)
 let clean_up_local_context subst metasenv n l =
   let cc =
     (try
-       let (cc,_) = lookup_subst n subst in cc
+       let (cc,_,_) = lookup_subst n subst in cc
      with Subst_not_found _ ->
        try
 	 let (_,cc,_) = lookup_meta n metasenv in cc
@@ -103,46 +103,38 @@ in
  is_closed 0
 ;;
 
-(* CPS iterators on Cic.term ************************************************)
-
-let rec visit_l visit_t map f r = function
-   | []        -> f r
-   | h :: tail -> 
-      let f r = visit_l visit_t map f r tail in 
-      visit_t f r (map h) 
-
-let meta_closed t =
-   let rec visit_t f r = function
-      | Cic.Meta _                     -> raise Exit
-      | Cic.Implicit _
-      | Cic.Sort _      
-      | Cic.Rel _                      -> f r 
-      | Cic.Cast (t, u) 
-      | Cic.Prod (_, t, u) 
-      | Cic.Lambda (_, t, u) 
-      | Cic.LetIn (_, t, u)            -> 
-         let f r = visit_t f r u in visit_t f r t 
-      | Cic.Appl tl                    -> 
-         visit_l visit_t (fun x -> x) f r tl 
-      | Cic.Fix (_, tl)                ->  
-         let f r = visit_l visit_t (fun (_, _, _, u) -> u) f r tl in
-         visit_l visit_t (fun (_, _, t, _) -> t) f r tl
-      | Cic.CoFix (_, tl)              -> 
-         let f r = visit_l visit_t (fun (_, _, u) -> u) f r tl in
-         visit_l visit_t (fun (_, t, _) -> t) f r tl
-      | Cic.Var (k, tl)
-      | Cic.Const (k, tl)             
-      | Cic.MutInd (k, _, tl) 
-      | Cic.MutConstruct (k, _, _, tl) -> 
-         visit_l visit_t (fun (_, u) -> u) f r tl
-      | Cic.MutCase (_, _, t, u, tl)   -> 
-         let f r = visit_l visit_t (fun u -> u) f r tl in
-         let f r = visit_t f r u in
-         visit_t f r t
-   in	  
-   try visit_t (fun x -> x) () t; false with Exit -> true
-
-let xpointer_RE = Str.regexp "[^#]+#xpointer(\\(.*\\))"
+let rec is_meta_closed =
+  function
+      Cic.Rel _ -> true
+    | Cic.Meta _ -> false
+    | Cic.Sort _ -> true
+    | Cic.Implicit _ -> assert false
+    | Cic.Cast (te,ty) -> is_meta_closed te && is_meta_closed ty
+    | Cic.Prod (name,so,dest) -> is_meta_closed so && is_meta_closed dest
+    | Cic.Lambda (_,so,dest) -> is_meta_closed so && is_meta_closed dest
+    | Cic.LetIn (_,so,dest) -> is_meta_closed so && is_meta_closed dest
+    | Cic.Appl l ->
+       List.fold_right (fun x i -> i && is_meta_closed x) l true
+    | Cic.Var (_,exp_named_subst)
+    | Cic.Const (_,exp_named_subst)
+    | Cic.MutInd (_,_,exp_named_subst)
+    | Cic.MutConstruct (_,_,_,exp_named_subst) ->
+       List.fold_right (fun (_,x) i -> i && is_meta_closed x)
+        exp_named_subst true
+    | Cic.MutCase (_,_,out,te,pl) ->
+       is_meta_closed out && is_meta_closed te &&
+        List.fold_right (fun x i -> i && is_meta_closed x) pl true
+    | Cic.Fix (_,fl) ->
+        List.fold_right
+          (fun (_,_,ty,bo) i -> i && is_meta_closed ty && is_meta_closed bo
+          ) fl true
+    | Cic.CoFix (_,fl) ->
+         List.fold_right
+          (fun (_,ty,bo) i -> i && is_meta_closed ty && is_meta_closed bo
+          ) fl true
+;;
+
+let xpointer_RE = Str.regexp "\\([^#]+\\)#xpointer(\\(.*\\))"
 let slash_RE = Str.regexp "/"
 
 let term_of_uri s =
@@ -155,14 +147,123 @@ let term_of_uri s =
     else if not (Str.string_match xpointer_RE s 0) then
       raise (UriManager.IllFormedUri s)
     else
-      (match Str.split slash_RE (Str.matched_group 1 s) with
-      | [_; tyno] -> Cic.MutInd (uri, int_of_string tyno - 1, [])
+      let (baseuri,xpointer) = (Str.matched_group 1 s, Str.matched_group 2 s) in
+      let baseuri = UriManager.uri_of_string baseuri in
+      (match Str.split slash_RE xpointer with
+      | [_; tyno] -> Cic.MutInd (baseuri, int_of_string tyno - 1, [])
       | [_; tyno; consno] ->
           Cic.MutConstruct
-            (uri, int_of_string tyno - 1, int_of_string consno, [])
+            (baseuri, int_of_string tyno - 1, int_of_string consno, [])
       | _ -> raise Exit))
   with
   | Exit
   | Failure _
   | Not_found -> raise (UriManager.IllFormedUri s)
 
+let select ~term ~context =
+  let rec aux context term =
+    match (context, term) with
+    | Cic.Implicit (Some `Hole), t -> [t]
+    | 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))
+    terms (Cic.Sort (Cic.Type (CicUniv.fresh ())))
+
+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
+