NotationPt.Ident (id,`Ambiguous)
;;
+let mk_sym s = NotationPt.Symbol (s,None);;
+
let rec mk_prods l t =
match l with
[] -> t
status#set_obj(u,h,NCicUntrusted.apply_subst_metasenv status subst metasenv,subst,o)
;;
+(* needed to workaround a weakness of the refiner? *)
+let rec generalize0_tac tl s =
+ match tl with
+ | [] -> s
+ | t0::tl0 -> NTactics.generalize0_tac [t0] (generalize0_tac tl0 s)
+;;
+
+
(* input: nome della variabile riscritta
* output: lista dei nomi delle variabili il cui tipo dipende dall'input *)
let cascade_select_in_ctx status ~subst ctx skip iname =
List.length (arg_list nleft t_k) ;;
let default_pattern = "",0,(None,[],Some NotationPt.UserInput);;
+let prod_pattern =
+ "",0,(None,[],Some NotationPt.Binder
+ (`Pi, (mk_id "_",Some (NotationPt.Appl
+ [ NotationPt.Implicit `JustOne
+ ; NotationPt.Implicit `JustOne
+ ; NotationPt.UserInput
+ ; NotationPt.Implicit `JustOne ])),
+ NotationPt.Implicit `JustOne));;
+
+let prod_pattern_jm =
+ "",0,(None,[],Some NotationPt.Binder
+ (`Pi, (mk_id "_",Some (NotationPt.Appl
+ [ NotationPt.Implicit `JustOne
+ ; NotationPt.Implicit `JustOne
+ ; NotationPt.UserInput
+ ; NotationPt.Implicit `JustOne
+ ; NotationPt.Implicit `JustOne ])),
+ NotationPt.Implicit `JustOne));;
+
+let hp_pattern n =
+ "",0,(None,[n, NotationPt.Appl
+ [ NotationPt.Implicit `JustOne
+ ; NotationPt.Implicit `JustOne
+ ; NotationPt.UserInput
+ ; NotationPt.Implicit `JustOne ] ],
+ None);;
+
+let hp_pattern_jm n =
+ "",0,(None,[n, NotationPt.Appl
+ [ NotationPt.Implicit `JustOne
+ ; NotationPt.Implicit `JustOne
+ ; NotationPt.UserInput
+ ; NotationPt.Implicit `JustOne
+ ; NotationPt.Implicit `JustOne ] ],
+ None);;
+
+exception ConstructorTooBig of string;;
(* returns the discrimination = injection+contradiction principle *)
-let mk_discriminator it ~use_jmeq nleft xyty status =
- let _,indname,_,cl = it in
+let mk_discriminator ~use_jmeq name it leftno status baseuri =
+ let itnargs =
+ let _,_,arity,_ = it in
+ List.length (arg_list 0 arity) in
+ let _,itname,_,_ = it in
+ let params = List.map (fun x -> "a" ^ string_of_int x) (HExtlib.list_seq 1 (itnargs+1)) in
+ let xyty = mk_appl (List.map mk_id (itname::params)) in
+
+ (* PHASE 1: derive the type of the discriminator (we'll name it "principle") *)
let mk_eq tys ts us es n =
List.nth us n]
in
+
+ let _,_,_,cl = it in
- let kname it j =
- let _,_,_,cl = it in
+ let kname (*it*) j =
let _,name,_ = List.nth cl j in
name
in
let branch i j ts us =
- let nargs = nargs it nleft i in
+ let nargs = nargs it leftno i in
let es = List.map (fun x -> mk_id ("e" ^ string_of_int x)) (HExtlib.list_seq 0 nargs) in
let tys = List.map
(fun x -> iter
NotationPt.Binder (`Lambda, (mk_id ("p" ^ string_of_int i), None),
acc))) (nargs-1)
(mk_appl [mk_id "eq"; NotationPt.Implicit `JustOne;
- mk_appl (mk_id (kname it i)::
+ mk_appl (mk_id (kname i)::
List.map (fun x -> mk_id ("x" ^string_of_int x))
(HExtlib.list_seq 0 (List.length ts)));
- mk_appl (mk_id (kname it j)::us)])]
+ mk_appl (mk_id (kname j)::us)])]
in
(** NotationPt.Binder (`Lambda, (mk_id "e",
Some (mk_appl
None,
List.map
(fun j ->
- let nargs_kty = nargs it nleft j in
+ let nargs_kty = nargs it leftno j in
let us = iter (fun m acc -> mk_id ("u" ^ (string_of_int m))::acc)
(nargs_kty - 1) [] in
let nones =
iter (fun _ acc -> None::acc) (nargs_kty - 1) [] in
- NotationPt.Pattern (kname it j,
+ NotationPt.Pattern (kname j,
None,
List.combine us nones),
branch i j ts us)
None ,
List.map
(fun i ->
- let nargs_kty = nargs it nleft i in
+ let nargs_kty = nargs it leftno i in
+ if (nargs_kty > 5 && not use_jmeq) then raise (ConstructorTooBig (kname i));
let ts = iter (fun m acc -> mk_id ("t" ^ (string_of_int m))::acc)
(nargs_kty - 1) [] in
let nones =
iter (fun _ acc -> None::acc) (nargs_kty - 1) [] in
- NotationPt.Pattern (kname it i,
+ NotationPt.Pattern (kname i,
None,
List.combine ts nones),
inner i ts)
(HExtlib.list_seq 0 (List.length cl))) in
- let principle = NotationPt.Binder (`Lambda, (mk_id "x", Some xyty),
- NotationPt.Binder (`Lambda, (mk_id "y", Some xyty), outer))
+ let principle =
+ mk_prods params (NotationPt.Binder (`Forall, (mk_id "x",
+ Some xyty),
+ NotationPt.Binder (`Forall, (mk_id "y", Some xyty),
+ (if use_jmeq then
+ NotationPt.Binder (`Forall, (mk_id "e",
+ Some (mk_appl
+ [mk_sym "jmsimeq"; NotationPt.Implicit `JustOne; mk_id "x";
+ NotationPt.Implicit `JustOne; mk_id "y"])),
+ outer)
+ else
+ NotationPt.Binder (`Forall, (mk_id "e",
+ Some (mk_appl [mk_sym "eq";NotationPt.Implicit `JustOne; mk_id "x"; mk_id "y"])),
+ outer)))))
in
pp (lazy ("discriminator = " ^ (NotationPp.pp_term status principle)));
-
- status, principle
-;;
-
-let hd_of_term = function
- | NCic.Appl (hd::_) -> hd
- | t -> t
-;;
-
-let name_of_rel ~context rel =
- let s, _ = List.nth context (rel-1) in s
-;;
-
-(* let lookup_in_ctx ~context n =
- List.nth context ((List.length context) - n - 1)
-;;*)
-
-let discriminate_tac ~context cur_eq status =
- pp (lazy (Printf.sprintf "discriminate: equation %s" (name_of_rel ~context cur_eq)));
+ (* PHASE 2: create the object for the proof of the principle: we'll name it
+ * "theorem" *)
+ let status, theorem =
+ GrafiteDisambiguate.disambiguate_nobj status ~baseuri
+ (baseuri ^ name ^ ".def",0,
+ NotationPt.Theorem
+ (`Theorem,name,principle,
+ Some (NotationPt.Implicit (`Tagged "inv")),`DiscriminationPrinciple))
+ in
+ let uri,height,nmenv,nsubst,nobj = theorem in
+ let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in
+ let status = status#set_obj theorem in
+ let status = status#set_stack ninitial_stack in
+ let status = subst_metasenv_and_fix_names status in
+
+ (* PHASE 3: we finally prove the discrimination principle *)
let dbranch it ~use_jmeq leftno consno =
- let refl_id = mk_id (if use_jmeq then "refl_jmeq" else "refl") in
+ let refl_id = mk_sym "refl" in
pp (lazy (Printf.sprintf "dbranch %d %d" leftno consno));
let nlist = HExtlib.list_seq 0 (nargs it leftno consno) in
(* (\forall ...\forall P.\forall DH : ( ... = ... -> P). P) *)
let params = List.map (fun x -> NTactics.intro_tac ("a" ^ string_of_int x)) nlist in
- NTactics.reduce_tac ~reduction:(`Normalize true) ~where:default_pattern::
+ (* NTactics.reduce_tac ~reduction:(`Normalize true)
+ * ~where:default_pattern::*)
params @ [
NTactics.intro_tac "P";
NTactics.intro_tac "DH";
] in
let dbranches it ~use_jmeq leftno =
pp (lazy (Printf.sprintf "dbranches %d" leftno));
- let _,_,_,cl = it in
let nbranches = List.length cl in
let branches = iter (fun n acc ->
let m = nbranches - n - 1 in
NTactics.branch_tac ~force:false:: branches @ [NTactics.merge_tac]
else branches
in
+ let print_tac s status = pp s ; status in
+
+ let status =
+ NTactics.block_tac (
+ [print_tac (lazy "ci sono") (*;
+ NTactics.reduce_tac ~reduction:(`Normalize true) ~where:default_pattern *)
+ ]
+ @ List.map (fun x -> NTactics.intro_tac x) params @
+ [NTactics.intro_tac "x";
+ NTactics.intro_tac "y";
+ NTactics.intro_tac "Deq";
+ print_tac (lazy "ci sono 2");
+ NTactics.rewrite_tac ~dir:`RightToLeft ~what:("",0,mk_id "Deq") ~where:default_pattern;
+ NTactics.cases_tac ~what:("",0,mk_id "x") ~where:default_pattern]
+ @ dbranches it ~use_jmeq leftno) status
+ in status, status#obj
+;;
+
+let hd_of_term status t =
+ match (snd (term_of_cic_term status
+ (snd (whd status (ctx_of t) t)) (ctx_of t))) with
+ | NCic.Appl (hd::_) -> hd
+ | t -> t
+;;
+
+let name_of_rel ~context rel =
+ let s, _ = List.nth context (rel-1) in s
+;;
+
+(* let lookup_in_ctx ~context n =
+ List.nth context ((List.length context) - n - 1)
+;;*)
+
+let discriminate_tac ~context cur_eq status =
+ pp (lazy (Printf.sprintf "discriminate: equation %s" (name_of_rel ~context cur_eq)));
+
let eq_name,(NCic.Decl s | NCic.Def (s,_)) = List.nth context (cur_eq-1) in
let _,ctx' = HExtlib.split_nth cur_eq context in
let status, s = NTacStatus.whd status ctx' (mk_cic_term ctx' s) in
let status, s = term_of_cic_term status s ctx' in
- let status, leftno, it, use_jmeq =
- let it, t1, t2, use_jmeq = match s with
- | NCic.Appl [_;it;t1;t2] -> it,t1,t2,false
- | NCic.Appl [_;it;t1;_;t2] -> it,t1,t2,true
+ let status,it,use_jmeq =
+ let it, use_jmeq = match s with
+ | NCic.Appl [_;it;_;_] -> it,false
+ | NCic.Appl [_;it;_;_;_] -> it,true
| _ -> assert false in
(* XXX: serve? ho già fatto whd *)
let status, it = whd status ctx' (mk_cic_term ctx' it) in
uri, indtyno, NCicEnvironment.get_checked_indtys status r
| _ -> pp (lazy ("discriminate: indty =" ^ status#ppterm
~metasenv:[] ~subst:[] ~context:[] it)) ; assert false in
- let _,leftno,its,_,_ = its in
- status, leftno, List.nth its indtyno, use_jmeq
+ let _,_,its,_,_ = its in
+ status,List.nth its indtyno, use_jmeq
in
let itnargs =
List.length (arg_list 0 arity) in
let _,itname,_,_ = it in
let params = List.map (fun x -> "a" ^ string_of_int x) (HExtlib.list_seq 1 (itnargs+1)) in
- let xyty = mk_appl (List.map mk_id (itname::params)) in
- let print_tac s status = pp s ; status in
- NTactics.block_tac (
- [(fun status ->
- let status, discr = mk_discriminator it ~use_jmeq leftno xyty status in
- let cut_term = mk_prods params (NotationPt.Binder (`Forall, (mk_id "x",
- Some xyty),
- NotationPt.Binder (`Forall, (mk_id "y", Some xyty),
- NotationPt.Binder (`Forall, (mk_id "e",
- Some (mk_appl [mk_id "eq";NotationPt.Implicit `JustOne; mk_id "x"; mk_id "y"])),
- mk_appl [discr; mk_id "x"; mk_id "y"(*;mk_id "e"*)])))) in
- let status = print_tac (lazy ("cut_term = "^ NotationPp.pp_term status cut_term)) status in
- NTactics.cut_tac ("",0, cut_term)
- status);
- NTactics.branch_tac;
- print_tac (lazy "ci sono");
- NTactics.reduce_tac ~reduction:(`Normalize true) ~where:default_pattern]
- @ List.map (fun x -> NTactics.intro_tac x) params @
- [NTactics.intro_tac "x";
- NTactics.intro_tac "y";
- NTactics.intro_tac "Deq";
- print_tac (lazy "ci sono 2");
- NTactics.rewrite_tac ~dir:`RightToLeft ~what:("",0,mk_id "Deq") ~where:default_pattern;
- NTactics.cases_tac ~what:("",0,mk_id "x") ~where:default_pattern]
- @ dbranches it ~use_jmeq leftno @
- [NTactics.shift_tac;
- print_tac (lazy "ci sono 3");
- NTactics.intro_tac "#discriminate";
- NTactics.apply_tac ("",0,mk_appl ([mk_id "#discriminate"]@
+ let principle_name =
+ if use_jmeq then itname ^ "_jmdiscr"
+ else itname ^ "_discr"
+ in
+ pp (lazy ("apply (" ^ principle_name ^ " " ^
+ (String.concat "" (HExtlib.mk_list "?" (List.length params + 2))) ^
+ " " ^ eq_name ^ ")"));
+ NTactics.apply_tac ("",0,mk_appl ([mk_id principle_name]@
HExtlib.mk_list (NotationPt.Implicit `JustOne) (List.length params + 2) @
- [mk_id eq_name ]));
- NTactics.reduce_tac ~reduction:(`Normalize true) ~where:default_pattern;
- NTactics.clear_tac ["#discriminate"];
- NTactics.merge_tac; print_tac (lazy "the end of discriminate")]
- ) status
+ [mk_id eq_name ])) status
;;
let saturate_skip status context skip =
| NCic.Rel var ->
cascade_select_in_ctx status ~subst:(get_subst status) context skip (var+cur_eq)
| _ -> cascade_select_in_ctx status ~subst:(get_subst status) context skip cur_eq in
+ let varname = match var with
+ | NCic.Rel var ->
+ let name,_ = List.nth context (var+cur_eq-1) in
+ HLog.warn (Printf.sprintf "destruct: trying to remove variable: %s" name);
+ [name]
+ | _ -> []
+ in
let names_to_gen = List.filter (fun n -> n <> eq_name) names_to_gen in
if (List.exists (fun x -> List.mem x skip) names_to_gen)
then oldstatus
else
- let gen_tac x =
- NTactics.generalize_tac
- ~where:("",0,(Some (mk_id x),[], Some NotationPt.UserInput)) in
- NTactics.block_tac ((List.map gen_tac names_to_gen)@
- [NTactics.clear_tac names_to_gen;
+ let gen_tac x =
+ (fun s ->
+ let x' = String.concat " " x in
+ let x = List.map mk_id x in
+ (* let s = NTactics.print_tac false ("@generalize " ^ x') s in *)
+ generalize0_tac x s) in
+ NTactics.block_tac (
+ (* (List.map gen_tac names_to_gen)@ *)
+ [gen_tac (List.rev names_to_gen);
+ NTactics.clear_tac names_to_gen;
NTactics.rewrite_tac ~dir
~what:("",0,mk_id eq_name) ~where:default_pattern;
- NTactics.reduce_tac ~reduction:(`Normalize true)
- ~where:default_pattern;
- NTactics.try_tac (NTactics.clear_tac [eq_name])]@
+(* NTactics.reduce_tac ~reduction:(`Normalize true)
+ ~where:default_pattern;*)
+ (* XXX: temo che la clear multipla funzioni bene soltanto se
+ * gli identificatori sono nell'ordine giusto.
+ * Per non saper né leggere né scrivere, usiamo due clear
+ * invece di una *)
+ NTactics.try_tac (NTactics.clear_tac [eq_name]);
+ NTactics.try_tac (NTactics.clear_tac varname);
+]@
(List.map NTactics.intro_tac (List.rev names_to_gen))) status
;;
let status, s = NTacStatus.whd status ctx' (mk_cic_term ctx' s) in
let status, s = term_of_cic_term status s ctx' in
let skip = saturate_skip status context skip in
- (*
- let streicher_id =
- match s with
- | NCic.Appl [_;_;_;_] -> mk_id "streicherK"
- | NCic.Appl [_;_;_;_;_] -> mk_id "streicherKjmeq"
- | _ -> assert false
- in
- pp (lazy (Printf.sprintf "clearid: equation %s" eq_name));
- let names_to_gen, _ =
- cascade_select_in_ctx ~subst:(get_subst status) context cur_eq in
- let names_to_gen = names_to_gen @ [eq_name] in
- let gen_tac x =
- NTactics.generalize_tac
- ~where:("",0,(Some (mk_id x),[], Some NotationPt.UserInput)) in
- NTactics.block_tac ((List.map gen_tac names_to_gen)@
- [NTactics.clear_tac names_to_gen;
- NTactics.apply_tac ("",0, mk_appl [streicher_id;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne]);
- NTactics.reduce_tac ~reduction:(`Normalize true)
- ~where:default_pattern] @
- (let names_to_intro =
- match List.rev names_to_gen with
- | [] -> []
- | _::tl -> tl in
- List.map NTactics.intro_tac names_to_intro)) status
-*)
pp (lazy (Printf.sprintf "clearid: equation %s" eq_name));
- match s with
- | NCic.Appl [_;_;_;_] ->
- (* leibniz *)
- let streicher_id = mk_id "streicherK"
- in
- let names_to_gen, _ =
- cascade_select_in_ctx status ~subst:(get_subst status) context skip cur_eq in
- let names_to_gen = names_to_gen @ [eq_name] in
- let gen_tac x =
- NTactics.generalize_tac
- ~where:("",0,(Some (mk_id x),[], Some NotationPt.UserInput)) in
- NTactics.block_tac ((List.map gen_tac names_to_gen)@
- [NTactics.clear_tac names_to_gen;
- NTactics.apply_tac ("",0, mk_appl [streicher_id;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne]);
- NTactics.reduce_tac ~reduction:(`Normalize true)
- ~where:default_pattern] @
- (let names_to_intro =
- match List.rev names_to_gen with
- | [] -> []
- | _::tl -> tl in
- List.map NTactics.intro_tac names_to_intro)) status
- | NCic.Appl [_;_;_;_;_] ->
- (* JMeq *)
- let streicher_id = mk_id "streicherK"
- in
- let names_to_gen, _ =
- cascade_select_in_ctx status ~subst:(get_subst status) context skip cur_eq in
- let names_to_gen = names_to_gen (* @ [eq_name]*) in
- let gen_tac x =
- NTactics.generalize_tac
- ~where:("",0,(Some (mk_id x),[], Some NotationPt.UserInput)) in
- let gen_eq = NTactics.generalize_tac
- ~where:("",0,(Some (mk_appl [mk_id "jmeq_to_eq";
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- mk_id eq_name]),[], Some NotationPt.UserInput)) in
- NTactics.block_tac ((List.map gen_tac names_to_gen)@gen_eq::
- [NTactics.clear_tac names_to_gen;
- NTactics.try_tac (NTactics.clear_tac [eq_name]);
- NTactics.apply_tac ("",0, mk_appl [streicher_id;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne;
- NotationPt.Implicit `JustOne]);
- NTactics.reduce_tac ~reduction:(`Normalize true)
- ~where:default_pattern] @
- (let names_to_intro = List.rev names_to_gen in
- List.map NTactics.intro_tac names_to_intro)) status
- | _ -> assert false
+ let streicher_id = mk_id "streicherK" in
+ let names_to_gen, _ =
+ cascade_select_in_ctx status ~subst:(get_subst status) context skip cur_eq in
+ let gen_tac x = generalize0_tac (List.map mk_id x) in
+
+ match s with
+ (* jmeq *)
+ | NCic.Appl [_;_;_;_;_] ->
+ let names_to_gen = List.rev names_to_gen in
+ (*let gen_eq = NTactics.generalize_tac
+ ~where:("",0,(Some (mk_appl [mk_id "jmeq_to_eq";
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ mk_id eq_name]),[], Some
+ NotationPt.UserInput)) in*)
+ let gen_eq = generalize0_tac
+ [mk_appl [mk_id "jmeq_to_eq";
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ mk_id eq_name]] in
+ NTactics.block_tac ((gen_tac (List.rev names_to_gen))::gen_eq::
+ [NTactics.clear_tac names_to_gen;
+ NTactics.try_tac (NTactics.clear_tac [eq_name]);
+ NTactics.apply_tac ("",0, mk_appl [streicher_id;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne]);
+ ] @
+ (List.map NTactics.intro_tac names_to_gen)) status
+
+ (* leibniz *)
+ | NCic.Appl [_;_;_;_] ->
+ begin
+ let names_to_gen, _ =
+ cascade_select_in_ctx status ~subst:(get_subst status) context skip cur_eq in
+ let names_to_gen = eq_name :: (List.rev names_to_gen) in
+ NTactics.block_tac ((gen_tac names_to_gen)::
+ [NTactics.clear_tac names_to_gen;
+ NTactics.apply_tac ("",0, mk_appl [streicher_id;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne;
+ NotationPt.Implicit `JustOne])
+ (* NTactics.reduce_tac ~reduction:(`Normalize true)
+ ~where:default_pattern *)
+ ] @
+ let names_to_intro = List.tl names_to_gen in
+ (List.map NTactics.intro_tac names_to_intro)) status
+ end
+ | _ -> assert false
+
;;
let get_ctx st goal =
(* = select + classify *)
let select_eq ctx acc domain status goal =
- let classify ~subst ctx' l r =
+ let classify ~use_jmeq ~subst ctx' l r =
(* FIXME: metasenv *)
if NCicReduction.are_convertible status ~metasenv:[] ~subst ctx' l r
then status, `Identity
- else status, (match hd_of_term l, hd_of_term r with
+ else status, (match hd_of_term status (mk_cic_term ctx' l),
+ hd_of_term status (mk_cic_term ctx' r) with
| NCic.Const (NReference.Ref (_,NReference.Con (_,ki,nleft)) as kref),
NCic.Const (NReference.Ref (_,NReference.Con (_,kj,_))) ->
- if ki != kj then `Discriminate (0,true)
+ if ki != kj then `Discriminate (0,true, use_jmeq)
else
let rit = NReference.mk_indty true kref in
let _,_,its,_,itno = NCicEnvironment.get_checked_indtys status rit in
let it = List.nth its itno in
let newprods = nargs it nleft (ki-1) in
- `Discriminate (newprods, false)
+ `Discriminate (newprods, false, use_jmeq)
| NCic.Rel j, _
when NCicTypeChecker.does_not_occur status ~subst ctx' (j-1) j r
&& l = NCic.Rel j -> `Subst `LeftToRight
let status, kind = match ty with
| NCic.Appl [NCic.Const (NReference.Ref (u,_)) ;_;l;r]
when NUri.name_of_uri u = "eq" ->
- classify ~subst:(get_subst status) ctx_ty l r
+ classify ~use_jmeq:false ~subst:(get_subst status) ctx_ty l r
| NCic.Appl [NCic.Const (NReference.Ref (u,_)) ;lty;l;rty;r]
when NUri.name_of_uri u = "jmeq" &&
NCicReduction.are_convertible status ~metasenv:[]
~subst:(get_subst status) ctx_ty lty rty
- -> classify ~subst:(get_subst status) ctx_ty l r
+ -> classify ~use_jmeq:true ~subst:(get_subst status) ctx_ty l r
| _ -> status, `NonEq
in match kind with
| `Identity ->
in aux 0
;;
-let rec destruct_tac0 nprods acc domain skip status goal =
+let tagged_intro_tac curtag name =
+ match curtag with
+ | _ -> NTactics.intro_tac name
+(* | `Eq use_jmeq ->
+ NTactics.block_tac
+ [ NTactics.intro_tac name
+ ; NTactics.reduce_tac
+ ~reduction:(`Whd true) ~where:((if use_jmeq then hp_pattern_jm else
+ hp_pattern) name) ] *)
+
+(* status in
+ distribute_tac (fun s g ->
+ let eq_name,(NCic.Decl s | NCic.Def (s,_)) = List.nth context (cur_eq-1) in
+ let _,ctx' = HExtlib.split_nth cur_eq context in
+ let status, s = NTacStatus.whd status ctx' (mk_cic_term ctx' s) in
+ let status, s = term_of_cic_term status s ctx' in
+ let use_jmeq =
+ match s with
+ | NCic.Appl [_;it;t1;t2] -> false
+ | NCic.Appl [_;it;t1;_;t2] -> true
+ | _ -> assert false in
+ ) status
+ let it, t1, t2, use_jmeq = match s with
+ | NCic.Appl [_;it;t1;t2] -> it,t1,t2,false
+ | NCic.Appl [_;it;t1;_;t2] -> it,t1,t2,true
+ | _ -> assert false in
+ [ NTactics.intro_tac name
+ ; NTactics.reduce_tac ~reduction:(`Whd true) ~where:prod_pattern ]*)
+;;
+
+let rec destruct_tac0 tags acc domain skip status goal =
+ let pptag = function
+ | `Eq false -> "eq"
+ | `Eq true -> "jmeq"
+ | `Notag -> "reg"
+ in
+ let pptags tags = String.concat ", " (List.map pptag tags) in
let ctx = get_ctx status goal in
let subst = get_subst status in
let get_newgoal os ns ogoal =
pp (lazy ("destruct: acc is " ^ String.concat "," acc ));
match selection, kind with
| None, _ ->
- pp (lazy (Printf.sprintf "destruct: nprods is %d, no selection, context is %s" nprods (status#ppcontext ~metasenv:[] ~subst ctx)));
- if nprods > 0 then
+ pp (lazy (Printf.sprintf
+ "destruct: no selection, context is %s, stack is %s"
+ (status#ppcontext ~metasenv:[] ~subst ctx) (pptags tags)));
+ (match tags with
+ | [] -> status
+ | curtag::tags' ->
let fresh = mk_fresh_name ctx 'e' 0 in
- let status' = NTactics.exec (NTactics.intro_tac fresh) status goal in
- destruct_tac0 (nprods-1) acc (fresh::domain) skip status' (get_newgoal status status' goal)
- else
- status
- | Some cur_eq, `Discriminate (newprods,conflict) ->
- pp (lazy (Printf.sprintf "destruct: discriminate - nprods is %d, selection is %d, context is %s" nprods cur_eq (status#ppcontext ~metasenv:[] ~subst ctx)));
+ let status' = NTactics.exec (tagged_intro_tac curtag fresh) status goal in
+ destruct_tac0 tags' acc (fresh::domain) skip status'
+ (get_newgoal status status' goal))
+ | Some cur_eq, `Discriminate (newprods,conflict,use_jmeq) ->
+ pp (lazy (Printf.sprintf
+ "destruct: discriminate - nselection is %d, context is %s,stack is %s"
+ cur_eq (status#ppcontext ~metasenv:[] ~subst ctx) (pptags tags)));
let status' = NTactics.exec (discriminate_tac ~context:ctx cur_eq) status goal in
if conflict then status'
else
- destruct_tac0 (nprods+newprods)
+ let newtags = HExtlib.mk_list (`Eq use_jmeq) newprods in
+ destruct_tac0 (newtags@tags)
(name_of_rel ~context:ctx cur_eq::acc)
(List.filter (fun x -> x <> name_of_rel ~context:ctx cur_eq) domain)
skip
status' (get_newgoal status status' goal)
| Some cur_eq, `Subst dir ->
- pp (lazy (Printf.sprintf "destruct: subst - nprods is %d, selection is %d, context is %s" nprods cur_eq (status#ppcontext ~metasenv:[] ~subst ctx)));
+ pp (lazy (Printf.sprintf
+ "destruct: subst - selection is %d, context is %s, stack is %s"
+ cur_eq (status#ppcontext ~metasenv:[] ~subst ctx) (pptags tags)));
let status' = NTactics.exec (subst_tac ~context:ctx ~dir skip cur_eq) status goal in
pp (lazy (Printf.sprintf " ctx after subst = %s" (status#ppcontext ~metasenv:[] ~subst (get_ctx status' (get_newgoal status status' goal)))));
let eq_name,_ = List.nth ctx (cur_eq-1) in
let acc = rm_eq has_cleared acc in
let skip = rm_eq has_cleared skip in
let domain = rm_eq has_cleared domain in
- destruct_tac0 nprods acc domain skip status' newgoal
+ destruct_tac0 tags acc domain skip status' newgoal
| Some cur_eq, `Identity ->
- pp (lazy (Printf.sprintf "destruct: identity - nprods is %d, selection is %d, context is %s" nprods cur_eq (status#ppcontext ~metasenv:[] ~subst ctx)));
+ pp (lazy (Printf.sprintf
+ "destruct: identity - selection is %d, context is %s, stack is %s"
+ cur_eq (status#ppcontext ~metasenv:[] ~subst ctx) (pptags tags)));
let eq_name,_ = List.nth ctx (cur_eq-1) in
let status' = NTactics.exec (clearid_tac ~context:ctx skip cur_eq) status goal in
let newgoal = get_newgoal status status' goal in
let acc = rm_eq has_cleared acc in
let skip = rm_eq has_cleared skip in
let domain = rm_eq has_cleared domain in
- destruct_tac0 nprods acc domain skip status' newgoal
+ destruct_tac0 tags acc domain skip status' newgoal
| Some cur_eq, `Cycle -> (* TODO, should never happen *)
- pp (lazy (Printf.sprintf "destruct: cycle - nprods is %d, selection is %d, context is %s" nprods cur_eq (status#ppcontext ~metasenv:[] ~subst ctx)));
+ pp (lazy (Printf.sprintf
+ "destruct: cycle - selection is %d, context is %s, stack is %s"
+ cur_eq (status#ppcontext ~metasenv:[] ~subst ctx) (pptags tags)));
assert false
| Some cur_eq, `Blob ->
- pp (lazy (Printf.sprintf "destruct: blob - nprods is %d, selection is %d, context is %s" nprods cur_eq (status#ppcontext ~metasenv:[] ~subst ctx)));
+ pp (lazy (Printf.sprintf
+ "destruct: blob - selection is %d, context is %s, stack is %s"
+ cur_eq (status#ppcontext ~metasenv:[] ~subst ctx) (pptags tags)));
assert false
| _ -> assert false
;;
| None -> List.map (fun (n,_) -> n) ctx
| Some l -> l
in
- destruct_tac0 0 [] domain skip s' g) s;;
+ destruct_tac0 [] [] domain skip s' g) s;;
projects / helm.git / blobdiff