X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_cic_content%2FnTermCicContent.ml;h=3c17823b6c9160e25f298839d67c41703a395aba;hb=07713b63c109a99c2b9dc7265571bcdd3dd6ed0d;hp=b3c827f9242567e2889497c852aff5a53d401849;hpb=6abf435197c2bc37fadc0b3bd5925cd9cbe112e2;p=helm.git

diff --git a/helm/software/components/ng_cic_content/nTermCicContent.ml b/helm/software/components/ng_cic_content/nTermCicContent.ml
index b3c827f92..3c17823b6 100644
--- a/helm/software/components/ng_cic_content/nTermCicContent.ml
+++ b/helm/software/components/ng_cic_content/nTermCicContent.ml
@@ -32,11 +32,11 @@ module Ast = CicNotationPt
 let debug = false
 let debug_print s = if debug then prerr_endline (Lazy.force s) else ()
 
+type id = string
+
 (*
 type interpretation_id = int
 
-let idref id t = Ast.AttributedTerm (`IdRef id, t)
-
 type term_info =
   { sort: (Cic.id, Ast.sort_kind) Hashtbl.t;
     uri: (Cic.id, UriManager.uri) Hashtbl.t;
@@ -45,54 +45,43 @@ type term_info =
 let get_types uri =
   let o,_ = CicEnvironment.get_obj CicUniv.oblivion_ugraph uri in
     match o with
-      | Cic.InductiveDefinition (l,_,lpsno,_) -> l, lpsno 
+      | Cic.InductiveDefinition (l,_,leftno,_) -> l, leftno 
       | _ -> assert false
-
-let name_of_inductive_type uri i = 
-  let types, _ = get_types uri in
-  let (name, _, _, _) = try List.nth types i with Not_found -> assert false in
-  name
-
-  (* returns <name, type> pairs *)
-let constructors_of_inductive_type uri i =
-  let types, _ = get_types uri in
-  let (_, _, _, constructors) = 
-    try List.nth types i with Not_found -> assert false
-  in
-  constructors
-
-  (* returns name only *)
-let constructor_of_inductive_type uri i j =
-  (try
-    fst (List.nth (constructors_of_inductive_type uri i) (j-1))
-  with Not_found -> assert false)
-
-  (* returns the number of left parameters *)
-let left_params_no_of_inductive_type uri =
-   snd (get_types uri)
 *)
 
+let idref register_ref =
+ let id = ref 0 in
+  fun ?reference t ->
+   incr id;
+   let id = "i" ^ string_of_int !id in
+    (match reference with None -> () | Some r -> register_ref id r);
+    Ast.AttributedTerm (`IdRef id, t)
+;;
+
 (* CODICE c&p da NCicPp *)
-let nast_of_cic ~subst ~context =
-  let rec k ctx = function
+let nast_of_cic0 status
+ ~(idref:
+    ?reference:NReference.reference -> CicNotationPt.term -> CicNotationPt.term)
+ ~output_type ~metasenv ~subst k ~context =
+  function
     | NCic.Rel n ->
        (try 
-         let name,_ = List.nth ctx (n-1) in
+         let name,_ = List.nth context (n-1) in
          let name = if name = "_" then "__"^string_of_int n else name in
-          Ast.Ident (name,None)
+          idref (Ast.Ident (name,None))
         with Failure "nth" | Invalid_argument "List.nth" -> 
-          Ast.Ident ("-" ^ string_of_int (n - List.length ctx),None))
-    | NCic.Const r -> Ast.Ident (NCicPp.r2s false r, None)
+         idref (Ast.Ident ("-" ^ string_of_int (n - List.length context),None)))
+    | NCic.Const r -> idref ~reference:r (Ast.Ident (NCicPp.r2s true r, None))
     | NCic.Meta (n,lc) when List.mem_assoc n subst -> 
         let _,_,t,_ = List.assoc n subst in
-         k ctx (NCicSubstitution.subst_meta lc t)
+         k ~context (NCicSubstitution.subst_meta lc t)
     | NCic.Meta (n,(s,l)) ->
        (* CSC: qua non dovremmo espandere *)
        let l = NCicUtils.expand_local_context l in
-        Ast.Meta
-         (n, List.map (fun x -> Some (k ctx (NCicSubstitution.lift s x))) l)
-    | NCic.Sort NCic.Prop -> Ast.Sort `Prop
-    | NCic.Sort NCic.Type _ -> Ast.Sort `Set
+        idref (Ast.Meta
+         (n, List.map (fun x -> Some (k ~context (NCicSubstitution.lift s x))) l))
+    | NCic.Sort NCic.Prop -> idref (Ast.Sort `Prop)
+    | NCic.Sort NCic.Type _ -> idref (Ast.Sort `Set)
     (* CSC: | C.Sort (C.Type []) -> F.fprintf f "Type0"
     | C.Sort (C.Type [false, u]) -> F.fprintf f "%s" (NUri.name_of_uri u)
     | C.Sort (C.Type [true, u]) -> F.fprintf f "S(%s)" (NUri.name_of_uri u)
@@ -103,59 +92,88 @@ let nast_of_cic ~subst ~context =
         (List.tl l);
        F.fprintf f ")"*)
     (* CSC: qua siamo grezzi *)
-    | NCic.Implicit `Hole -> Ast.UserInput
-    | NCic.Implicit _ -> Ast.Implicit
+    | NCic.Implicit `Hole -> idref (Ast.UserInput)
+    | NCic.Implicit `Vector -> idref (Ast.Implicit `Vector)
+    | NCic.Implicit _ -> idref (Ast.Implicit `JustOne)
     | NCic.Prod (n,s,t) ->
+        let n = if n.[0] = '_' then "_" else n in
         let binder_kind = `Forall in
-         Ast.Binder (binder_kind, (Ast.Ident (n,None), Some (k ctx s)),
-          k ((n,NCic.Decl s)::ctx) t)
+         idref (Ast.Binder (binder_kind, (Ast.Ident (n,None), Some (k ~context s)),
+          k ~context:((n,NCic.Decl s)::context) t))
     | NCic.Lambda (n,s,t) ->
-        Ast.Binder (`Lambda,(Ast.Ident (n,None), Some (k ctx s)),
-         k ((n,NCic.Decl s)::ctx) t)
+        idref (Ast.Binder (`Lambda,(Ast.Ident (n,None), Some (k ~context s)),
+         k ~context:((n,NCic.Decl s)::context) t))
+    | NCic.LetIn (n,s,ty,NCic.Rel 1) ->
+        idref (Ast.Cast (k ~context ty, k ~context s))
     | NCic.LetIn (n,s,ty,t) ->
-        Ast.LetIn ((Ast.Ident (n,None), Some (k ctx ty)), k ctx s,
-         k ((n,NCic.Decl s)::ctx) t)
+        idref (Ast.LetIn ((Ast.Ident (n,None), Some (k ~context s)), k ~context
+          ty, k ~context:((n,NCic.Decl s)::context) t))
     | NCic.Appl (NCic.Meta (n,lc) :: args) when List.mem_assoc n subst -> 
        let _,_,t,_ = List.assoc n subst in
        let hd = NCicSubstitution.subst_meta lc t in
-        k ctx
+        k ~context
          (NCicReduction.head_beta_reduce ~upto:(List.length args)
            (match hd with
            | NCic.Appl l -> NCic.Appl (l@args)
            | _ -> NCic.Appl (hd :: args)))
-    | NCic.Appl args -> Ast.Appl (List.map (k ctx) args)
-    | NCic.Match (uri,ty,te,patterns) ->
-(*
-        let name = NReference.name_of_reference uri in
+    | NCic.Appl args as t ->
+       let args =
+        if not !Acic2content.hide_coercions then args
+        else
+         match
+          NCicCoercion.match_coercion status ~metasenv ~context ~subst t
+         with
+          | None -> args
+          | Some (_,sats,cpos) -> 
+(* CSC: sats e' il numero di pi, ma non so cosa farmene! voglio il numero di
+   argomenti da saltare, come prima! *)
+             if cpos < List.length args - 1 then
+              List.nth args (cpos + 1) ::
+               try snd (HExtlib.split_nth (cpos+sats+2) args) with Failure _->[]
+             else
+              args
+       in
+        (match args with
+            [arg] -> idref (k ~context arg)
+          | _ -> idref (Ast.Appl (List.map (k ~context) args)))
+    | NCic.Match (NReference.Ref (uri,_) as r,outty,te,patterns) ->
+        let name = NUri.name_of_uri uri in
+(* CSC
         let uri_str = UriManager.string_of_uri uri in
         let puri_str = sprintf "%s#xpointer(1/%d)" uri_str (typeno+1) in
         let ctor_puri j =
           UriManager.uri_of_string
             (sprintf "%s#xpointer(1/%d/%d)" uri_str (typeno+1) j)
         in
-        let case_indty = name, Some (UriManager.uri_of_string puri_str) in
-        let constructors = constructors_of_inductive_type uri typeno in
-        let lpsno = left_params_no_of_inductive_type uri in
-	let rec eat_branch n ty pat =
+*)
+        let case_indty =
+         name, None(*CSC Some (UriManager.uri_of_string puri_str)*) in
+        let constructors, leftno =
+         let _,leftno,tys,_,n = NCicEnvironment.get_checked_indtys r in
+         let _,_,_,cl  = List.nth tys n in
+          cl,leftno
+        in
+	let rec eat_branch n ctx ty pat =
           match (ty, pat) with
-	  | NCic.Prod (_, _, t), _ when n > 0 -> eat_branch (pred n) t pat 
-          | NCic.Prod (_, _, t), NCic.ALambda (_, name, s, t') ->
-              let (cv, rhs) = eat_branch 0 t t' in
-              (CicNotationUtil.name_of_cic_name name, Some (k s)) :: cv, rhs
-          | _, _ -> [], k pat
+	  | NCic.Prod (name, s, t), _ when n > 0 ->
+             eat_branch (pred n) ctx t pat 
+          | NCic.Prod (_, _, t), NCic.Lambda (name, s, t') ->
+              let cv, rhs = eat_branch 0 ((name,NCic.Decl s)::ctx) t t' in
+              (Ast.Ident (name,None), Some (k ~context:ctx s)) :: cv, rhs
+          | _, _ -> [], k ~context:ctx pat
         in
         let j = ref 0 in
         let patterns =
           try
             List.map2
-              (fun (name, ty) pat ->
+              (fun (_, name, ty) pat ->
                 incr j;
                 let name,(capture_variables,rhs) =
                  match output_type with
-                    `Term -> name, eat_branch lpsno ty pat
-                  | `Pattern -> "_", ([], k pat)
+                    `Term -> name, eat_branch leftno context ty pat
+                  | `Pattern -> "_", ([], k ~context pat)
                 in
-                 Ast.Pattern (name, Some (ctor_puri !j), capture_variables), rhs
+                 Ast.Pattern (name, None(*CSC Some (ctor_puri !j)*), capture_variables), rhs
               ) constructors patterns
           with Invalid_argument _ -> assert false
         in
@@ -164,55 +182,21 @@ let nast_of_cic ~subst ~context =
             `Pattern -> None
           | `Term -> Some case_indty
         in
-        idref id (Ast.Case (k te, indty, Some (k ty), patterns))
-*) assert false
-  in
-   k context
+         idref (Ast.Case (k ~context te, indty, Some (k ~context outty), patterns))
 ;;
 
-let nmap_sequent ~subst (i,(n,context,ty):int * NCic.conjecture) =
- let module K = Content in
- let context',_ =
-  List.fold_right
-   (fun item (res,context) ->
-     match item with
-      | name,NCic.Decl t ->
-         Some
-          (* We should call build_decl_item, but we have not computed *)
-          (* the inner-types ==> we always produce a declaration      *)
-          (`Declaration
-            { K.dec_name = (Some name);
-              K.dec_id = "-1"; 
-              K.dec_inductive = false;
-              K.dec_aref = "-1";
-              K.dec_type = nast_of_cic ~subst ~context t
-            })::res,item::context
-      | name,NCic.Def (t,ty) ->
-         Some
-          (* We should call build_def_item, but we have not computed *)
-          (* the inner-types ==> we always produce a declaration     *)
-          (`Definition
-             { K.def_name = (Some name);
-               K.def_id = "-1"; 
-               K.def_aref = "-1";
-               K.def_term = nast_of_cic ~subst ~context t;
-               K.def_type = nast_of_cic ~subst ~context ty
-             })::res,item::context
-   ) context ([],[])
- in
-  "-1",i,context',nast_of_cic ~subst ~context ty
-;;
-
-(*
   (* persistent state *)
 
+(*
 let initial_level2_patterns32 () = Hashtbl.create 211
 let initial_interpretations () = Hashtbl.create 211
 
 let level2_patterns32 = ref (initial_level2_patterns32 ())
 (* symb -> id list ref *)
 let interpretations = ref (initial_interpretations ())
+*)
 let compiled32 = ref None
+(*
 let pattern32_matrix = ref []
 let counter = ref ~-1 
 
@@ -238,6 +222,7 @@ let pop () =
    compiled32 := ocompiled32;
    pattern32_matrix := opattern32_matrix
 ;;
+*)
 
 let get_compiled32 () =
   match !compiled32 with
@@ -249,7 +234,7 @@ let set_compiled32 f = compiled32 := Some f
 let add_idrefs =
   List.fold_right (fun idref t -> Ast.AttributedTerm (`IdRef idref, t))
 
-let instantiate32 term_info idrefs env symbol args =
+let instantiate32 idrefs env symbol args =
   let rec instantiate_arg = function
     | Ast.IdentArg (n, name) ->
         let t = 
@@ -279,42 +264,54 @@ let instantiate32 term_info idrefs env symbol args =
   if args = [] then head
   else Ast.Appl (head :: List.map instantiate_arg args)
 
-let rec ast_of_acic1 ~output_type term_info annterm = 
-  let id_to_uris = term_info.uri in
-  let register_uri id uri = Hashtbl.add id_to_uris id uri in
-  match (get_compiled32 ()) annterm with
+let rec nast_of_cic1 status ~idref ~output_type ~metasenv ~subst ~context term =
+  match (get_compiled32 ()) term with
   | None ->
-     ast_of_acic0 ~output_type term_info annterm (ast_of_acic1 ~output_type)
+     nast_of_cic0 status ~idref ~output_type ~metasenv ~subst
+      (nast_of_cic1 status ~idref ~output_type ~metasenv ~subst) ~context term 
   | Some (env, ctors, pid) -> 
       let idrefs =
-        List.map
-          (fun annterm ->
-            let idref = CicUtil.id_of_annterm annterm in
-            (try
-              register_uri idref
-                (CicUtil.uri_of_term (Deannotate.deannotate_term annterm))
-            with Invalid_argument _ -> ());
-            idref)
-          ctors
+       List.map
+        (fun term ->
+          let attrterm =
+           idref
+            ~reference:
+              (match term with NCic.Const nref -> nref | _ -> assert false)
+           (CicNotationPt.Ident ("dummy",None))
+          in
+           match attrterm with
+              Ast.AttributedTerm (`IdRef id, _) -> id
+            | _ -> assert false
+        ) ctors
       in
-      let env' =
+      let env =
        List.map
-        (fun (name, term) -> name, ast_of_acic1 ~output_type term_info term) env
+        (fun (name, term) ->
+          name,
+           nast_of_cic1 status ~idref ~output_type ~subst ~metasenv ~context
+            term
+        ) env
       in
       let _, symbol, args, _ =
         try
-          Hashtbl.find !level2_patterns32 pid
+          TermAcicContent.find_level2_patterns32 pid
         with Not_found -> assert false
       in
-      let ast = instantiate32 term_info idrefs env' symbol args in
-      Ast.AttributedTerm (`IdRef (CicUtil.id_of_annterm annterm), ast)
+      let ast = instantiate32 idrefs env symbol args in
+      idref ast (*Ast.AttributedTerm (`IdRef (idref term), ast)*)
+;;
 
 let load_patterns32 t =
-  let t =
-    HExtlib.filter_map (function (true, ap, id) -> Some (ap, id) | _ -> None) t
-  in
-  set_compiled32 (lazy (Acic2astMatcher.Matcher32.compiler t))
+ let t =
+  HExtlib.filter_map (function (true, ap, id) -> Some (ap, id) | _ -> None) t
+ in
+  set_compiled32 (lazy (Ncic2astMatcher.Matcher32.compiler t))
+in
+ TermAcicContent.add_load_patterns32 load_patterns32;
+ TermAcicContent.init ()
+;;
 
+(*
 let ast_of_acic ~output_type id_to_sort annterm =
   debug_print (lazy ("ast_of_acic <- "
     ^ CicPp.ppterm (Deannotate.deannotate_term annterm)));
@@ -412,3 +409,201 @@ let instantiate_appl_pattern
   in
   aux appl_pattern
 *)
+
+let nmap_sequent0 status ~idref ~metasenv ~subst (i,(n,context,ty)) =
+ let module K = Content in
+ let nast_of_cic =
+  nast_of_cic1 status ~idref ~output_type:`Term ~metasenv ~subst in
+ let context',_ =
+  List.fold_right
+   (fun item (res,context) ->
+     match item with
+      | name,NCic.Decl t ->
+         Some
+          (* We should call build_decl_item, but we have not computed *)
+          (* the inner-types ==> we always produce a declaration      *)
+          (`Declaration
+            { K.dec_name = (Some name);
+              K.dec_id = "-1"; 
+              K.dec_inductive = false;
+              K.dec_aref = "-1";
+              K.dec_type = nast_of_cic ~context t
+            })::res,item::context
+      | name,NCic.Def (t,ty) ->
+         Some
+          (* We should call build_def_item, but we have not computed *)
+          (* the inner-types ==> we always produce a declaration     *)
+          (`Definition
+             { K.def_name = (Some name);
+               K.def_id = "-1"; 
+               K.def_aref = "-1";
+               K.def_term = nast_of_cic ~context t;
+               K.def_type = nast_of_cic ~context ty
+             })::res,item::context
+   ) context ([],[])
+ in
+  ("-1",i,context',nast_of_cic ~context ty)
+;;
+
+let nmap_sequent status ~metasenv ~subst conjecture =
+ let module K = Content in
+ let ids_to_refs = Hashtbl.create 211 in
+ let register_ref = Hashtbl.add ids_to_refs in
+  nmap_sequent0 status ~idref:(idref register_ref) ~metasenv ~subst conjecture,
+  ids_to_refs
+;;
+
+let object_prefix = "obj:";;
+let declaration_prefix = "decl:";;
+let definition_prefix = "def:";;
+let inductive_prefix = "ind:";;
+let joint_prefix = "joint:";;
+
+let get_id =
+ function
+    Ast.AttributedTerm (`IdRef id, _) -> id
+  | _ -> assert false
+;;
+
+let gen_id prefix seed =
+ let res = prefix ^ string_of_int !seed in
+  incr seed ;
+  res
+;;
+
+let build_def_item seed context metasenv id n t ty =
+ let module K = Content in
+(*
+  try
+   let sort = Hashtbl.find ids_to_inner_sorts id in
+   if sort = `Prop then
+       (let p = 
+        (acic2content seed context metasenv ?name:(name_of n) ~ids_to_inner_sorts  ~ids_to_inner_types t)
+       in 
+        `Proof p;)
+   else 
+*)
+      `Definition
+        { K.def_name = Some n;
+          K.def_id = gen_id definition_prefix seed; 
+          K.def_aref = id;
+          K.def_term = t;
+          K.def_type = ty
+        }
+(*
+  with
+   Not_found -> assert false
+*)
+
+let build_decl_item seed id n s =
+ let module K = Content in
+(*
+ let sort =
+   try
+    Some (Hashtbl.find ids_to_inner_sorts (Cic2acic.source_id_of_id id))
+   with Not_found -> None
+ in
+ match sort with
+ | Some `Prop ->
+    `Hypothesis
+      { K.dec_name = name_of n;
+        K.dec_id = gen_id declaration_prefix seed; 
+        K.dec_inductive = false;
+        K.dec_aref = id;
+        K.dec_type = s
+      }
+ | _ ->
+*)
+    `Declaration
+      { K.dec_name = Some n;
+        K.dec_id = gen_id declaration_prefix seed; 
+        K.dec_inductive = false;
+        K.dec_aref = id;
+        K.dec_type = s
+      }
+;;
+
+let nmap_obj status (uri,_,metasenv,subst,kind) =
+  let module K = Content in
+  let ids_to_refs = Hashtbl.create 211 in
+  let register_ref = Hashtbl.add ids_to_refs in
+  let idref = idref register_ref in
+  let nast_of_cic =
+   nast_of_cic1 status ~idref ~output_type:`Term ~metasenv ~subst in
+  let seed = ref 0 in
+  let conjectures =
+   match metasenv with
+      [] -> None
+    | _ -> (*Some (List.map (map_conjectures seed) metasenv)*)
+      (*CSC: used to be the previous line, that uses seed *)
+      Some (List.map (nmap_sequent0 status ~idref ~metasenv ~subst) metasenv)
+  in
+let  build_constructors seed l =
+      List.map 
+       (fun (_,n,ty) ->
+           let ty = nast_of_cic ~context:[] ty in
+           { K.dec_name = Some n;
+             K.dec_id = gen_id declaration_prefix seed;
+             K.dec_inductive = false;
+             K.dec_aref = "";
+             K.dec_type = ty
+           }) l
+in
+let build_inductive b seed = 
+      fun (_,n,ty,cl) ->
+        let ty = nast_of_cic ~context:[] ty in
+        `Inductive
+          { K.inductive_id = gen_id inductive_prefix seed;
+            K.inductive_name = n;
+            K.inductive_kind = b;
+            K.inductive_type = ty;
+            K.inductive_constructors = build_constructors seed cl
+           }
+in
+let build_fixpoint b seed = 
+      fun (_,n,_,ty,t) ->
+        let t = nast_of_cic ~context:[] t in
+        let ty = nast_of_cic ~context:[] ty in
+        `Definition
+          { K.def_id = gen_id inductive_prefix seed;
+            K.def_name = Some n;
+            K.def_aref = "";
+            K.def_type = ty;
+            K.def_term = t;
+           }
+in
+  let res =
+   match kind with
+    | NCic.Fixpoint (is_rec, ifl, _) -> 
+         (gen_id object_prefix seed, [], conjectures,
+            `Joint
+              { K.joint_id = gen_id joint_prefix seed;
+                K.joint_kind = 
+                   if is_rec then 
+                        `Recursive (List.map (fun (_,_,i,_,_) -> i) ifl)
+                   else `CoRecursive;
+                K.joint_defs = List.map (build_fixpoint is_rec seed) ifl
+              }) 
+    | NCic.Inductive (is_ind, lno, itl, _) ->
+         (gen_id object_prefix seed, [], conjectures,
+            `Joint
+              { K.joint_id = gen_id joint_prefix seed;
+                K.joint_kind = 
+                   if is_ind then `Inductive lno else `CoInductive lno;
+                K.joint_defs = List.map (build_inductive is_ind seed) itl
+              }) 
+    | NCic.Constant (_,_,Some bo,ty,_) ->
+       let ty = nast_of_cic ~context:[] ty in
+       let bo = nast_of_cic ~context:[] bo in
+        (gen_id object_prefix seed, [], conjectures,
+          `Def (K.Const,ty,
+            build_def_item seed [] [] (get_id bo) (NUri.name_of_uri uri) bo ty))
+    | NCic.Constant (_,_,None,ty,_) ->
+       let ty = nast_of_cic ~context:[] ty in
+         (gen_id object_prefix seed, [], conjectures,
+           `Decl (K.Const,
+             (*CSC: ??? get_id ty here used to be the id of the axiom! *)
+             build_decl_item seed (get_id ty) (NUri.name_of_uri uri) ty))
+ in
+  res,ids_to_refs
+;;