X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Ftactics%2FproofEngineTypes.ml;h=eb48ff3e8d86902f8e114ab73f0b2d3af959e39f;hb=e55c40ddebaa3664f294a8dd8df162e8c1fa5020;hp=4eb043ca8aad49ad63754c8abf2c4e17f14bbc9b;hpb=9393a9f9370014c904244358abe4ec6e11a9d158;p=helm.git diff --git a/components/tactics/proofEngineTypes.ml b/components/tactics/proofEngineTypes.ml index 4eb043ca8..eb48ff3e8 100644 --- a/components/tactics/proofEngineTypes.ml +++ b/components/tactics/proofEngineTypes.ml @@ -28,12 +28,12 @@ (** current proof (proof uri * metas * (in)complete proof * term to be prooved) *) -type proof = UriManager.uri option * Cic.metasenv * Cic.term * Cic.term +type proof = UriManager.uri option * Cic.metasenv * Cic.term * Cic.term * Cic.attribute list (** current goal, integer index *) type goal = int type status = proof * goal -let initial_status ty metasenv = +let initial_status ty metasenv attrs = let rec aux max = function | [] -> max + 1 | (idx, _, _) :: tl -> @@ -44,7 +44,7 @@ let initial_status ty metasenv = in let newmeta_idx = aux 0 metasenv in let proof = - None, (newmeta_idx, [], ty) :: metasenv, Cic.Meta (newmeta_idx, []), ty + None, (newmeta_idx, [], ty) :: metasenv, Cic.Meta (newmeta_idx, []), ty, attrs in (proof, newmeta_idx) @@ -79,7 +79,7 @@ let conclusion_pattern t = let t' = match t with | None -> None - | Some t -> Some (fun _ m u -> t, m, u) + | Some t -> Some (const_lazy_term t) in t',[],Some (Cic.Implicit (Some `Hole)) @@ -90,13 +90,13 @@ exception Fail of string Lazy.t calls the opaque tactic on the status *) let apply_tactic t status = - let (uri,metasenv,bo,ty), gl = t status in + let (uri,metasenv,bo,ty, attrs), gl = t status in match CicRefine.pack_coercion_obj - (Cic.CurrentProof ("",metasenv,bo,ty,[],[])) + (Cic.CurrentProof ("",metasenv,Cic.Rel ~-1,ty,[],attrs)) with - | Cic.CurrentProof (_,metasenv,bo,ty,_,_) -> - (uri,metasenv,bo,ty), gl + | Cic.CurrentProof (_,metasenv,_,ty,_, attrs) -> + (uri,metasenv,bo,ty, attrs), gl | _ -> assert false ;; @@ -104,5 +104,5 @@ let apply_tactic t status = type mk_fresh_name_type = Cic.metasenv -> Cic.context -> Cic.name -> typ:Cic.term -> Cic.name -let goals_of_proof (_,metasenv,_,_) = List.map (fun (g,_,_) -> g) metasenv +let goals_of_proof (_,metasenv,_,_,_) = List.map (fun (g,_,_) -> g) metasenv