author | wenzelm |
Tue, 01 Jun 2004 12:33:50 +0200 | |
changeset 14854 | 61bdf2ae4dc5 |
parent 13734 | 50dcee1c509e |
child 14876 | 477c414000f8 |
permissions | -rw-r--r-- |
11522 | 1 |
(* Title: Pure/Proof/reconstruct.ML |
2 |
ID: $Id$ |
|
11539 | 3 |
Author: Stefan Berghofer, TU Muenchen |
4 |
License: GPL (GNU GENERAL PUBLIC LICENSE) |
|
11522 | 5 |
|
6 |
Reconstruction of partial proof terms. |
|
7 |
*) |
|
8 |
||
9 |
signature RECONSTRUCT = |
|
10 |
sig |
|
11 |
val quiet_mode : bool ref |
|
11613 | 12 |
val reconstruct_proof : Sign.sg -> term -> Proofterm.proof -> Proofterm.proof |
13256
cf85c4f7dcf2
Added function prop_of' taking assumption context as an argument.
berghofe
parents:
13138
diff
changeset
|
13 |
val prop_of' : term list -> Proofterm.proof -> term |
13138 | 14 |
val prop_of : Proofterm.proof -> term |
13342
915d4d004643
expand_proof now also takes an optional term describing the proposition
berghofe
parents:
13256
diff
changeset
|
15 |
val expand_proof : Sign.sg -> (string * term option) list -> |
915d4d004643
expand_proof now also takes an optional term describing the proposition
berghofe
parents:
13256
diff
changeset
|
16 |
Proofterm.proof -> Proofterm.proof |
11522 | 17 |
end; |
18 |
||
19 |
structure Reconstruct : RECONSTRUCT = |
|
20 |
struct |
|
21 |
||
22 |
open Proofterm; |
|
23 |
||
24 |
val quiet_mode = ref true; |
|
25 |
fun message s = if !quiet_mode then () else writeln s; |
|
26 |
||
27 |
fun vars_of t = rev (foldl_aterms |
|
28 |
(fn (vs, v as Var _) => v ins vs | (vs, _) => vs) ([], t)); |
|
29 |
||
30 |
fun forall_intr (t, prop) = |
|
31 |
let val (a, T) = (case t of Var ((a, _), T) => (a, T) | Free p => p) |
|
32 |
in all T $ Abs (a, T, abstract_over (t, prop)) end; |
|
33 |
||
34 |
fun forall_intr_vfs prop = foldr forall_intr |
|
35 |
(vars_of prop @ sort (make_ord atless) (term_frees prop), prop); |
|
36 |
||
12001 | 37 |
fun forall_intr_prf (t, prf) = |
38 |
let val (a, T) = (case t of Var ((a, _), T) => (a, T) | Free p => p) |
|
39 |
in Abst (a, Some T, prf_abstract_over t prf) end; |
|
40 |
||
41 |
fun forall_intr_vfs_prf prop prf = foldr forall_intr_prf |
|
42 |
(vars_of prop @ sort (make_ord atless) (term_frees prop), prf); |
|
43 |
||
11522 | 44 |
fun merge_envs (Envir.Envir {asol=asol1, iTs=iTs1, maxidx=maxidx1}) |
45 |
(Envir.Envir {asol=asol2, iTs=iTs2, maxidx=maxidx2}) = |
|
46 |
Envir.Envir {asol=Vartab.merge (op aconv) (asol1, asol2), |
|
47 |
iTs=Vartab.merge (op =) (iTs1, iTs2), |
|
48 |
maxidx=Int.max (maxidx1, maxidx2)}; |
|
49 |
||
50 |
||
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
51 |
(**** generate constraints for proof term ****) |
11522 | 52 |
|
53 |
fun mk_var env Ts T = |
|
54 |
let val (env', v) = Envir.genvar "a" (env, rev Ts ---> T) |
|
55 |
in (env', list_comb (v, map Bound (length Ts - 1 downto 0))) end; |
|
56 |
||
57 |
fun mk_tvar (Envir.Envir {iTs, asol, maxidx}, s) = |
|
58 |
(Envir.Envir {iTs = iTs, asol = asol, maxidx = maxidx+1}, |
|
59 |
TVar (("'t", maxidx+1), s)); |
|
60 |
||
61 |
fun mk_abs Ts t = foldl (fn (u, T) => Abs ("", T, u)) (t, Ts); |
|
62 |
||
63 |
fun unifyT sg env T U = |
|
64 |
let |
|
65 |
val Envir.Envir {asol, iTs, maxidx} = env; |
|
12527 | 66 |
val (iTs', maxidx') = Type.unify (Sign.tsig_of sg) (iTs, maxidx) (T, U) |
11660 | 67 |
in Envir.Envir {asol=asol, iTs=iTs', maxidx=maxidx'} end |
68 |
handle Type.TUNIFY => error ("Non-unifiable types:\n" ^ |
|
69 |
Sign.string_of_typ sg T ^ "\n\n" ^ Sign.string_of_typ sg U); |
|
11522 | 70 |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
71 |
fun chaseT (env as Envir.Envir {iTs, ...}) (T as TVar (ixn, _)) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
72 |
(case Vartab.lookup (iTs, ixn) of None => T | Some T' => chaseT env T') |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
73 |
| chaseT _ T = T; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
74 |
|
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
75 |
fun infer_type sg (env as Envir.Envir {maxidx, asol, iTs}) Ts vTs |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
76 |
(t as Const (s, T)) = if T = dummyT then (case Sign.const_type sg s of |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
77 |
None => error ("reconstruct_proof: No such constant: " ^ quote s) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
78 |
| Some T => |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
79 |
let val T' = incr_tvar (maxidx + 1) T |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
80 |
in (Const (s, T'), T', vTs, |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
81 |
Envir.Envir {maxidx = maxidx + 1, asol = asol, iTs = iTs}) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
82 |
end) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
83 |
else (t, T, vTs, env) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
84 |
| infer_type sg env Ts vTs (t as Free (s, T)) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
85 |
if T = dummyT then (case Symtab.lookup (vTs, s) of |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
86 |
None => |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
87 |
let val (env', T) = mk_tvar (env, []) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
88 |
in (Free (s, T), T, Symtab.update_new ((s, T), vTs), env') end |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
89 |
| Some T => (Free (s, T), T, vTs, env)) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
90 |
else (t, T, vTs, env) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
91 |
| infer_type sg env Ts vTs (Var _) = error "reconstruct_proof: internal error" |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
92 |
| infer_type sg env Ts vTs (Abs (s, T, t)) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
93 |
let |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
94 |
val (env', T') = if T = dummyT then mk_tvar (env, []) else (env, T); |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
95 |
val (t', U, vTs', env'') = infer_type sg env' (T' :: Ts) vTs t |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
96 |
in (Abs (s, T', t'), T' --> U, vTs', env'') end |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
97 |
| infer_type sg env Ts vTs (t $ u) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
98 |
let |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
99 |
val (t', T, vTs1, env1) = infer_type sg env Ts vTs t; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
100 |
val (u', U, vTs2, env2) = infer_type sg env1 Ts vTs1 u; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
101 |
in (case chaseT env2 T of |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
102 |
Type ("fun", [U', V]) => (t' $ u', V, vTs2, unifyT sg env2 U U') |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
103 |
| _ => |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
104 |
let val (env3, V) = mk_tvar (env2, []) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
105 |
in (t' $ u', V, vTs2, unifyT sg env3 T (U --> V)) end) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
106 |
end |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
107 |
| infer_type sg env Ts vTs (t as Bound i) = (t, nth_elem (i, Ts), vTs, env); |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
108 |
|
13715 | 109 |
fun cantunify sg (t, u) = error ("Non-unifiable terms:\n" ^ |
110 |
Sign.string_of_term sg t ^ "\n\n" ^ Sign.string_of_term sg u); |
|
11522 | 111 |
|
13715 | 112 |
fun decompose sg Ts (env, p as (t, u)) = |
113 |
let fun rigrig (a, T) (b, U) uT ts us = if a <> b then cantunify sg p |
|
114 |
else apsnd flat (foldl_map (decompose sg Ts) (uT env T U, ts ~~ us)) |
|
115 |
in case pairself (strip_comb o Envir.head_norm env) p of |
|
116 |
((Const c, ts), (Const d, us)) => rigrig c d (unifyT sg) ts us |
|
117 |
| ((Free c, ts), (Free d, us)) => rigrig c d (unifyT sg) ts us |
|
118 |
| ((Bound i, ts), (Bound j, us)) => |
|
119 |
rigrig (i, dummyT) (j, dummyT) (K o K) ts us |
|
120 |
| ((Abs (_, T, t), []), (Abs (_, U, u), [])) => |
|
121 |
decompose sg (T::Ts) (unifyT sg env T U, (t, u)) |
|
122 |
| ((Abs (_, T, t), []), _) => |
|
123 |
decompose sg (T::Ts) (env, (t, incr_boundvars 1 u $ Bound 0)) |
|
124 |
| (_, (Abs (_, T, u), [])) => |
|
125 |
decompose sg (T::Ts) (env, (incr_boundvars 1 t $ Bound 0, u)) |
|
126 |
| _ => (env, [(mk_abs Ts t, mk_abs Ts u)]) |
|
127 |
end; |
|
11522 | 128 |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
129 |
fun make_constraints_cprf sg env cprf = |
11522 | 130 |
let |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
131 |
fun add_cnstrt Ts prop prf cs env vTs (t, u) = |
11522 | 132 |
let |
133 |
val t' = mk_abs Ts t; |
|
12236 | 134 |
val u' = mk_abs Ts u |
11522 | 135 |
in |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
136 |
(prop, prf, cs, Pattern.unify (sg, env, [(t', u')]), vTs) |
12236 | 137 |
handle Pattern.Pattern => |
13715 | 138 |
let val (env', cs') = decompose sg [] (env, (t', u')) |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
139 |
in (prop, prf, cs @ cs', env', vTs) end |
12236 | 140 |
| Pattern.Unif => |
13715 | 141 |
cantunify sg (Envir.norm_term env t', Envir.norm_term env u') |
11522 | 142 |
end; |
143 |
||
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
144 |
fun mk_cnstrts_atom env vTs prop opTs prf = |
11522 | 145 |
let |
146 |
val tvars = term_tvars prop; |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
147 |
val tfrees = term_tfrees prop; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
148 |
val (prop', fmap) = Type.varify (prop, []); |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
149 |
val (env', Ts) = (case opTs of |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
150 |
None => foldl_map mk_tvar (env, map snd tvars @ map snd tfrees) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
151 |
| Some Ts => (env, Ts)); |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
152 |
val prop'' = subst_TVars (map fst tvars @ map snd fmap ~~ Ts) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
153 |
(forall_intr_vfs prop') handle LIST _ => |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
154 |
error ("Wrong number of type arguments for " ^ |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
155 |
quote (fst (get_name_tags [] prop prf))) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
156 |
in (prop'', change_type (Some Ts) prf, [], env', vTs) end; |
11522 | 157 |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
158 |
fun head_norm (prop, prf, cnstrts, env, vTs) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
159 |
(Envir.head_norm env prop, prf, cnstrts, env, vTs); |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
160 |
|
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
161 |
fun mk_cnstrts env _ Hs vTs (PBound i) = (nth_elem (i, Hs), PBound i, [], env, vTs) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
162 |
| mk_cnstrts env Ts Hs vTs (Abst (s, opT, cprf)) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
163 |
let |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
164 |
val (env', T) = (case opT of |
14854 | 165 |
None => mk_tvar (env, []) | Some T => (env, T)); |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
166 |
val (t, prf, cnstrts, env'', vTs') = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
167 |
mk_cnstrts env' (T::Ts) (map (incr_boundvars 1) Hs) vTs cprf; |
11522 | 168 |
in (Const ("all", (T --> propT) --> propT) $ Abs (s, T, t), Abst (s, Some T, prf), |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
169 |
cnstrts, env'', vTs') |
11522 | 170 |
end |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
171 |
| mk_cnstrts env Ts Hs vTs (AbsP (s, Some t, cprf)) = |
11522 | 172 |
let |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
173 |
val (t', _, vTs', env') = infer_type sg env Ts vTs t; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
174 |
val (u, prf, cnstrts, env'', vTs'') = mk_cnstrts env' Ts (t'::Hs) vTs' cprf; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
175 |
in (Logic.mk_implies (t', u), AbsP (s, Some t', prf), cnstrts, env'', vTs'') |
11522 | 176 |
end |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
177 |
| mk_cnstrts env Ts Hs vTs (AbsP (s, None, cprf)) = |
11522 | 178 |
let |
179 |
val (env', t) = mk_var env Ts propT; |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
180 |
val (u, prf, cnstrts, env'', vTs') = mk_cnstrts env' Ts (t::Hs) vTs cprf; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
181 |
in (Logic.mk_implies (t, u), AbsP (s, Some t, prf), cnstrts, env'', vTs') |
11522 | 182 |
end |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
183 |
| mk_cnstrts env Ts Hs vTs (cprf1 %% cprf2) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
184 |
let val (u, prf2, cnstrts, env', vTs') = mk_cnstrts env Ts Hs vTs cprf2 |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
185 |
in (case head_norm (mk_cnstrts env' Ts Hs vTs' cprf1) of |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
186 |
(Const ("==>", _) $ u' $ t', prf1, cnstrts', env'', vTs'') => |
11613 | 187 |
add_cnstrt Ts t' (prf1 %% prf2) (cnstrts' @ cnstrts) |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
188 |
env'' vTs'' (u, u') |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
189 |
| (t, prf1, cnstrts', env'', vTs'') => |
11522 | 190 |
let val (env''', v) = mk_var env'' Ts propT |
11613 | 191 |
in add_cnstrt Ts v (prf1 %% prf2) (cnstrts' @ cnstrts) |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
192 |
env''' vTs'' (t, Logic.mk_implies (u, v)) |
11522 | 193 |
end) |
194 |
end |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
195 |
| mk_cnstrts env Ts Hs vTs (cprf % Some t) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
196 |
let val (t', U, vTs1, env1) = infer_type sg env Ts vTs t |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
197 |
in (case head_norm (mk_cnstrts env1 Ts Hs vTs1 cprf) of |
11522 | 198 |
(Const ("all", Type ("fun", [Type ("fun", [T, _]), _])) $ f, |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
199 |
prf, cnstrts, env2, vTs2) => |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
200 |
let val env3 = unifyT sg env2 T U |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
201 |
in (betapply (f, t'), prf % Some t', cnstrts, env3, vTs2) |
11522 | 202 |
end |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
203 |
| (u, prf, cnstrts, env2, vTs2) => |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
204 |
let val (env3, v) = mk_var env2 Ts (U --> propT); |
11522 | 205 |
in |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
206 |
add_cnstrt Ts (v $ t') (prf % Some t') cnstrts env3 vTs2 |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
207 |
(u, Const ("all", (U --> propT) --> propT) $ v) |
11522 | 208 |
end) |
209 |
end |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
210 |
| mk_cnstrts env Ts Hs vTs (cprf % None) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
211 |
(case head_norm (mk_cnstrts env Ts Hs vTs cprf) of |
11522 | 212 |
(Const ("all", Type ("fun", [Type ("fun", [T, _]), _])) $ f, |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
213 |
prf, cnstrts, env', vTs') => |
11522 | 214 |
let val (env'', t) = mk_var env' Ts T |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
215 |
in (betapply (f, t), prf % Some t, cnstrts, env'', vTs') |
11522 | 216 |
end |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
217 |
| (u, prf, cnstrts, env', vTs') => |
11522 | 218 |
let |
14854 | 219 |
val (env1, T) = mk_tvar (env', []); |
11522 | 220 |
val (env2, v) = mk_var env1 Ts (T --> propT); |
221 |
val (env3, t) = mk_var env2 Ts T |
|
222 |
in |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
223 |
add_cnstrt Ts (v $ t) (prf % Some t) cnstrts env3 vTs' |
11522 | 224 |
(u, Const ("all", (T --> propT) --> propT) $ v) |
225 |
end) |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
226 |
| mk_cnstrts env _ _ vTs (prf as PThm (_, _, prop, opTs)) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
227 |
mk_cnstrts_atom env vTs prop opTs prf |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
228 |
| mk_cnstrts env _ _ vTs (prf as PAxm (_, prop, opTs)) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
229 |
mk_cnstrts_atom env vTs prop opTs prf |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
230 |
| mk_cnstrts env _ _ vTs (prf as Oracle (_, prop, opTs)) = |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
231 |
mk_cnstrts_atom env vTs prop opTs prf |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
232 |
| mk_cnstrts env _ _ vTs (Hyp t) = (t, Hyp t, [], env, vTs) |
11613 | 233 |
| mk_cnstrts _ _ _ _ _ = error "reconstruct_proof: minimal proof object" |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
234 |
in mk_cnstrts env [] [] Symtab.empty cprf end; |
11522 | 235 |
|
236 |
fun add_term_ixns (is, Var (i, T)) = add_typ_ixns (i ins is, T) |
|
237 |
| add_term_ixns (is, Free (_, T)) = add_typ_ixns (is, T) |
|
238 |
| add_term_ixns (is, Const (_, T)) = add_typ_ixns (is, T) |
|
239 |
| add_term_ixns (is, t1 $ t2) = add_term_ixns (add_term_ixns (is, t1), t2) |
|
240 |
| add_term_ixns (is, Abs (_, T, t)) = add_term_ixns (add_typ_ixns (is, T), t) |
|
241 |
| add_term_ixns (is, _) = is; |
|
242 |
||
243 |
||
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
244 |
(**** update list of free variables of constraints ****) |
11522 | 245 |
|
246 |
fun upd_constrs env cs = |
|
247 |
let |
|
248 |
val Envir.Envir {asol, iTs, ...} = env; |
|
249 |
val dom = Vartab.foldl (uncurry (cons o fst) o Library.swap) |
|
250 |
(Vartab.foldl (uncurry (cons o fst) o Library.swap) ([], asol), iTs); |
|
251 |
val vran = Vartab.foldl (add_typ_ixns o apsnd snd) |
|
252 |
(Vartab.foldl (add_term_ixns o apsnd snd) ([], asol), iTs); |
|
253 |
fun check_cs [] = [] |
|
254 |
| check_cs ((u, p, vs)::ps) = |
|
255 |
let val vs' = vs \\ dom; |
|
256 |
in if vs = vs' then (u, p, vs)::check_cs ps |
|
257 |
else (true, p, vs' union vran)::check_cs ps |
|
258 |
end |
|
259 |
in check_cs cs end; |
|
260 |
||
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
261 |
(**** solution of constraints ****) |
11522 | 262 |
|
263 |
fun solve _ [] bigenv = bigenv |
|
264 |
| solve sg cs bigenv = |
|
265 |
let |
|
11660 | 266 |
fun search env [] = error ("Unsolvable constraints:\n" ^ |
267 |
Pretty.string_of (Pretty.chunks (map (fn (_, p, _) => |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
268 |
Display.pretty_flexpair (Sign.pretty_term sg) (pairself |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
269 |
(Envir.norm_term bigenv) p)) cs))) |
11522 | 270 |
| search env ((u, p as (t1, t2), vs)::ps) = |
271 |
if u then |
|
272 |
let |
|
273 |
val tn1 = Envir.norm_term bigenv t1; |
|
274 |
val tn2 = Envir.norm_term bigenv t2 |
|
275 |
in |
|
276 |
if Pattern.pattern tn1 andalso Pattern.pattern tn2 then |
|
277 |
((Pattern.unify (sg, env, [(tn1, tn2)]), ps) handle Pattern.Unif => |
|
13715 | 278 |
cantunify sg (tn1, tn2)) |
11522 | 279 |
else |
13715 | 280 |
let val (env', cs') = decompose sg [] (env, (tn1, tn2)) |
11522 | 281 |
in if cs' = [(tn1, tn2)] then |
282 |
apsnd (cons (false, (tn1, tn2), vs)) (search env ps) |
|
283 |
else search env' (map (fn q => (true, q, vs)) cs' @ ps) |
|
284 |
end |
|
285 |
end |
|
286 |
else apsnd (cons (false, p, vs)) (search env ps); |
|
287 |
val Envir.Envir {maxidx, ...} = bigenv; |
|
288 |
val (env, cs') = search (Envir.empty maxidx) cs; |
|
289 |
in |
|
290 |
solve sg (upd_constrs env cs') (merge_envs bigenv env) |
|
291 |
end; |
|
292 |
||
293 |
||
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
294 |
(**** reconstruction of proofs ****) |
11522 | 295 |
|
11613 | 296 |
fun reconstruct_proof sg prop cprf = |
11522 | 297 |
let |
11613 | 298 |
val (cprf' % Some prop', thawf) = freeze_thaw_prf (cprf % Some prop); |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
299 |
val _ = message "Collecting constraints..."; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
300 |
val (t, prf, cs, env, _) = make_constraints_cprf sg |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
301 |
(Envir.empty (maxidx_of_proof cprf)) cprf'; |
11522 | 302 |
val cs' = map (fn p => (true, p, op union |
303 |
(pairself (map (fst o dest_Var) o term_vars) p))) (map (pairself (Envir.norm_term env)) ((t, prop')::cs)); |
|
304 |
val _ = message ("Solving remaining constraints (" ^ string_of_int (length cs') ^ ") ..."); |
|
305 |
val env' = solve sg cs' env |
|
306 |
in |
|
307 |
thawf (norm_proof env' prf) |
|
308 |
end; |
|
309 |
||
13256
cf85c4f7dcf2
Added function prop_of' taking assumption context as an argument.
berghofe
parents:
13138
diff
changeset
|
310 |
fun prop_of_atom prop Ts = |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
311 |
let val (prop', fmap) = Type.varify (prop, []); |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
312 |
in subst_TVars (map fst (term_tvars prop) @ map snd fmap ~~ Ts) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
313 |
(forall_intr_vfs prop') |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
314 |
end; |
13138 | 315 |
|
13734
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
316 |
val head_norm = Envir.head_norm (Envir.empty 0); |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
317 |
|
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
318 |
fun prop_of0 Hs (PBound i) = nth_elem (i, Hs) |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
319 |
| prop_of0 Hs (Abst (s, Some T, prf)) = |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
320 |
all T $ (Abs (s, T, prop_of0 Hs prf)) |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
321 |
| prop_of0 Hs (AbsP (s, Some t, prf)) = |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
322 |
Logic.mk_implies (t, prop_of0 (t :: Hs) prf) |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
323 |
| prop_of0 Hs (prf % Some t) = (case head_norm (prop_of0 Hs prf) of |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
324 |
Const ("all", _) $ f => f $ t |
13256
cf85c4f7dcf2
Added function prop_of' taking assumption context as an argument.
berghofe
parents:
13138
diff
changeset
|
325 |
| _ => error "prop_of: all expected") |
13734
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
326 |
| prop_of0 Hs (prf1 %% prf2) = (case head_norm (prop_of0 Hs prf1) of |
13256
cf85c4f7dcf2
Added function prop_of' taking assumption context as an argument.
berghofe
parents:
13138
diff
changeset
|
327 |
Const ("==>", _) $ P $ Q => Q |
cf85c4f7dcf2
Added function prop_of' taking assumption context as an argument.
berghofe
parents:
13138
diff
changeset
|
328 |
| _ => error "prop_of: ==> expected") |
13734
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
329 |
| prop_of0 Hs (Hyp t) = t |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
330 |
| prop_of0 Hs (PThm (_, _, prop, Some Ts)) = prop_of_atom prop Ts |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
331 |
| prop_of0 Hs (PAxm (_, prop, Some Ts)) = prop_of_atom prop Ts |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
332 |
| prop_of0 Hs (Oracle (_, prop, Some Ts)) = prop_of_atom prop Ts |
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
333 |
| prop_of0 _ _ = error "prop_of: partial proof object"; |
13138 | 334 |
|
13734
50dcee1c509e
prop_of now returns proposition in beta-eta normal form.
berghofe
parents:
13715
diff
changeset
|
335 |
val prop_of' = Pattern.eta_contract oo (Envir.beta_norm oo prop_of0); |
13256
cf85c4f7dcf2
Added function prop_of' taking assumption context as an argument.
berghofe
parents:
13138
diff
changeset
|
336 |
val prop_of = prop_of' []; |
13138 | 337 |
|
11522 | 338 |
|
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
339 |
(**** expand and reconstruct subproofs ****) |
11522 | 340 |
|
13342
915d4d004643
expand_proof now also takes an optional term describing the proposition
berghofe
parents:
13256
diff
changeset
|
341 |
fun expand_proof sg thms prf = |
11522 | 342 |
let |
12870
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
343 |
fun expand maxidx prfs (AbsP (s, t, prf)) = |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
344 |
let val (maxidx', prfs', prf') = expand maxidx prfs prf |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
345 |
in (maxidx', prfs', AbsP (s, t, prf')) end |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
346 |
| expand maxidx prfs (Abst (s, T, prf)) = |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
347 |
let val (maxidx', prfs', prf') = expand maxidx prfs prf |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
348 |
in (maxidx', prfs', Abst (s, T, prf')) end |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
349 |
| expand maxidx prfs (prf1 %% prf2) = |
11522 | 350 |
let |
12870
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
351 |
val (maxidx', prfs', prf1') = expand maxidx prfs prf1; |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
352 |
val (maxidx'', prfs'', prf2') = expand maxidx' prfs' prf2; |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
353 |
in (maxidx'', prfs'', prf1' %% prf2') end |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
354 |
| expand maxidx prfs (prf % t) = |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
355 |
let val (maxidx', prfs', prf') = expand maxidx prfs prf |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
356 |
in (maxidx', prfs', prf' % t) end |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
357 |
| expand maxidx prfs (prf as PThm ((a, _), cprf, prop, Some Ts)) = |
13342
915d4d004643
expand_proof now also takes an optional term describing the proposition
berghofe
parents:
13256
diff
changeset
|
358 |
if not (exists |
915d4d004643
expand_proof now also takes an optional term describing the proposition
berghofe
parents:
13256
diff
changeset
|
359 |
(fn (b, None) => a = b |
915d4d004643
expand_proof now also takes an optional term describing the proposition
berghofe
parents:
13256
diff
changeset
|
360 |
| (b, Some prop') => a = b andalso prop = prop') thms) |
915d4d004643
expand_proof now also takes an optional term describing the proposition
berghofe
parents:
13256
diff
changeset
|
361 |
then (maxidx, prfs, prf) else |
11522 | 362 |
let |
13610
d4a2ac255447
Fixed bug in expand_proof which caused indexes to be incremented incorrectly.
berghofe
parents:
13342
diff
changeset
|
363 |
fun inc i = |
d4a2ac255447
Fixed bug in expand_proof which caused indexes to be incremented incorrectly.
berghofe
parents:
13342
diff
changeset
|
364 |
map_proof_terms (Logic.incr_indexes ([], i)) (incr_tvar i); |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
365 |
val (maxidx', prf, prfs') = (case assoc (prfs, (a, prop)) of |
11522 | 366 |
None => |
367 |
let |
|
368 |
val _ = message ("Reconstructing proof of " ^ a); |
|
369 |
val _ = message (Sign.string_of_term sg prop); |
|
13610
d4a2ac255447
Fixed bug in expand_proof which caused indexes to be incremented incorrectly.
berghofe
parents:
13342
diff
changeset
|
370 |
val prf' = forall_intr_vfs_prf prop |
d4a2ac255447
Fixed bug in expand_proof which caused indexes to be incremented incorrectly.
berghofe
parents:
13342
diff
changeset
|
371 |
(reconstruct_proof sg prop cprf); |
12870
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
372 |
val (maxidx', prfs', prf) = expand |
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
373 |
(maxidx_of_proof prf') prfs prf' |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
374 |
in (maxidx' + maxidx + 1, inc (maxidx + 1) prf, |
13610
d4a2ac255447
Fixed bug in expand_proof which caused indexes to be incremented incorrectly.
berghofe
parents:
13342
diff
changeset
|
375 |
((a, prop), (maxidx', prf)) :: prfs') |
d4a2ac255447
Fixed bug in expand_proof which caused indexes to be incremented incorrectly.
berghofe
parents:
13342
diff
changeset
|
376 |
end |
d4a2ac255447
Fixed bug in expand_proof which caused indexes to be incremented incorrectly.
berghofe
parents:
13342
diff
changeset
|
377 |
| Some (maxidx', prf) => (maxidx' + maxidx + 1, |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
378 |
inc (maxidx + 1) prf, prfs)); |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
379 |
val tfrees = term_tfrees prop; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
380 |
val tye = map (fn ((s, j), _) => (s, maxidx + 1 + j)) |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
381 |
(term_tvars prop) @ map (rpair ~1 o fst) tfrees ~~ Ts; |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
382 |
val varify = map_type_tfree (fn p as (a, S) => |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
383 |
if p mem tfrees then TVar ((a, ~1), S) else TFree p) |
11522 | 384 |
in |
13669
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
385 |
(maxidx', prfs', map_proof_terms (subst_TVars tye o |
a9f229eafba7
- reconstruct_proof no longer relies on TypeInfer.infer_types
berghofe
parents:
13610
diff
changeset
|
386 |
map_term_types varify) (typ_subst_TVars tye o varify) prf) |
11522 | 387 |
end |
12870
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
388 |
| expand maxidx prfs prf = (maxidx, prfs, prf); |
11522 | 389 |
|
12870
3905bc0e9002
Indexes of variables in expanded proofs are now incremented to avoid clashes.
berghofe
parents:
12527
diff
changeset
|
390 |
in #3 (expand (maxidx_of_proof prf) [] prf) end; |
11522 | 391 |
|
392 |
end; |