*)
(* The default of term is the thesis of the goal to be prooved *)
-let reduction_tac ~also_in_hypotheses ~reduction ~terms (proof,goal) =
+let reduction_tac ~reduction ~pattern:(hyp_patterns,goal_pattern) (proof,goal) =
let curi,metasenv,pbo,pty = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
- let terms =
- match terms with None -> [ty] | Some l -> l
- in
(* We don't know if [term] is a subterm of [ty] or a subterm of *)
(* the type of one metavariable. So we replace it everywhere. *)
(*CSC: Il vero problema e' che non sapendo dove sia il term non *)
(*CSC: sappiamo neppure quale sia il suo contesto!!!! Insomma, *)
(*CSC: e' meglio prima cercare il termine e scoprirne il *)
(*CSC: contesto, poi ridurre e infine rimpiazzare. *)
- let replace lift context where=
- (*CSC: Per il momento se la riduzione fallisce significa solamente che *)
- (*CSC: siamo nel contesto errato. Metto il try, ma che schifo!!!! *)
- (*CSC: Anche perche' cosi' catturo anche quelle del replace che non dovrei*)
- try
- let terms = List.fold_left
- (fun acc t ->
- try
- (CicSubstitution.delift lift t) :: acc
- with Failure _ -> acc
- ) [] terms
- in
- let terms' = List.map (reduction context) terms in
- ProofEngineReduction.replace
- ~equality:(=) ~what:terms ~with_what:terms' ~where:where
- with
- _ -> where
- in
- let ty' = replace 0 context ty in
- let context', _ =
- if also_in_hypotheses then
- List.fold_right
- (fun entry (context,i) ->
- match entry with
- | Some (name,Cic.Def (t,None)) ->
- (Some (name,Cic.Def ((replace i context t),None)))::context, i-1
- | Some (name,Cic.Decl t) ->
- (Some (name,Cic.Decl (replace i context t)))::context, i-1
- | None -> None::context, i-1
- | Some (_,Cic.Def (_,Some _)) -> assert false
- ) context ([],(List.length context))
- else
- context, 0
- in
- let metasenv' =
- List.map
- (function
- (n,_,_) when n = metano -> (metano,context',ty')
- | _ as t -> t
- ) metasenv
+ let replace context where terms =
+ (*CSC: Per il momento se la riduzione fallisce significa solamente che *)
+ (*CSC: siamo nel contesto errato. Metto il try, ma che schifo!!!! *)
+ (*CSC: Anche perche' cosi' catturo anche quelle del replace che non dovrei *)
+ try
+ let terms, terms' =
+ List.split
+ (List.map
+ (fun i, t -> t, reduction (i @ context) t)
+ terms)
in
- (curi,metasenv',pbo,pty), [metano]
+ ProofEngineReduction.replace ~equality:(==) ~what:terms ~with_what:terms'
+ ~where:where
+ (* FIXME this is a catch ALL... bad thing *)
+ with exc -> (*prerr_endline (Printexc.to_string exc);*) where
+ in
+ let find_pattern_for name =
+ try Some (snd(List.find (fun (n, pat) -> Cic.Name n = name) hyp_patterns))
+ with Not_found -> None
+ in
+ let ty' =
+ match goal_pattern with
+ | None -> replace context ty [[],ty]
+ | Some pat ->
+ let terms = ProofEngineHelpers.select ~term:ty ~pattern:pat in
+ replace context ty terms
+ in
+ let context' =
+ if hyp_patterns <> [] then
+ List.fold_right
+ (fun entry context ->
+ match entry with
+ | Some (name,Cic.Decl term) ->
+ (match find_pattern_for name with
+ | None -> entry::context
+ | Some pat ->
+ let terms = ProofEngineHelpers.select ~term ~pattern:pat in
+ let where = replace context term terms in
+ let entry = Some (name,Cic.Decl where) in
+ entry::context)
+ | Some (name,Cic.Def (term, None)) ->
+ (match find_pattern_for name with
+ | None -> entry::context
+ | Some pat ->
+ let terms = ProofEngineHelpers.select ~term ~pattern:pat in
+ let where = replace context term terms in
+ let entry = Some (name,Cic.Def (where,None)) in
+ entry::context)
+ | _ -> entry::context
+ ) context []
+ else
+ context
+ in
+ let metasenv' =
+ List.map (function
+ | (n,_,_) when n = metano -> (metano,context',ty')
+ | _ as t -> t
+ ) metasenv
+ in
+ (curi,metasenv',pbo,pty), [metano]
;;
-let simpl_tac ~also_in_hypotheses ~terms =
- mk_tactic ( reduction_tac ~reduction:ProofEngineReduction.simpl
- ~also_in_hypotheses ~terms);;
+let simpl_tac ~pattern =
+ mk_tactic (reduction_tac ~reduction:ProofEngineReduction.simpl ~pattern);;
-let reduce_tac ~also_in_hypotheses ~terms =
- mk_tactic ( reduction_tac ~reduction:ProofEngineReduction.reduce
- ~also_in_hypotheses ~terms);;
+let reduce_tac ~pattern =
+ mk_tactic (reduction_tac ~reduction:ProofEngineReduction.reduce ~pattern);;
-let whd_tac ~also_in_hypotheses ~terms =
- mk_tactic ( reduction_tac ~reduction:CicReduction.whd
- ~also_in_hypotheses ~terms);;
+let whd_tac ~pattern =
+ mk_tactic (reduction_tac ~reduction:CicReduction.whd ~pattern);;
+
+let normalize_tac ~pattern =
+ mk_tactic (reduction_tac ~reduction:CicReduction.normalize ~pattern );;
-let fold_tac ~reduction ~also_in_hypotheses ~term =
- let fold_tac ~reduction ~also_in_hypotheses ~term (proof,goal) =
+let fold_tac ~reduction ~pattern ~term =
+(*
+ let fold_tac ~reduction ~pattern:(hyp_patterns,goal_pattern) ~term (proof,goal)
+ =
let curi,metasenv,pbo,pty = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
let term' = reduction context term in
- (* We don't know if [term] is a subterm of [ty] or a subterm of *)
- (* the type of one metavariable. So we replace it everywhere. *)
- (*CSC: ma si potrebbe ovviare al problema. Ma non credo *)
- (*CSC: che si guadagni nulla in fatto di efficienza. *)
let replace =
ProofEngineReduction.replace ~equality:(=) ~what:[term'] ~with_what:[term]
in
in
(curi,metasenv',pbo,pty), [metano]
in
- mk_tactic (fold_tac ~reduction ~also_in_hypotheses ~term)
+ mk_tactic (fold_tac ~reduction ~pattern ~term)
+*) assert false
;;
projects / helm.git / blobdiff