author | desharna |
Mon, 10 Oct 2022 13:42:14 +0200 | |
changeset 76255 | b3ff4f171eda |
parent 74539 | f07761ee5a7f |
child 77952 | 27b5cb41c253 |
permissions | -rw-r--r-- |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
1 |
(* Title: Pure/variable.ML |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
2 |
Author: Makarius |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
3 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
4 |
Fixed type/term variables and polymorphic term abbreviations. |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
5 |
*) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
6 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
7 |
signature VARIABLE = |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
8 |
sig |
20303 | 9 |
val names_of: Proof.context -> Name.context |
10 |
val binds_of: Proof.context -> (typ * term) Vartab.table |
|
24765 | 11 |
val maxidx_of: Proof.context -> int |
20303 | 12 |
val constraints_of: Proof.context -> typ Vartab.table * sort Vartab.table |
13 |
val is_declared: Proof.context -> string -> bool |
|
42494 | 14 |
val check_name: binding -> string |
20303 | 15 |
val default_type: Proof.context -> string -> typ option |
16 |
val def_type: Proof.context -> bool -> indexname -> typ option |
|
17 |
val def_sort: Proof.context -> indexname -> sort option |
|
59646 | 18 |
val declare_maxidx: int -> Proof.context -> Proof.context |
27280 | 19 |
val declare_names: term -> Proof.context -> Proof.context |
20303 | 20 |
val declare_constraints: term -> Proof.context -> Proof.context |
62012
12d3edd62932
more precise context -- potentially relevant for Eisbach dummy thm;
wenzelm
parents:
61949
diff
changeset
|
21 |
val declare_internal: term -> Proof.context -> Proof.context |
20303 | 22 |
val declare_term: term -> Proof.context -> Proof.context |
27280 | 23 |
val declare_typ: typ -> Proof.context -> Proof.context |
20303 | 24 |
val declare_prf: Proofterm.proof -> Proof.context -> Proof.context |
25 |
val declare_thm: thm -> Proof.context -> Proof.context |
|
26 |
val variant_frees: Proof.context -> term list -> (string * 'a) list -> (string * 'a) list |
|
60401 | 27 |
val bind_term: indexname * term -> Proof.context -> Proof.context |
28 |
val unbind_term: indexname -> Proof.context -> Proof.context |
|
29 |
val maybe_bind_term: indexname * term option -> Proof.context -> Proof.context |
|
20303 | 30 |
val expand_binds: Proof.context -> term -> term |
25325 | 31 |
val lookup_const: Proof.context -> string -> string option |
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
32 |
val is_const: Proof.context -> string -> bool |
25325 | 33 |
val declare_const: string * string -> Proof.context -> Proof.context |
55635 | 34 |
val next_bound: string * typ -> Proof.context -> term * Proof.context |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
35 |
val revert_bounds: Proof.context -> term -> term |
59798 | 36 |
val is_body: Proof.context -> bool |
37 |
val set_body: bool -> Proof.context -> Proof.context |
|
38 |
val restore_body: Proof.context -> Proof.context -> Proof.context |
|
59790 | 39 |
val improper_fixes: Proof.context -> Proof.context |
40 |
val restore_proper_fixes: Proof.context -> Proof.context -> Proof.context |
|
41 |
val is_improper: Proof.context -> string -> bool |
|
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
42 |
val is_fixed: Proof.context -> string -> bool |
59846 | 43 |
val is_newly_fixed: Proof.context -> Proof.context -> string -> bool |
70586 | 44 |
val fixed_ord: Proof.context -> string ord |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
45 |
val intern_fixed: Proof.context -> string -> string |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
46 |
val lookup_fixed: Proof.context -> string -> string option |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
47 |
val revert_fixed: Proof.context -> string -> string |
62987
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
48 |
val markup_fixed: Proof.context -> string -> Markup.T |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
49 |
val markup: Proof.context -> string -> Markup.T |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
50 |
val markup_entity_def: Proof.context -> string -> Markup.T |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
51 |
val dest_fixes: Proof.context -> (string * string) list |
42482 | 52 |
val add_fixed_names: Proof.context -> term -> string list -> string list |
53 |
val add_fixed: Proof.context -> term -> (string * typ) list -> (string * typ) list |
|
59846 | 54 |
val add_newly_fixed: Proof.context -> Proof.context -> |
55 |
term -> (string * typ) list -> (string * typ) list |
|
42482 | 56 |
val add_free_names: Proof.context -> term -> string list -> string list |
57 |
val add_frees: Proof.context -> term -> (string * typ) list -> (string * typ) list |
|
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
58 |
val add_fixes_binding: binding list -> Proof.context -> string list * Proof.context |
20303 | 59 |
val add_fixes: string list -> Proof.context -> string list * Proof.context |
60 |
val add_fixes_direct: string list -> Proof.context -> Proof.context |
|
70733 | 61 |
val add_fixes_implicit: term -> Proof.context -> Proof.context |
59796 | 62 |
val fix_dummy_patterns: term -> Proof.context -> term * Proof.context |
20797
c1f0bc7e7d80
renamed Variable.invent_fixes to Variable.variant_fixes;
wenzelm
parents:
20579
diff
changeset
|
63 |
val variant_fixes: string list -> Proof.context -> string list * Proof.context |
60822 | 64 |
val gen_all: Proof.context -> thm -> thm |
20303 | 65 |
val export_terms: Proof.context -> Proof.context -> term list -> term list |
66 |
val exportT_terms: Proof.context -> Proof.context -> term list -> term list |
|
67 |
val exportT: Proof.context -> Proof.context -> thm list -> thm list |
|
68 |
val export_prf: Proof.context -> Proof.context -> Proofterm.proof -> Proofterm.proof |
|
69 |
val export: Proof.context -> Proof.context -> thm list -> thm list |
|
21522 | 70 |
val export_morphism: Proof.context -> Proof.context -> morphism |
59796 | 71 |
val invent_types: sort list -> Proof.context -> (string * sort) list * Proof.context |
74266 | 72 |
val importT_inst: term list -> Proof.context -> typ TVars.table * Proof.context |
20303 | 73 |
val import_inst: bool -> term list -> Proof.context -> |
74266 | 74 |
(typ TVars.table * term Vars.table) * Proof.context |
20303 | 75 |
val importT_terms: term list -> Proof.context -> term list * Proof.context |
76 |
val import_terms: bool -> term list -> Proof.context -> term list * Proof.context |
|
74266 | 77 |
val importT: thm list -> Proof.context -> (ctyp TVars.table * thm list) * Proof.context |
20303 | 78 |
val import_prf: bool -> Proofterm.proof -> Proof.context -> Proofterm.proof * Proof.context |
31794
71af1fd6a5e4
renamed Variable.import_thms to Variable.import (back again cf. ed7aa5a350ef -- Alice is no longer supported);
wenzelm
parents:
30756
diff
changeset
|
79 |
val import: bool -> thm list -> Proof.context -> |
74266 | 80 |
((ctyp TVars.table * cterm Vars.table) * thm list) * Proof.context |
70304 | 81 |
val import_vars: Proof.context -> thm -> thm |
21287 | 82 |
val tradeT: (Proof.context -> thm list -> thm list) -> Proof.context -> thm list -> thm list |
83 |
val trade: (Proof.context -> thm list -> thm list) -> Proof.context -> thm list -> thm list |
|
74525
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
84 |
val dest_abs: term -> Proof.context -> ((string * typ) * term) * Proof.context |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
85 |
val dest_abs_cterm: cterm -> Proof.context -> (cterm * cterm) * Proof.context |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
86 |
val dest_all: term -> Proof.context -> ((string * typ) * term) * Proof.context |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
87 |
val dest_all_cterm: cterm -> Proof.context -> (cterm * cterm) * Proof.context |
60707
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
88 |
val is_bound_focus: Proof.context -> bool |
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
89 |
val set_bound_focus: bool -> Proof.context -> Proof.context |
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
90 |
val restore_bound_focus: Proof.context -> Proof.context -> Proof.context |
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
91 |
val focus_params: binding list option -> term -> Proof.context -> |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
92 |
(string list * (string * typ) list) * Proof.context |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
93 |
val focus: binding list option -> term -> Proof.context -> |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
94 |
((string * (string * typ)) list * term) * Proof.context |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
95 |
val focus_cterm: binding list option -> cterm -> Proof.context -> |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
96 |
((string * cterm) list * cterm) * Proof.context |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
97 |
val focus_subgoal: binding list option -> int -> thm -> Proof.context -> |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
98 |
((string * cterm) list * cterm) * Proof.context |
20303 | 99 |
val warn_extra_tfrees: Proof.context -> Proof.context -> unit |
24694 | 100 |
val polymorphic_types: Proof.context -> term list -> (indexname * sort) list * term list |
20303 | 101 |
val polymorphic: Proof.context -> term list -> term list |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
102 |
end; |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
103 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
104 |
structure Variable: VARIABLE = |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
105 |
struct |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
106 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
107 |
(** local context data **) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
108 |
|
59790 | 109 |
type fixes = (string * bool) Name_Space.table; |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
49688
diff
changeset
|
110 |
val empty_fixes: fixes = Name_Space.empty_table Markup.fixedN; |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
111 |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
112 |
datatype data = Data of |
59798 | 113 |
{names: Name.context, (*type/term variable names*) |
25325 | 114 |
consts: string Symtab.table, (*consts within the local scope*) |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
115 |
bounds: int * ((string * typ) * string) list, (*next index, internal name, type, external name*) |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
116 |
fixes: fixes, (*term fixes -- global name space, intern ~> extern*) |
20102 | 117 |
binds: (typ * term) Vartab.table, (*term bindings*) |
20162 | 118 |
type_occs: string list Symtab.table, (*type variables -- possibly within term variables*) |
24765 | 119 |
maxidx: int, (*maximum var index*) |
20162 | 120 |
constraints: |
20102 | 121 |
typ Vartab.table * (*type constraints*) |
20162 | 122 |
sort Vartab.table}; (*default sorts*) |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
123 |
|
61508 | 124 |
fun make_data (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) = |
59798 | 125 |
Data {names = names, consts = consts, bounds = bounds, fixes = fixes, binds = binds, |
61508 | 126 |
type_occs = type_occs, maxidx = maxidx, constraints = constraints}; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
127 |
|
59150 | 128 |
val empty_data = |
59798 | 129 |
make_data (Name.context, Symtab.empty, (0, []), empty_fixes, Vartab.empty, |
61508 | 130 |
Symtab.empty, ~1, (Vartab.empty, Vartab.empty)); |
59150 | 131 |
|
33519 | 132 |
structure Data = Proof_Data |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
133 |
( |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
134 |
type T = data; |
59150 | 135 |
fun init _ = empty_data; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
136 |
); |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
137 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
138 |
fun map_data f = |
61508 | 139 |
Data.map (fn Data {names, consts, bounds, fixes, binds, type_occs, maxidx, constraints} => |
140 |
make_data (f (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints))); |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
141 |
|
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
142 |
fun map_names f = |
61508 | 143 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
144 |
(f names, consts, bounds, fixes, binds, type_occs, maxidx, constraints)); |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
145 |
|
25325 | 146 |
fun map_consts f = |
61508 | 147 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
148 |
(names, f consts, bounds, fixes, binds, type_occs, maxidx, constraints)); |
|
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
149 |
|
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
150 |
fun map_bounds f = |
61508 | 151 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
152 |
(names, consts, f bounds, fixes, binds, type_occs, maxidx, constraints)); |
|
20162 | 153 |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
154 |
fun map_fixes f = |
61508 | 155 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
156 |
(names, consts, bounds, f fixes, binds, type_occs, maxidx, constraints)); |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
157 |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
158 |
fun map_binds f = |
61508 | 159 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
160 |
(names, consts, bounds, fixes, f binds, type_occs, maxidx, constraints)); |
|
24765 | 161 |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
162 |
fun map_type_occs f = |
61508 | 163 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
164 |
(names, consts, bounds, fixes, binds, f type_occs, maxidx, constraints)); |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
165 |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
166 |
fun map_maxidx f = |
61508 | 167 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
168 |
(names, consts, bounds, fixes, binds, type_occs, f maxidx, constraints)); |
|
20102 | 169 |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
170 |
fun map_constraints f = |
61508 | 171 |
map_data (fn (names, consts, bounds, fixes, binds, type_occs, maxidx, constraints) => |
172 |
(names, consts, bounds, fixes, binds, type_occs, maxidx, f constraints)); |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
173 |
|
45650 | 174 |
fun rep_data ctxt = Data.get ctxt |> (fn Data rep => rep); |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
175 |
|
20102 | 176 |
val names_of = #names o rep_data; |
177 |
val fixes_of = #fixes o rep_data; |
|
56025 | 178 |
val fixes_space = Name_Space.space_of_table o fixes_of; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
179 |
val binds_of = #binds o rep_data; |
20162 | 180 |
val type_occs_of = #type_occs o rep_data; |
24765 | 181 |
val maxidx_of = #maxidx o rep_data; |
20162 | 182 |
val constraints_of = #constraints o rep_data; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
183 |
|
20162 | 184 |
val is_declared = Name.is_declared o names_of; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
185 |
|
47021
f35f654f297d
clarified Binding.name_of vs Name_Space.base_name vs Variable.check_name (see also 9bd8d4addd6e, 3305f573294e);
wenzelm
parents:
47005
diff
changeset
|
186 |
val check_name = Name_Space.base_name o tap Binding.check; |
42357 | 187 |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
188 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
189 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
190 |
(** declarations **) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
191 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
192 |
(* default sorts and types *) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
193 |
|
20162 | 194 |
fun default_type ctxt x = Vartab.lookup (#1 (constraints_of ctxt)) (x, ~1); |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
195 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
196 |
fun def_type ctxt pattern xi = |
20162 | 197 |
let val {binds, constraints = (types, _), ...} = rep_data ctxt in |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
198 |
(case Vartab.lookup types xi of |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
199 |
NONE => |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
200 |
if pattern then NONE |
39290
44e4d8dfd6bf
load type_infer.ML later -- proper context for Type_Infer.infer_types;
wenzelm
parents:
38831
diff
changeset
|
201 |
else Vartab.lookup binds xi |> Option.map (Type.mark_polymorphic o #1) |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
202 |
| some => some) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
203 |
end; |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
204 |
|
20162 | 205 |
val def_sort = Vartab.lookup o #2 o constraints_of; |
206 |
||
207 |
||
59646 | 208 |
(* maxidx *) |
209 |
||
210 |
val declare_maxidx = map_maxidx o Integer.max; |
|
211 |
||
212 |
||
20162 | 213 |
(* names *) |
214 |
||
24765 | 215 |
fun declare_type_names t = |
29279 | 216 |
map_names (fold_types (fold_atyps Term.declare_typ_names) t) #> |
24765 | 217 |
map_maxidx (fold_types Term.maxidx_typ t); |
20162 | 218 |
|
219 |
fun declare_names t = |
|
220 |
declare_type_names t #> |
|
29279 | 221 |
map_names (fold_aterms Term.declare_term_frees t) #> |
24765 | 222 |
map_maxidx (Term.maxidx_term t); |
20162 | 223 |
|
224 |
||
225 |
(* type occurrences *) |
|
226 |
||
24719
21d1cdab2d8c
declare_constraints: declare (fix) type variables within constraints, but not terms themselves;
wenzelm
parents:
24694
diff
changeset
|
227 |
fun decl_type_occsT T = fold_atyps (fn TFree (a, _) => Symtab.default (a, []) | _ => I) T; |
21d1cdab2d8c
declare_constraints: declare (fix) type variables within constraints, but not terms themselves;
wenzelm
parents:
24694
diff
changeset
|
228 |
|
22671 | 229 |
val decl_type_occs = fold_term_types |
20162 | 230 |
(fn Free (x, _) => fold_atyps (fn TFree (a, _) => Symtab.insert_list (op =) (a, x) | _ => I) |
24719
21d1cdab2d8c
declare_constraints: declare (fix) type variables within constraints, but not terms themselves;
wenzelm
parents:
24694
diff
changeset
|
231 |
| _ => decl_type_occsT); |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
232 |
|
24719
21d1cdab2d8c
declare_constraints: declare (fix) type variables within constraints, but not terms themselves;
wenzelm
parents:
24694
diff
changeset
|
233 |
val declare_type_occsT = map_type_occs o fold_types decl_type_occsT; |
22671 | 234 |
val declare_type_occs = map_type_occs o decl_type_occs; |
235 |
||
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
236 |
|
20162 | 237 |
(* constraints *) |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
238 |
|
49685
4341e4d86872
allow position constraints to coexist with 0 or 1 sort constraints;
wenzelm
parents:
49674
diff
changeset
|
239 |
fun constrain_tvar (xi, raw_S) = |
49688 | 240 |
let val S = #2 (Term_Position.decode_positionS raw_S) |
49685
4341e4d86872
allow position constraints to coexist with 0 or 1 sort constraints;
wenzelm
parents:
49674
diff
changeset
|
241 |
in if S = dummyS then Vartab.delete_safe xi else Vartab.update (xi, S) end; |
21355 | 242 |
|
20162 | 243 |
fun declare_constraints t = map_constraints (fn (types, sorts) => |
244 |
let |
|
245 |
val types' = fold_aterms |
|
62955
2fd4378caca2
back to dummy constraints (amending dd2914250ca7): important for Syntax_Phases.get_free/is_declared;
wenzelm
parents:
62771
diff
changeset
|
246 |
(fn Free (x, T) => Vartab.update ((x, ~1), T) |
2fd4378caca2
back to dummy constraints (amending dd2914250ca7): important for Syntax_Phases.get_free/is_declared;
wenzelm
parents:
62771
diff
changeset
|
247 |
| Var v => Vartab.update v |
20162 | 248 |
| _ => I) t types; |
45426 | 249 |
val sorts' = (fold_types o fold_atyps) |
21355 | 250 |
(fn TFree (x, S) => constrain_tvar ((x, ~1), S) |
251 |
| TVar v => constrain_tvar v |
|
45426 | 252 |
| _ => I) t sorts; |
20162 | 253 |
in (types', sorts') end) |
24719
21d1cdab2d8c
declare_constraints: declare (fix) type variables within constraints, but not terms themselves;
wenzelm
parents:
24694
diff
changeset
|
254 |
#> declare_type_occsT t |
22711 | 255 |
#> declare_type_names t; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
256 |
|
20162 | 257 |
|
258 |
(* common declarations *) |
|
259 |
||
260 |
fun declare_internal t = |
|
261 |
declare_names t #> |
|
28625 | 262 |
declare_type_occs t #> |
61508 | 263 |
Thm.declare_term_sorts t; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
264 |
|
20162 | 265 |
fun declare_term t = |
266 |
declare_internal t #> |
|
267 |
declare_constraints t; |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
268 |
|
27280 | 269 |
val declare_typ = declare_term o Logic.mk_type; |
270 |
||
70843
cc987440d776
more compact XML: separate environment for free variables;
wenzelm
parents:
70733
diff
changeset
|
271 |
val declare_prf = |
cc987440d776
more compact XML: separate environment for free variables;
wenzelm
parents:
70733
diff
changeset
|
272 |
Proofterm.fold_proof_terms_types declare_internal (declare_internal o Logic.mk_type); |
20303 | 273 |
|
74241
eb265f54e3ce
more efficient operations: traverse hyps only when required;
wenzelm
parents:
74240
diff
changeset
|
274 |
val declare_thm = Thm.fold_terms {hyps = true} declare_internal; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
275 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
276 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
277 |
(* renaming term/type frees *) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
278 |
|
20162 | 279 |
fun variant_frees ctxt ts frees = |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
280 |
let |
20162 | 281 |
val names = names_of (fold declare_names ts ctxt); |
43326
47cf4bc789aa
simplified Name.variant -- discontinued builtin fold_map;
wenzelm
parents:
42495
diff
changeset
|
282 |
val xs = fst (fold_map Name.variant (map #1 frees) names); |
20084 | 283 |
in xs ~~ map snd frees end; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
284 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
285 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
286 |
|
20303 | 287 |
(** term bindings **) |
288 |
||
60401 | 289 |
fun bind_term ((x, i), t) = |
290 |
let |
|
291 |
val u = Term.close_schematic_term t; |
|
292 |
val U = Term.fastype_of u; |
|
293 |
in declare_term u #> map_binds (Vartab.update ((x, i), (U, u))) end; |
|
294 |
||
295 |
val unbind_term = map_binds o Vartab.delete_safe; |
|
296 |
||
297 |
fun maybe_bind_term (xi, SOME t) = bind_term (xi, t) |
|
298 |
| maybe_bind_term (xi, NONE) = unbind_term xi; |
|
20303 | 299 |
|
300 |
fun expand_binds ctxt = |
|
301 |
let |
|
302 |
val binds = binds_of ctxt; |
|
21799 | 303 |
val get = fn Var (xi, _) => Vartab.lookup binds xi | _ => NONE; |
304 |
in Envir.beta_norm o Envir.expand_term get end; |
|
20303 | 305 |
|
306 |
||
307 |
||
25325 | 308 |
(** consts **) |
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
309 |
|
25325 | 310 |
val lookup_const = Symtab.lookup o #consts o rep_data; |
311 |
val is_const = is_some oo lookup_const; |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
312 |
|
25325 | 313 |
val declare_fixed = map_consts o Symtab.delete_safe; |
314 |
val declare_const = map_consts o Symtab.update; |
|
25316
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
315 |
|
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
316 |
|
17c183417f93
added is_const/declare_const for local scope of fixes/consts;
wenzelm
parents:
25051
diff
changeset
|
317 |
|
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
318 |
(** bounds **) |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
319 |
|
74532 | 320 |
fun inc_bound (a, T) ctxt = |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
321 |
let |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
322 |
val b = Name.bound (#1 (#bounds (rep_data ctxt))); |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
323 |
val ctxt' = ctxt |> map_bounds (fn (next, bounds) => (next + 1, ((b, T), a) :: bounds)); |
55635 | 324 |
in (Free (b, T), ctxt') end; |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
325 |
|
74532 | 326 |
fun next_bound a ctxt = |
327 |
let val (x as Free (b, _), ctxt') = inc_bound a ctxt |
|
328 |
in if Name.is_declared (names_of ctxt') b then inc_bound a ctxt' else (x, ctxt') end; |
|
329 |
||
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
330 |
fun revert_bounds ctxt t = |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
331 |
(case #2 (#bounds (rep_data ctxt)) of |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
332 |
[] => t |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
333 |
| bounds => |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
334 |
let |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
335 |
val names = Term.declare_term_names t (names_of ctxt); |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
336 |
val xs = rev (#1 (fold_map Name.variant (rev (map #2 bounds)) names)); |
74539
f07761ee5a7f
more robust Variable.revert_bounds (see also b12f2cef3ee5);
wenzelm
parents:
74532
diff
changeset
|
337 |
fun substs (((b, T), _), x') = |
f07761ee5a7f
more robust Variable.revert_bounds (see also b12f2cef3ee5);
wenzelm
parents:
74532
diff
changeset
|
338 |
let fun subst U = (Free (b, U), Syntax_Trans.mark_bound_abs (x', U)) |
f07761ee5a7f
more robust Variable.revert_bounds (see also b12f2cef3ee5);
wenzelm
parents:
74532
diff
changeset
|
339 |
in [subst T, subst (Type_Annotation.ignore_type T)] end; |
f07761ee5a7f
more robust Variable.revert_bounds (see also b12f2cef3ee5);
wenzelm
parents:
74532
diff
changeset
|
340 |
in Term.subst_atomic (maps substs (bounds ~~ xs)) t end); |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
341 |
|
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
342 |
|
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
54740
diff
changeset
|
343 |
|
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
344 |
(** fixes **) |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
345 |
|
59798 | 346 |
(* inner body mode *) |
347 |
||
69575 | 348 |
val inner_body = Config.declare_bool ("inner_body", \<^here>) (K false); |
69576 | 349 |
val is_body = Config.apply inner_body; |
59798 | 350 |
val set_body = Config.put inner_body; |
69576 | 351 |
val restore_body = set_body o is_body; |
59798 | 352 |
|
353 |
||
59790 | 354 |
(* proper mode *) |
355 |
||
69575 | 356 |
val proper_fixes = Config.declare_bool ("proper_fixes", \<^here>) (K true); |
59790 | 357 |
val improper_fixes = Config.put proper_fixes false; |
69576 | 358 |
val restore_proper_fixes = Config.put proper_fixes o Config.apply proper_fixes; |
59790 | 359 |
|
360 |
fun is_improper ctxt x = |
|
59884 | 361 |
(case Name_Space.lookup (fixes_of ctxt) x of |
362 |
SOME (_, proper) => not proper |
|
59790 | 363 |
| NONE => false); |
364 |
||
365 |
||
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
366 |
(* specialized name space *) |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
367 |
|
59883 | 368 |
val is_fixed = Name_Space.defined o fixes_of; |
59846 | 369 |
fun is_newly_fixed inner outer = is_fixed inner andf (not o is_fixed outer); |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
370 |
|
42493
01430341fc79
more informative markup for fixed variables (via name space entry);
wenzelm
parents:
42488
diff
changeset
|
371 |
val fixed_ord = Name_Space.entry_ord o fixes_space; |
01430341fc79
more informative markup for fixed variables (via name space entry);
wenzelm
parents:
42488
diff
changeset
|
372 |
val intern_fixed = Name_Space.intern o fixes_space; |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
373 |
|
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
374 |
fun lookup_fixed ctxt x = |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
375 |
let val x' = intern_fixed ctxt x |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
376 |
in if is_fixed ctxt x' then SOME x' else NONE end; |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
377 |
|
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
378 |
fun revert_fixed ctxt x = |
59884 | 379 |
(case Name_Space.lookup (fixes_of ctxt) x of |
380 |
SOME (x', _) => if intern_fixed ctxt x' = x then x' else x |
|
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
381 |
| NONE => x); |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
382 |
|
45472 | 383 |
fun markup_fixed ctxt x = |
384 |
Name_Space.markup (fixes_space ctxt) x |
|
385 |
|> Markup.name (revert_fixed ctxt x); |
|
386 |
||
62987
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
387 |
fun markup ctxt x = |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
388 |
if is_improper ctxt x then Markup.improper |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
389 |
else if Name.is_skolem x then Markup.skolem |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
390 |
else Markup.free; |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
391 |
|
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
392 |
val markup_entity_def = Name_Space.markup_def o fixes_space; |
dc8a8a7559e7
highlighting of entity def/ref positions wrt. cursor;
wenzelm
parents:
62955
diff
changeset
|
393 |
|
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
394 |
fun dest_fixes ctxt = |
59790 | 395 |
Name_Space.fold_table (fn (x, (y, _)) => cons (y, x)) (fixes_of ctxt) [] |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
58668
diff
changeset
|
396 |
|> sort (Name_Space.entry_ord (fixes_space ctxt) o apply2 #2); |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
397 |
|
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
398 |
|
42482 | 399 |
(* collect variables *) |
400 |
||
401 |
fun add_free_names ctxt = |
|
402 |
fold_aterms (fn Free (x, _) => not (is_fixed ctxt x) ? insert (op =) x | _ => I); |
|
403 |
||
404 |
fun add_frees ctxt = |
|
405 |
fold_aterms (fn Free (x, T) => not (is_fixed ctxt x) ? insert (op =) (x, T) | _ => I); |
|
406 |
||
407 |
fun add_fixed_names ctxt = |
|
408 |
fold_aterms (fn Free (x, _) => is_fixed ctxt x ? insert (op =) x | _ => I); |
|
409 |
||
410 |
fun add_fixed ctxt = |
|
411 |
fold_aterms (fn Free (x, T) => is_fixed ctxt x ? insert (op =) (x, T) | _ => I); |
|
412 |
||
59846 | 413 |
fun add_newly_fixed ctxt' ctxt = |
414 |
fold_aterms (fn Free (x, T) => is_newly_fixed ctxt' ctxt x ? insert (op =) (x, T) | _ => I); |
|
415 |
||
42482 | 416 |
|
417 |
(* declarations *) |
|
418 |
||
20084 | 419 |
local |
420 |
||
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
421 |
fun err_dups dups = |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
422 |
error ("Duplicate fixed variable(s): " ^ commas (map Binding.print dups)); |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
423 |
|
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
424 |
fun new_fixed ((x, x'), pos) ctxt = |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
425 |
if is_some (lookup_fixed ctxt x') then err_dups [Binding.make (x, pos)] |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
426 |
else |
59790 | 427 |
let |
428 |
val proper = Config.get ctxt proper_fixes; |
|
61949 | 429 |
val context = Context.Proof ctxt |
430 |
|> Name_Space.map_naming (K Name_Space.global_naming) |
|
431 |
|> Context_Position.set_visible_generic false; |
|
59790 | 432 |
in |
47005
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
46869
diff
changeset
|
433 |
ctxt |
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
46869
diff
changeset
|
434 |
|> map_fixes |
59790 | 435 |
(Name_Space.define context true (Binding.make (x', pos), (x, proper)) #> snd #> |
58668 | 436 |
Name_Space.alias_table Name_Space.global_naming (Binding.make (x, pos)) x') |
47005
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
46869
diff
changeset
|
437 |
|> declare_fixed x |
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
46869
diff
changeset
|
438 |
|> declare_constraints (Syntax.free x') |
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
46869
diff
changeset
|
439 |
end; |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
440 |
|
71316 | 441 |
fun new_fixes names' args = |
20102 | 442 |
map_names (K names') #> |
71316 | 443 |
fold new_fixed args #> |
444 |
pair (map (#2 o #1) args); |
|
20084 | 445 |
|
446 |
in |
|
447 |
||
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
448 |
fun add_fixes_binding bs ctxt = |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
449 |
let |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
450 |
val _ = |
55948 | 451 |
(case filter (Name.is_skolem o Binding.name_of) bs of |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
452 |
[] => () |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
453 |
| bads => error ("Illegal internal Skolem constant(s): " ^ commas (map Binding.print bads))); |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
454 |
val _ = |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
58668
diff
changeset
|
455 |
(case duplicates (op = o apply2 Binding.name_of) bs of |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
456 |
[] => () |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
457 |
| dups => err_dups dups); |
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
458 |
|
42494 | 459 |
val xs = map check_name bs; |
20102 | 460 |
val names = names_of ctxt; |
20084 | 461 |
val (xs', names') = |
43326
47cf4bc789aa
simplified Name.variant -- discontinued builtin fold_map;
wenzelm
parents:
42495
diff
changeset
|
462 |
if is_body ctxt then fold_map Name.variant xs names |>> map Name.skolem |
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
463 |
else (xs, fold Name.declare xs names); |
71316 | 464 |
in ctxt |> new_fixes names' ((xs ~~ xs') ~~ map Binding.pos_of bs) end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
465 |
|
71317
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
466 |
fun variant_names ctxt raw_xs = |
20084 | 467 |
let |
20102 | 468 |
val names = names_of ctxt; |
55948 | 469 |
val xs = map (fn x => Name.clean x |> Name.is_internal x ? Name.internal) raw_xs; |
43326
47cf4bc789aa
simplified Name.variant -- discontinued builtin fold_map;
wenzelm
parents:
42495
diff
changeset
|
470 |
val (xs', names') = fold_map Name.variant xs names |>> (is_body ctxt ? map Name.skolem); |
71317
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
471 |
in (names', xs ~~ xs') end; |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
472 |
|
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
473 |
fun variant_fixes xs ctxt = |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
474 |
let val (names', vs) = variant_names ctxt xs; |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
475 |
in ctxt |> new_fixes names' (map (rpair Position.none) vs) end; |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
476 |
|
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
477 |
fun bound_fixes xs ctxt = |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
478 |
let |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
479 |
val (names', vs) = variant_names ctxt (map #1 xs); |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
480 |
val (ys, ctxt') = fold_map next_bound (map2 (fn (x', _) => fn (_, T) => (x', T)) vs xs) ctxt; |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
481 |
val fixes = map2 (fn (x, _) => fn Free (y, _) => ((x, y), Position.none)) vs ys; |
e58bc223f46c
more robust bound_fixes: external name does appear in "fixes" name space and could clash with direct fixes (e.g. via Subgoal.FOCUS within a global context);
wenzelm
parents:
71316
diff
changeset
|
482 |
in ctxt' |> new_fixes names' fixes end; |
20084 | 483 |
|
484 |
end; |
|
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
485 |
|
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
486 |
val add_fixes = add_fixes_binding o map Binding.name; |
20251 | 487 |
|
488 |
fun add_fixes_direct xs ctxt = ctxt |
|
489 |
|> set_body false |
|
490 |
|> (snd o add_fixes xs) |
|
491 |
|> restore_body ctxt; |
|
492 |
||
70733 | 493 |
fun add_fixes_implicit t ctxt = ctxt |
494 |
|> not (is_body ctxt) ? add_fixes_direct (rev (add_free_names ctxt t [])); |
|
495 |
||
59796 | 496 |
|
497 |
(* dummy patterns *) |
|
498 |
||
499 |
fun fix_dummy_patterns (Const ("Pure.dummy_pattern", T)) ctxt = |
|
61923
a10cc7fb1841
clarified context policy to allow multiple dummies;
wenzelm
parents:
61508
diff
changeset
|
500 |
let val ([x], ctxt') = ctxt |> set_body true |> add_fixes [Name.uu_] ||> restore_body ctxt |
59796 | 501 |
in (Free (x, T), ctxt') end |
502 |
| fix_dummy_patterns (Abs (x, T, b)) ctxt = |
|
503 |
let val (b', ctxt') = fix_dummy_patterns b ctxt |
|
504 |
in (Abs (x, T, b'), ctxt') end |
|
505 |
| fix_dummy_patterns (t $ u) ctxt = |
|
506 |
let |
|
507 |
val (t', ctxt') = fix_dummy_patterns t ctxt; |
|
508 |
val (u', ctxt'') = fix_dummy_patterns u ctxt'; |
|
509 |
in (t' $ u', ctxt'') end |
|
510 |
| fix_dummy_patterns a ctxt = (a, ctxt); |
|
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
511 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
512 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
513 |
|
22671 | 514 |
(** export -- generalize type/term variables (beware of closure sizes) **) |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
515 |
|
60823 | 516 |
fun gen_all ctxt th = |
517 |
let |
|
518 |
val i = Thm.maxidx_thm th (maxidx_of ctxt) + 1; |
|
519 |
fun gen (x, T) = Thm.forall_elim (Thm.cterm_of ctxt (Var ((x, i), T))); |
|
520 |
in fold gen (Drule.outer_params (Thm.prop_of th)) th end; |
|
60822 | 521 |
|
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
522 |
fun export_inst inner outer = |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
523 |
let |
20162 | 524 |
val declared_outer = is_declared outer; |
59846 | 525 |
val still_fixed = not o is_newly_fixed inner outer; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
526 |
|
42488
4638622bcaa1
reorganized fixes as specialized (global) name space;
wenzelm
parents:
42482
diff
changeset
|
527 |
val gen_fixes = |
74266 | 528 |
Names.build (fixes_of inner |> Name_Space.fold_table (fn (y, _) => |
529 |
not (is_fixed outer y) ? Names.add_set y)); |
|
22671 | 530 |
|
531 |
val type_occs_inner = type_occs_of inner; |
|
532 |
fun gen_fixesT ts = |
|
74266 | 533 |
Names.build (fold decl_type_occs ts type_occs_inner |> Symtab.fold (fn (a, xs) => |
20162 | 534 |
if declared_outer a orelse exists still_fixed xs |
74266 | 535 |
then I else Names.add_set a)); |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
536 |
in (gen_fixesT, gen_fixes) end; |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
537 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
538 |
fun exportT_inst inner outer = #1 (export_inst inner outer); |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
539 |
|
22671 | 540 |
fun exportT_terms inner outer = |
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
541 |
let |
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
542 |
val mk_tfrees = exportT_inst inner outer; |
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
543 |
val maxidx = maxidx_of outer; |
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
544 |
in |
22671 | 545 |
fn ts => ts |> map |
74266 | 546 |
(Term_Subst.generalize (mk_tfrees ts, Names.empty) |
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
547 |
(fold (Term.fold_types Term.maxidx_typ) ts maxidx + 1)) |
22671 | 548 |
end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
549 |
|
22671 | 550 |
fun export_terms inner outer = |
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
551 |
let |
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
552 |
val (mk_tfrees, tfrees) = export_inst inner outer; |
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
553 |
val maxidx = maxidx_of outer; |
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
554 |
in |
22671 | 555 |
fn ts => ts |> map |
74201 | 556 |
(Term_Subst.generalize (mk_tfrees ts, tfrees) |
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
557 |
(fold Term.maxidx_term ts maxidx + 1)) |
22671 | 558 |
end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
559 |
|
20303 | 560 |
fun export_prf inner outer prf = |
561 |
let |
|
22671 | 562 |
val (mk_tfrees, frees) = export_inst (declare_prf prf inner) outer; |
74201 | 563 |
val tfrees = mk_tfrees []; |
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
564 |
val maxidx = maxidx_of outer; |
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
565 |
val idx = Proofterm.maxidx_proof prf maxidx + 1; |
74201 | 566 |
val gen_term = Term_Subst.generalize_same (tfrees, frees) idx; |
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36610
diff
changeset
|
567 |
val gen_typ = Term_Subst.generalizeT_same tfrees idx; |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36610
diff
changeset
|
568 |
in Same.commit (Proofterm.map_proof_terms_same gen_term gen_typ) prf end; |
20303 | 569 |
|
22671 | 570 |
|
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
571 |
fun gen_export (mk_tfrees, frees) maxidx ths = |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
572 |
let |
22671 | 573 |
val tfrees = mk_tfrees (map Thm.full_prop_of ths); |
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
574 |
val idx = fold Thm.maxidx_thm ths maxidx + 1; |
74201 | 575 |
in map (Thm.generalize (tfrees, frees) idx) ths end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
576 |
|
74266 | 577 |
fun exportT inner outer = gen_export (exportT_inst inner outer, Names.empty) (maxidx_of outer); |
59645
f89464e9ffa0
clarified Variable.export: observe maxidx of target context;
wenzelm
parents:
59623
diff
changeset
|
578 |
fun export inner outer = gen_export (export_inst inner outer) (maxidx_of outer); |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
579 |
|
21522 | 580 |
fun export_morphism inner outer = |
581 |
let |
|
582 |
val fact = export inner outer; |
|
583 |
val term = singleton (export_terms inner outer); |
|
584 |
val typ = Logic.type_map term; |
|
54740 | 585 |
in |
70311 | 586 |
Morphism.transfer_morphism' inner $> |
587 |
Morphism.transfer_morphism' outer $> |
|
54740 | 588 |
Morphism.morphism "Variable.export" {binding = [], typ = [typ], term = [term], fact = [fact]} |
589 |
end; |
|
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
590 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
591 |
|
24765 | 592 |
|
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
593 |
(** import -- fix schematic type/term variables **) |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
594 |
|
59796 | 595 |
fun invent_types Ss ctxt = |
596 |
let |
|
597 |
val tfrees = Name.invent (names_of ctxt) Name.aT (length Ss) ~~ Ss; |
|
598 |
val ctxt' = fold (declare_constraints o Logic.mk_type o TFree) tfrees ctxt; |
|
599 |
in (tfrees, ctxt') end; |
|
600 |
||
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
601 |
fun importT_inst ts ctxt = |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
602 |
let |
74281 | 603 |
val tvars = TVars.build (fold TVars.add_tvars ts) |> TVars.list_set; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
604 |
val (tfrees, ctxt') = invent_types (map #2 tvars) ctxt; |
74266 | 605 |
val instT = TVars.build (fold2 (fn a => fn b => TVars.add (a, TFree b)) tvars tfrees); |
74220
c49134ee16c1
more scalable data structure (but: rarely used many arguments);
wenzelm
parents:
74201
diff
changeset
|
606 |
in (instT, ctxt') end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
607 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
608 |
fun import_inst is_open ts ctxt = |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
609 |
let |
26714
4773b832f1b1
variant_fixes: preserve internal state, mark skolem only for body mode;
wenzelm
parents:
25573
diff
changeset
|
610 |
val ren = Name.clean #> (if is_open then I else Name.internal); |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
611 |
val (instT, ctxt') = importT_inst ts ctxt; |
74281 | 612 |
val vars = |
613 |
Vars.build (fold Vars.add_vars ts) |> Vars.list_set |
|
614 |
|> map (apsnd (Term_Subst.instantiateT instT)); |
|
74220
c49134ee16c1
more scalable data structure (but: rarely used many arguments);
wenzelm
parents:
74201
diff
changeset
|
615 |
val (ys, ctxt'') = variant_fixes (map (ren o #1 o #1) vars) ctxt'; |
74266 | 616 |
val inst = Vars.build (fold2 (fn (x, T) => fn y => Vars.add ((x, T), Free (y, T))) vars ys); |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
617 |
in ((instT, inst), ctxt'') end; |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
618 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
619 |
fun importT_terms ts ctxt = |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
620 |
let val (instT, ctxt') = importT_inst ts ctxt |
74266 | 621 |
in (map (Term_Subst.instantiate (instT, Vars.empty)) ts, ctxt') end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
622 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
623 |
fun import_terms is_open ts ctxt = |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
624 |
let val (inst, ctxt') = import_inst is_open ts ctxt |
31977 | 625 |
in (map (Term_Subst.instantiate inst) ts, ctxt') end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
626 |
|
31794
71af1fd6a5e4
renamed Variable.import_thms to Variable.import (back again cf. ed7aa5a350ef -- Alice is no longer supported);
wenzelm
parents:
30756
diff
changeset
|
627 |
fun importT ths ctxt = |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
628 |
let |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
629 |
val (instT, ctxt') = importT_inst (map Thm.full_prop_of ths) ctxt; |
74266 | 630 |
val instT' = TVars.map (K (Thm.ctyp_of ctxt')) instT; |
74282 | 631 |
val ths' = map (Thm.instantiate (instT', Vars.empty)) ths; |
32280
4fb3f426052a
Variable.importT/import: return full instantiations, tuned;
wenzelm
parents:
32199
diff
changeset
|
632 |
in ((instT', ths'), ctxt') end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
633 |
|
20303 | 634 |
fun import_prf is_open prf ctxt = |
635 |
let |
|
70843
cc987440d776
more compact XML: separate environment for free variables;
wenzelm
parents:
70733
diff
changeset
|
636 |
val ts = rev (Proofterm.fold_proof_terms_types cons (cons o Logic.mk_type) prf []); |
20303 | 637 |
val (insts, ctxt') = import_inst is_open ts ctxt; |
638 |
in (Proofterm.instantiate insts prf, ctxt') end; |
|
639 |
||
31794
71af1fd6a5e4
renamed Variable.import_thms to Variable.import (back again cf. ed7aa5a350ef -- Alice is no longer supported);
wenzelm
parents:
30756
diff
changeset
|
640 |
fun import is_open ths ctxt = |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
641 |
let |
60805 | 642 |
val ((instT, inst), ctxt') = import_inst is_open (map Thm.full_prop_of ths) ctxt; |
74266 | 643 |
val instT' = TVars.map (K (Thm.ctyp_of ctxt')) instT; |
644 |
val inst' = Vars.map (K (Thm.cterm_of ctxt')) inst; |
|
74282 | 645 |
val ths' = map (Thm.instantiate (instT', inst')) ths; |
74220
c49134ee16c1
more scalable data structure (but: rarely used many arguments);
wenzelm
parents:
74201
diff
changeset
|
646 |
in (((instT', inst'), ths'), ctxt') end; |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
647 |
|
70304 | 648 |
fun import_vars ctxt th = |
649 |
let val ((_, [th']), _) = ctxt |> set_body false |> import true [th]; |
|
650 |
in th' end; |
|
651 |
||
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
652 |
|
19926 | 653 |
(* import/export *) |
654 |
||
21287 | 655 |
fun gen_trade imp exp f ctxt ths = |
20220 | 656 |
let val ((_, ths'), ctxt') = imp ths ctxt |
21287 | 657 |
in exp ctxt' ctxt (f ctxt' ths') end; |
19926 | 658 |
|
31794
71af1fd6a5e4
renamed Variable.import_thms to Variable.import (back again cf. ed7aa5a350ef -- Alice is no longer supported);
wenzelm
parents:
30756
diff
changeset
|
659 |
val tradeT = gen_trade importT exportT; |
71af1fd6a5e4
renamed Variable.import_thms to Variable.import (back again cf. ed7aa5a350ef -- Alice is no longer supported);
wenzelm
parents:
30756
diff
changeset
|
660 |
val trade = gen_trade (import true) export; |
19926 | 661 |
|
662 |
||
74525
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
663 |
(* destruct binders *) |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
664 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
665 |
local |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
666 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
667 |
fun gen_dest_abs exn dest term_of arg ctxt = |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
668 |
(case term_of arg of |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
669 |
Abs (a, T, _) => |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
670 |
let |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
671 |
val (x, ctxt') = yield_singleton bound_fixes (a, T) ctxt; |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
672 |
val res = dest x arg handle Term.USED_FREE _ => |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
673 |
raise Fail ("Bad context: clash of fresh free for bound: " ^ |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
674 |
Syntax.string_of_term ctxt (Free (x, T)) ^ " vs. " ^ |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
675 |
Syntax.string_of_term ctxt' (Free (x, T))); |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
676 |
in (res, ctxt') end |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
677 |
| _ => raise exn ("dest_abs", [arg])); |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
678 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
679 |
in |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
680 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
681 |
val dest_abs = gen_dest_abs TERM Term.dest_abs_fresh I; |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
682 |
val dest_abs_cterm = gen_dest_abs CTERM Thm.dest_abs_fresh Thm.term_of; |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
683 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
684 |
fun dest_all t ctxt = |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
685 |
(case t of |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
686 |
Const ("Pure.all", _) $ u => dest_abs u ctxt |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
687 |
| _ => raise TERM ("dest_all", [t])); |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
688 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
689 |
fun dest_all_cterm ct ctxt = |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
690 |
(case Thm.term_of ct of |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
691 |
Const ("Pure.all", _) $ _ => dest_abs_cterm (Thm.dest_arg ct) ctxt |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
692 |
| _ => raise CTERM ("dest_all", [ct])); |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
693 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
694 |
end; |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
695 |
|
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74282
diff
changeset
|
696 |
|
67721 | 697 |
(* focus on outermost parameters: \<And>x y z. B *) |
42495
1af81b70cf09
clarified Variable.focus vs. Variable.focus_cterm -- eliminated clone;
wenzelm
parents:
42494
diff
changeset
|
698 |
|
69575 | 699 |
val bound_focus = Config.declare_bool ("bound_focus", \<^here>) (K false); |
69576 | 700 |
val is_bound_focus = Config.apply bound_focus; |
60707
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
701 |
val set_bound_focus = Config.put bound_focus; |
69576 | 702 |
val restore_bound_focus = set_bound_focus o is_bound_focus; |
60707
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
703 |
|
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
704 |
fun focus_params bindings t ctxt = |
42495
1af81b70cf09
clarified Variable.focus vs. Variable.focus_cterm -- eliminated clone;
wenzelm
parents:
42494
diff
changeset
|
705 |
let |
60707
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
706 |
val ps = Term.variant_frees t (Term.strip_all_vars t); (*as they are printed :-*) |
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
707 |
val (xs, Ts) = split_list ps; |
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
708 |
val (xs', ctxt') = |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
709 |
(case bindings of |
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
710 |
SOME bs => ctxt |> set_body true |> add_fixes_binding bs ||> restore_body ctxt |
60707
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
711 |
| NONE => if is_bound_focus ctxt then bound_fixes ps ctxt else variant_fixes xs ctxt); |
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
712 |
val ps' = xs' ~~ Ts; |
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
713 |
val ctxt'' = ctxt' |> fold (declare_constraints o Free) ps'; |
e96b7be56d44
SUBPROOF and Subgoal.FOCUS combinators use anonymous quasi-bound variables (like the Simplifier);
wenzelm
parents:
60695
diff
changeset
|
714 |
in ((xs, ps'), ctxt'') end; |
42495
1af81b70cf09
clarified Variable.focus vs. Variable.focus_cterm -- eliminated clone;
wenzelm
parents:
42494
diff
changeset
|
715 |
|
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
716 |
fun focus bindings t ctxt = |
42495
1af81b70cf09
clarified Variable.focus vs. Variable.focus_cterm -- eliminated clone;
wenzelm
parents:
42494
diff
changeset
|
717 |
let |
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
718 |
val ((xs, ps), ctxt') = focus_params bindings t ctxt; |
42495
1af81b70cf09
clarified Variable.focus vs. Variable.focus_cterm -- eliminated clone;
wenzelm
parents:
42494
diff
changeset
|
719 |
val t' = Term.subst_bounds (rev (map Free ps), Term.strip_all_body t); |
1af81b70cf09
clarified Variable.focus vs. Variable.focus_cterm -- eliminated clone;
wenzelm
parents:
42494
diff
changeset
|
720 |
in (((xs ~~ ps), t'), ctxt') end; |
20149 | 721 |
|
722 |
fun forall_elim_prop t prop = |
|
46497
89ccf66aa73d
renamed Thm.capply to Thm.apply, and Thm.cabs to Thm.lambda in conformance with similar operations in structure Term and Logic;
wenzelm
parents:
45666
diff
changeset
|
723 |
Thm.beta_conversion false (Thm.apply (Thm.dest_arg prop) t) |
20579 | 724 |
|> Thm.cprop_of |> Thm.dest_arg; |
20149 | 725 |
|
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
726 |
fun focus_cterm bindings goal ctxt = |
20149 | 727 |
let |
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
728 |
val ((xs, ps), ctxt') = focus_params bindings (Thm.term_of goal) ctxt; |
59623 | 729 |
val ps' = map (Thm.cterm_of ctxt' o Free) ps; |
20220 | 730 |
val goal' = fold forall_elim_prop ps' goal; |
42495
1af81b70cf09
clarified Variable.focus vs. Variable.focus_cterm -- eliminated clone;
wenzelm
parents:
42494
diff
changeset
|
731 |
in ((xs ~~ ps', goal'), ctxt') end; |
20149 | 732 |
|
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
733 |
fun focus_subgoal bindings i st = |
74241
eb265f54e3ce
more efficient operations: traverse hyps only when required;
wenzelm
parents:
74240
diff
changeset
|
734 |
let |
74266 | 735 |
val all_vars = Vars.build (Thm.fold_terms {hyps = false} Vars.add_vars st); |
74241
eb265f54e3ce
more efficient operations: traverse hyps only when required;
wenzelm
parents:
74240
diff
changeset
|
736 |
in |
74266 | 737 |
Vars.fold (unbind_term o #1 o #1) all_vars #> |
738 |
Vars.fold (declare_constraints o Var o #1) all_vars #> |
|
60695
757549b4bbe6
Variable.focus etc.: optional bindings provided by user;
wenzelm
parents:
60642
diff
changeset
|
739 |
focus_cterm bindings (Thm.cprem_of st i) |
20303 | 740 |
end; |
741 |
||
742 |
||
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
743 |
|
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
744 |
(** implicit polymorphism **) |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
745 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
746 |
(* warn_extra_tfrees *) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
747 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
748 |
fun warn_extra_tfrees ctxt1 ctxt2 = |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
749 |
let |
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
750 |
fun occs_typ a = Term.exists_subtype (fn TFree (b, _) => a = b | _ => false); |
20162 | 751 |
fun occs_free a x = |
752 |
(case def_type ctxt1 false (x, ~1) of |
|
753 |
SOME T => if occs_typ a T then I else cons (a, x) |
|
754 |
| NONE => cons (a, x)); |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
755 |
|
20162 | 756 |
val occs1 = type_occs_of ctxt1; |
757 |
val occs2 = type_occs_of ctxt2; |
|
19911
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
758 |
val extras = Symtab.fold (fn (a, xs) => |
300bc6ce970d
major reworking of export functionality -- based on Term/Thm.generalize;
wenzelm
parents:
19899
diff
changeset
|
759 |
if Symtab.defined occs1 a then I else fold (occs_free a) xs) occs2 []; |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
760 |
val tfrees = map #1 extras |> sort_distinct string_ord; |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
761 |
val frees = map #2 extras |> sort_distinct string_ord; |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
762 |
in |
38831
4933a3dfd745
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
37145
diff
changeset
|
763 |
if null extras orelse not (Context_Position.is_visible ctxt2) then () |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
764 |
else warning ("Introduced fixed type variable(s): " ^ commas tfrees ^ " in " ^ |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
765 |
space_implode " or " (map quote frees)) |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
766 |
end; |
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
767 |
|
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
768 |
|
20149 | 769 |
(* polymorphic terms *) |
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
770 |
|
24694 | 771 |
fun polymorphic_types ctxt ts = |
20003 | 772 |
let |
773 |
val ctxt' = fold declare_term ts ctxt; |
|
20162 | 774 |
val occs = type_occs_of ctxt; |
775 |
val occs' = type_occs_of ctxt'; |
|
74200
17090e27aae9
more scalable data structure (but: rarely used with > 5 arguments);
wenzelm
parents:
71317
diff
changeset
|
776 |
val types = |
74266 | 777 |
Names.build (occs' |> Symtab.fold (fn (a, _) => |
778 |
if Symtab.defined occs a then I else Names.add_set a)); |
|
24765 | 779 |
val idx = maxidx_of ctxt' + 1; |
24694 | 780 |
val Ts' = (fold o fold_types o fold_atyps) |
781 |
(fn T as TFree _ => |
|
31977 | 782 |
(case Term_Subst.generalizeT types idx T of TVar v => insert (op =) v | _ => I) |
24694 | 783 |
| _ => I) ts []; |
74266 | 784 |
val ts' = map (Term_Subst.generalize (types, Names.empty) idx) ts; |
24694 | 785 |
in (rev Ts', ts') end; |
786 |
||
787 |
fun polymorphic ctxt ts = snd (polymorphic_types ctxt ts); |
|
20003 | 788 |
|
19899
b7385ca02d79
Fixed type/term variables and polymorphic term abbreviations.
wenzelm
parents:
diff
changeset
|
789 |
end; |