module C = Cic
module I = CicInspect
module D = Deannotate
+module S = CicSubstitution
module TC = CicTypeChecker
module Un = CicUniv
module UM = UriManager
module A = Cic2acic
module Ut = CicUtil
module E = CicEnvironment
-module PEH = ProofEngineHelpers
-module PER = ProofEngineReduction
module Pp = CicPp
+module PEH = ProofEngineHelpers
+module HEL = HExtlib
module Cl = ProceduralClassify
module T = ProceduralTypes
let split2_last l1 l2 =
try
let n = pred (List.length l1) in
- let before1, after1 = T.list_split n l1 in
- let before2, after2 = T.list_split n l2 in
+ let before1, after1 = HEL.split_nth n l1 in
+ let before2, after2 = HEL.split_nth n l2 in
before1, before2, List.hd after1, List.hd after2
with Invalid_argument _ -> failwith "A2P.split2_last"
ty
with e -> failwith (msg ^ ": " ^ Printexc.to_string e)
+let get_entry st id =
+ let rec aux = function
+ | [] -> assert false
+ | Some (C.Name name, e) :: _ when name = id -> e
+ | _ :: tl -> aux tl
+ in
+ aux st.context
+
(* proof construction *******************************************************)
let unused_premise = "UNUSED"
-let mk_exp_args hd tl classes =
+let mk_exp_args hd tl classes synth =
let meta id = C.AImplicit (id, None) in
let map v (cl, b) =
- if I.S.mem 0 cl && b then v else meta ""
+ if I.overlaps synth cl && b then v else meta ""
in
let rec aux = function
| [] -> []
| hd :: tl -> if hd = meta "" then aux tl else List.rev (hd :: tl)
in
- let args = List.rev_map2 map tl classes in
+ let args = T.list_rev_map2 map tl classes in
let args = aux args in
if args = [] then hd else C.AAppl ("", hd :: args)
let convert st ?name v =
match get_inner_types st v with
- | None -> []
- | Some (st, et) ->
- let cst, cet = cic st, cic et in
- if PER.alpha_equivalence cst cet then [] else
+ | None -> []
+ | Some (sty, ety) ->
let e = Cn.mk_pattern 0 (T.mk_arel 1 "") in
+ let csty, cety = cic sty, cic ety in
+ if Ut.alpha_equivalence csty cety then [] else
match name with
- | None -> [T.Change (st, et, None, e, "")]
- | Some id -> [T.Change (st, et, Some (id, id), e, ""); T.ClearBody (id, "")]
+ | None -> [T.Change (sty, ety, None, e, "")]
+ | Some (id, i) ->
+ begin match get_entry st id with
+ | C.Def _ -> [T.ClearBody (id, "")]
+ | C.Decl w ->
+ let w = S.lift i w in
+ if Ut.alpha_equivalence csty w then []
+ else
+ [T.Note (Pp.ppterm csty); T.Note (Pp.ppterm w);
+ T.Change (sty, ety, Some (id, id), e, "")]
+ end
let get_intro = function
| C.Anonymous -> unused_premise
T.Intros (Some count, List.rev st.intros, "") :: script
let mk_arg st = function
- | C.ARel (_, _, _, name) as what -> [] (* convert st ~name what *)
+ | C.ARel (_, _, i, name) as what -> convert st ~name:(name, i) what
| _ -> []
let mk_fwd_rewrite st dtext name tl direction =
| C.AAppl (_, hd :: tl) when is_fwd_rewrite_left hd tl ->
mk_fwd_rewrite st dtext intro tl false
| v ->
- let qs = [[T.Id ""]; proc_proof (next st) v] in
+ let qs = [proc_proof (next st) v; [T.Id ""]] in
[T.Branch (qs, ""); T.Cut (intro, ity, dtext)]
in
- C.Decl (get_type "TC1" st v), rqv
+ C.Decl (cic ity), rqv
| None ->
C.Def (cic v, None), [T.LetIn (intro, v, dtext)]
in
let script = if proceed then
let ty = get_type "TC2" st hd in
let (classes, rc) as h = Cl.classify st.context ty in
+ let goal_arity = match get_inner_types st what with
+ | None -> 0
+ | Some (ity, _) -> snd (PEH.split_with_whd (st.context, cic ity))
+ in
let argsno = List.length classes in
- let diff = argsno - List.length tl in
- if diff <> 0 then failwith (Printf.sprintf "NOT TOTAL: %i %s |--- %s" diff (Pp.ppcontext st.context) (Pp.ppterm (cic hd)));
- let synth = I.S.singleton 0 in
- let text = Printf.sprintf "%u %s" argsno (Cl.to_string h) in
+ let decurry = argsno - List.length tl in
+ let diff = goal_arity - decurry in
+ if diff < 0 then failwith (Printf.sprintf "NOT TOTAL: %i %s |--- %s" diff (Pp.ppcontext st.context) (Pp.ppterm (cic hd)));
+ let rec mk_synth a n =
+ if n < 0 then a else mk_synth (I.S.add n a) (pred n)
+ in
+ let synth = mk_synth I.S.empty decurry in
+ let text = "" (* Printf.sprintf "%u %s" argsno (Cl.to_string h) *) in
let script = List.rev (mk_arg st hd) @ convert st what in
match rc with
| Some (i, j) ->
[T.Elim (where, using, e, dtext ^ text); T.Branch (qs, "")]
| None ->
let qs = proc_bkd_proofs (next st) synth classes tl in
- let hd = mk_exp_args hd tl classes in
+ let hd = mk_exp_args hd tl classes synth in
script @ [T.Apply (hd, dtext ^ text); T.Branch (qs, "")]
else
[T.Apply (what, dtext)]
let script = [T.Note text] in
mk_intros st script
-
and proc_proof st = function
| C.ALambda (_, name, w, t) -> proc_lambda st name w t
| C.ALetIn (_, name, v, t) as what -> proc_letin st what name v t
if I.overlaps synth inv then None else
if I.S.is_empty inv then Some (proc_proof st v) else
Some [T.Apply (v, dtext ^ "dependent")]
- in
- T.list_map2_filter aux classes ts
-with Invalid_argument _ -> failwith "A2P.proc_bkd_proofs"
+ in
+ List.rev (T.list_map2_filter aux classes ts)
+with Invalid_argument s -> failwith ("A2P.proc_bkd_proofs: " ^ s)
(* object costruction *******************************************************)
projects / helm.git / blobdiff