X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2Fcic2content.mli;h=16eb5333f721cdc0973b27199bd2c56ffa361440;hb=43f61eedd2a1f499166de33a98af00b767dcc117;hp=f3a38be5036a302ed98c129dfefd99987197f14d;hpb=4a01e6197e070d3eff7a3fe02180597136d81eba;p=helm.git

diff --git a/helm/ocaml/cic_transformations/cic2content.mli b/helm/ocaml/cic_transformations/cic2content.mli
index f3a38be50..16eb5333f 100644
--- a/helm/ocaml/cic_transformations/cic2content.mli
+++ b/helm/ocaml/cic_transformations/cic2content.mli
@@ -23,134 +23,8 @@
  * http://cs.unibo.it/helm/.
  *)
 
-type id = string;;
-type joint_recursion_kind =
- [ `Recursive
- | `CoRecursive
- | `Inductive of int    (* paramsno *)
- | `CoInductive of int  (* paramsno *)
- ]
-;;
-
-type var_or_const = Var | Const;;
-
-type 'term declaration =
-       { dec_name : string option;
-         dec_id : string ;
-         dec_inductive : bool;
-         dec_aref : string;
-         dec_type : 'term 
-       }
-;;
-
-type 'term definition =
-       { def_name : string option;
-         def_id : string ;
-         def_aref : string ;
-         def_term : 'term 
-       }
-;;
-
-type 'term inductive =
-       { inductive_id : string ;
-         inductive_kind : bool;
-         inductive_type : 'term;
-         inductive_constructors : 'term declaration list
-       }
-;;
-
-type 'term decl_context_element = 
-       [ `Declaration of 'term declaration
-       | `Hypothesis of 'term declaration
-       ]
-;;
-
-type ('term,'proof) def_context_element = 
-       [ `Proof of 'proof
-       | `Definition of 'term definition
-       ]
-;;
-
-type ('term,'proof) in_joint_context_element =
-       [ `Inductive of 'term inductive
-       | 'term decl_context_element
-       | ('term,'proof) def_context_element
-       ]
-;;
-
-type ('term,'proof) joint =
-       { joint_id : string ;
-         joint_kind : joint_recursion_kind ;
-         joint_defs : ('term,'proof) in_joint_context_element list
-       }
-;;
-
-type ('term,'proof) joint_context_element = 
-       [ `Joint of ('term,'proof) joint ]
-;;
-
-type 'term proof = 
-      { proof_name : string option;
-        proof_id   : string ;
-        proof_context : 'term in_proof_context_element list ;
-        proof_apply_context: 'term proof list;
-        proof_conclude : 'term conclude_item
-      }
-
-and 'term in_proof_context_element =
-       [ 'term decl_context_element
-       | ('term,'term proof) def_context_element
-       | ('term,'term proof) joint_context_element
-       ]
-
-and 'term conclude_item =
-       { conclude_id :string; 
-         conclude_aref : string;
-         conclude_method : string;
-         conclude_args : ('term arg) list ;
-         conclude_conclusion : 'term option 
-       }
-
-and 'term arg =
-         Aux of int
-       | Premise of premise
-       | Term of 'term
-       | ArgProof of 'term proof
-       | ArgMethod of string (* ???? *)
-
-and premise =
-       { premise_id: string;
-         premise_xref : string ;
-         premise_binder : string option;
-         premise_n : int option;
-       }
-;;
- 
-type 'term conjecture = id * int * 'term context * 'term
-
-and 'term context = 'term hypothesis list
-
-and 'term hypothesis =
- id *
- ['term decl_context_element | ('term,'term proof) def_context_element ] option
-;;
-
-type 'term in_object_context_element =
-       [ `Decl of var_or_const * 'term decl_context_element
-       | `Def of var_or_const * 'term * ('term,'term proof) def_context_element
-       | ('term,'term proof) joint_context_element
-       ]
-;;
-
-type 'term cobj  = 
-        id *                            (* id *)
-        UriManager.uri list *           (* params *)
-        'term conjecture list option *  (* optional metasenv *) 
-        'term in_object_context_element (* actual object *)
-;;
-
 val annobj2content :
   ids_to_inner_sorts:(string, string) Hashtbl.t ->
   ids_to_inner_types:(string, Cic2acic.anntypes) Hashtbl.t ->
   Cic.annobj ->
-  Cic.annterm cobj
+  Cic.annterm Content.cobj