* http://cs.unibo.it/helm/.
*)
-exception Bad_pattern of string
+exception Bad_pattern of string Lazy.t
let new_meta_of_proof ~proof:(_, metasenv, _, _) =
CicMkImplicit.new_meta metasenv []
List.map
(function
Some (n,Cic.Decl s) -> Some (n,Cic.Decl (subst_in s))
- | Some (n,Cic.Def (s,None)) -> Some (n,Cic.Def ((subst_in s),None))
+ | Some (n,Cic.Def (s,None)) -> Some (n,Cic.Def (subst_in s,None))
| None -> None
- | Some (_,Cic.Def (_,Some _)) -> assert false
+ | Some (n,Cic.Def (bo,Some ty)) ->
+ Some (n,Cic.Def (subst_in bo,Some (subst_in ty)))
) canonical_context
in
i,canonical_context',(subst_in ty)
None -> None
| Some (i,Cic.Decl t) -> Some (i,Cic.Decl (subst_in t))
| Some (i,Cic.Def (t,None)) ->
- Some (i,Cic.Def ((subst_in t),None))
- | Some (_,Cic.Def (_,Some _)) -> assert false
+ Some (i,Cic.Def (subst_in t,None))
+ | Some (i,Cic.Def (bo,Some ty)) ->
+ Some (i,Cic.Def (subst_in bo,Some (subst_in ty)))
) canonical_context
in
(m,canonical_context',subst_in ty)::i
try
List.map2 f l1 l2
with
- | Invalid_argument _ -> raise (Bad_pattern error_msg)
+ | Invalid_argument _ -> raise (Bad_pattern (lazy error_msg))
in
let rec aux context where term =
match (where, term) with
funs1 funs2)
| x,y ->
raise (Bad_pattern
- (Printf.sprintf "Pattern %s versus term %s"
+ (lazy (Printf.sprintf "Pattern %s versus term %s"
(CicPp.ppterm x)
- (CicPp.ppterm y)))
+ (CicPp.ppterm y))))
and auxs context terms1 terms2 = (* as aux for list of terms *)
List.concat (map2 "wrong number of arguments in application"
(fun t1 t2 -> aux context t1 t2) terms1 terms2)
in
snd (aux term)
-exception Fail of string
+exception Fail of string Lazy.t
(** select metasenv conjecture pattern
* select all subterms of [conjecture] matching [pattern].
in
res @ locate_in_term what ~where:ty context
-(* saturate_term newmeta metasenv context ty *)
-(* Given a type [ty] (a backbone), it returns its head and a new metasenv in *)
-(* which there is new a META for each hypothesis, a list of arguments for the *)
-(* new applications and the index of the last new META introduced. The nth *)
-(* argument in the list of arguments is just the nth new META. *)
-let saturate_term newmeta metasenv context ty =
+(* saturate_term newmeta metasenv context ty goal_arity *)
+(* Given a type [ty] (a backbone), it returns its suffix of length *)
+(* [goal_arity] head and a new metasenv in which there is new a META for each *)
+(* hypothesis, a list of arguments for the new applications and the index of *)
+(* the last new META introduced. The nth argument in the list of arguments is *)
+(* just the nth new META. *)
+let saturate_term newmeta metasenv context ty goal_arity =
let module C = Cic in
let module S = CicSubstitution in
+ assert (goal_arity >= 0);
let rec aux newmeta ty =
- let ty' = ty in
- match ty' with
+ match ty with
C.Cast (he,_) -> aux newmeta he
(* CSC: patch to generate ?1 : ?2 : Type in place of ?1 : Type to simulate ?1 :< Type
(* If the expected type is a Type, then also Set is OK ==>
CicMkImplicit.identity_relocation_list_for_metavariable context
in
let newargument = C.Meta (newmeta,irl) in
- let (res,newmetasenv,arguments,lastmeta) =
+ let res,newmetasenv,arguments,lastmeta,prod_no =
aux (newmeta + 1) (S.subst newargument t)
in
- let s' = CicReduction.normalize ~delta:false context s in
- res,(newmeta,context,s')::newmetasenv,newargument::arguments,lastmeta
- (** NORMALIZE RATIONALE
- * we normalize the target only NOW since we may be in this case:
- * A1 -> A2 -> T where T = (\lambda x.A3 -> P) k
- * and we want a mesasenv with ?1:A1 and ?2:A2 and not
- * ?1, ?2, ?3 (that is the one we whould get if we start from the
- * beta-normalized A1 -> A2 -> A3 -> P **)
- | t -> (CicReduction.normalize ~delta:false context t),[],[],newmeta
+ if prod_no + 1 = goal_arity then
+ let head = CicReduction.normalize ~delta:false context ty in
+ head,[],[],lastmeta,goal_arity + 1
+ else
+ (** NORMALIZE RATIONALE
+ * we normalize the target only NOW since we may be in this case:
+ * A1 -> A2 -> T where T = (\lambda x.A3 -> P) k
+ * and we want a mesasenv with ?1:A1 and ?2:A2 and not
+ * ?1, ?2, ?3 (that is the one we whould get if we start from the
+ * beta-normalized A1 -> A2 -> A3 -> P **)
+ let s' = CicReduction.normalize ~delta:false context s in
+ res,(newmeta,context,s')::newmetasenv,newargument::arguments,
+ lastmeta,prod_no + 1
+ | t ->
+ let head = CicReduction.normalize ~delta:false context t in
+ match CicReduction.whd context head with
+ C.Prod _ as head' -> aux newmeta head'
+ | _ -> head,[],[],newmeta,0
in
(* WARNING: here we are using the invariant that above the most *)
(* recente new_meta() there are no used metas. *)
- let (res,newmetasenv,arguments,lastmeta) = aux newmeta ty in
+ let res,newmetasenv,arguments,lastmeta,_ = aux newmeta ty in
res,metasenv @ newmetasenv,arguments,lastmeta
let lookup_type metasenv context hyp =
| Some (Cic.Name name, Cic.Def (u, _)) :: tail when name = hyp ->
p, fst (CicTypeChecker.type_of_aux' metasenv tail u CicUniv.empty_ugraph)
| _ :: tail -> aux (succ p) tail
- | [] -> raise (ProofEngineTypes.Fail "lookup_type: not premise in the current goal")
+ | [] -> raise (ProofEngineTypes.Fail (lazy "lookup_type: not premise in the current goal"))
in
aux 1 context
projects / helm.git / blobdiff