| author | blanchet | 
| Thu, 26 Jun 2014 13:35:17 +0200 | |
| changeset 57364 | c1060d10089f | 
| parent 56139 | b7add947a6ef | 
| child 58942 | 97f0ba373b1a | 
| permissions | -rw-r--r-- | 
| 256 | 1 | (* Title: Pure/type.ML | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 2 | Author: Tobias Nipkow, Lawrence C Paulson, and Markus Wenzel | 
| 0 | 3 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 4 | Type signatures and certified types, special treatment of type vars, | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 5 | matching and unification of types, extend and merge type signatures. | 
| 0 | 6 | *) | 
| 7 | ||
| 8 | signature TYPE = | |
| 2964 | 9 | sig | 
| 39288 | 10 | (*constraints*) | 
| 39290 
44e4d8dfd6bf
load type_infer.ML later -- proper context for Type_Infer.infer_types;
 wenzelm parents: 
39289diff
changeset | 11 | val mark_polymorphic: typ -> typ | 
| 39288 | 12 | val constraint: typ -> term -> term | 
| 45445 
41e641a870de
pass term positions into check phase, where resulting types are reported accordingly, and eventually shown as tooltips;
 wenzelm parents: 
44116diff
changeset | 13 | val constraint_type: Proof.context -> typ -> typ | 
| 39292 
6f085332c7d3
Type_Infer.preterm: eliminated separate Constraint;
 wenzelm parents: 
39290diff
changeset | 14 | val strip_constraints: term -> term | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 15 | val appl_error: Proof.context -> term -> typ -> term -> typ -> string | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 16 | (*type signatures and certified types*) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 17 | datatype decl = | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 18 | LogicalType of int | | 
| 14989 | 19 | Abbreviation of string list * typ * bool | | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 20 | Nonterminal | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 21 | type tsig | 
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 22 | val eq_tsig: tsig * tsig -> bool | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 23 | val rep_tsig: tsig -> | 
| 33095 
bbd52d2f8696
renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
 wenzelm parents: 
33094diff
changeset | 24 |    {classes: Name_Space.T * Sorts.algebra,
 | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 25 | default: sort, | 
| 33173 
b8ca12f6681a
eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
 wenzelm parents: 
33097diff
changeset | 26 | types: decl Name_Space.table, | 
| 26641 | 27 | log_types: string list} | 
| 56056 
4d46d53566e6
more efficient local theory operations, by imposing a linear change discipline on the main types/consts tables, in order to speed-up Proof_Context.transfer_syntax required for Local_Theory.raw_theory_result;
 wenzelm parents: 
56050diff
changeset | 28 | val change_base: bool -> tsig -> tsig | 
| 56139 
b7add947a6ef
more frugal recording of changes: join merely requires information from one side;
 wenzelm parents: 
56056diff
changeset | 29 | val change_ignore: tsig -> tsig | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 30 | val empty_tsig: tsig | 
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 31 | val class_space: tsig -> Name_Space.T | 
| 35680 | 32 | val class_alias: Name_Space.naming -> binding -> string -> tsig -> tsig | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 33 | val defaultS: tsig -> sort | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 34 | val logical_types: tsig -> string list | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 35 | val eq_sort: tsig -> sort * sort -> bool | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 36 | val subsort: tsig -> sort * sort -> bool | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 37 | val of_sort: tsig -> typ * sort -> bool | 
| 19464 | 38 | val inter_sort: tsig -> sort * sort -> sort | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 39 | val cert_class: tsig -> class -> class | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 40 | val cert_sort: tsig -> sort -> sort | 
| 36447 | 41 | val minimize_sort: tsig -> sort -> sort | 
| 31946 
99ac0321cd47
witness_sorts: proper type witnesses for hyps, not invented "'hyp" variables;
 wenzelm parents: 
30343diff
changeset | 42 | val witness_sorts: tsig -> (typ * sort) list -> sort list -> (typ * sort) list | 
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 43 | type mode | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 44 | val mode_default: mode | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 45 | val mode_syntax: mode | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 46 | val mode_abbrev: mode | 
| 24484 | 47 | val get_mode: Proof.context -> mode | 
| 48 | val set_mode: mode -> Proof.context -> Proof.context | |
| 49 | val restore_mode: Proof.context -> Proof.context -> Proof.context | |
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 50 | val type_space: tsig -> Name_Space.T | 
| 35680 | 51 | val type_alias: Name_Space.naming -> binding -> string -> tsig -> tsig | 
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 52 | val is_logtype: tsig -> string -> bool | 
| 55922 
710bc66f432c
more markup for inner syntax class/type names (notably for completion);
 wenzelm parents: 
55841diff
changeset | 53 | val check_decl: Context.generic -> tsig -> | 
| 
710bc66f432c
more markup for inner syntax class/type names (notably for completion);
 wenzelm parents: 
55841diff
changeset | 54 | xstring * Position.T -> (string * Position.report list) * decl | 
| 42468 | 55 | val the_decl: tsig -> string * Position.T -> decl | 
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 56 | val cert_typ_mode: mode -> tsig -> typ -> typ | 
| 14993 | 57 | val cert_typ: tsig -> typ -> typ | 
| 19464 | 58 | val arity_number: tsig -> string -> int | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 59 | val arity_sorts: Context.pretty -> tsig -> string -> sort -> sort list | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 60 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 61 | (*special treatment of type vars*) | 
| 36621 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 62 | val sort_of_atyp: typ -> sort | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 63 | val strip_sorts: typ -> typ | 
| 49687 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 64 | val strip_sorts_dummy: typ -> typ | 
| 621 | 65 | val no_tvars: typ -> typ | 
| 35845 
e5980f0ad025
renamed varify/unvarify operations to varify_global/unvarify_global to emphasize that these only work in a global situation;
 wenzelm parents: 
35680diff
changeset | 66 | val varify_global: (string * sort) list -> term -> ((string * sort) * indexname) list * term | 
| 33832 | 67 | val legacy_freeze_thaw_type: typ -> typ * (typ -> typ) | 
| 68 | val legacy_freeze_type: typ -> typ | |
| 69 | val legacy_freeze_thaw: term -> term * (term -> term) | |
| 70 | val legacy_freeze: term -> term | |
| 2964 | 71 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 72 | (*matching and unification*) | 
| 2964 | 73 | exception TYPE_MATCH | 
| 25324 | 74 | type tyenv = (sort * typ) Vartab.table | 
| 26327 | 75 | val lookup: tyenv -> indexname * sort -> typ option | 
| 32648 
143e0b0a6b33
Correct chasing of type variable instantiations during type unification.
 paulson parents: 
32030diff
changeset | 76 | val devar: tyenv -> typ -> typ | 
| 16946 | 77 | val typ_match: tsig -> typ * typ -> tyenv -> tyenv | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 78 | val typ_instance: tsig -> typ * typ -> bool | 
| 16946 | 79 | val raw_match: typ * typ -> tyenv -> tyenv | 
| 19694 | 80 | val raw_matches: typ list * typ list -> tyenv -> tyenv | 
| 56050 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 81 | val could_match: typ * typ -> bool | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 82 | val could_matches: typ list * typ list -> bool | 
| 16946 | 83 | val raw_instance: typ * typ -> bool | 
| 2964 | 84 | exception TUNIFY | 
| 16946 | 85 | val unify: tsig -> typ * typ -> tyenv * int -> tyenv * int | 
| 86 | val raw_unify: typ * typ -> tyenv -> tyenv | |
| 19696 | 87 | val raw_unifys: typ list * typ list -> tyenv -> tyenv | 
| 17804 | 88 | val could_unify: typ * typ -> bool | 
| 19696 | 89 | val could_unifys: typ list * typ list -> bool | 
| 16650 | 90 | val eq_type: tyenv -> typ * typ -> bool | 
| 0 | 91 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 92 | (*extend and merge type signatures*) | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 93 | val add_class: Context.generic -> binding * class list -> tsig -> tsig | 
| 26669 | 94 | val hide_class: bool -> string -> tsig -> tsig | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 95 | val set_defsort: sort -> tsig -> tsig | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 96 | val add_type: Context.generic -> binding * int -> tsig -> tsig | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 97 | val add_abbrev: Context.generic -> binding * string list * typ -> tsig -> tsig | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 98 | val add_nonterminal: Context.generic -> binding -> tsig -> tsig | 
| 26669 | 99 | val hide_type: bool -> string -> tsig -> tsig | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 100 | val add_arity: Context.pretty -> arity -> tsig -> tsig | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 101 | val add_classrel: Context.pretty -> class * class -> tsig -> tsig | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 102 | val merge_tsig: Context.pretty -> tsig * tsig -> tsig | 
| 2964 | 103 | end; | 
| 104 | ||
| 105 | structure Type: TYPE = | |
| 0 | 106 | struct | 
| 107 | ||
| 39288 | 108 | (** constraints **) | 
| 109 | ||
| 39290 
44e4d8dfd6bf
load type_infer.ML later -- proper context for Type_Infer.infer_types;
 wenzelm parents: 
39289diff
changeset | 110 | (*indicate polymorphic Vars*) | 
| 
44e4d8dfd6bf
load type_infer.ML later -- proper context for Type_Infer.infer_types;
 wenzelm parents: 
39289diff
changeset | 111 | fun mark_polymorphic T = Type ("_polymorphic_", [T]);
 | 
| 
44e4d8dfd6bf
load type_infer.ML later -- proper context for Type_Infer.infer_types;
 wenzelm parents: 
39289diff
changeset | 112 | |
| 39288 | 113 | fun constraint T t = | 
| 114 | if T = dummyT then t | |
| 115 |   else Const ("_type_constraint_", T --> T) $ t;
 | |
| 116 | ||
| 45445 
41e641a870de
pass term positions into check phase, where resulting types are reported accordingly, and eventually shown as tooltips;
 wenzelm parents: 
44116diff
changeset | 117 | fun constraint_type ctxt T = | 
| 
41e641a870de
pass term positions into check phase, where resulting types are reported accordingly, and eventually shown as tooltips;
 wenzelm parents: 
44116diff
changeset | 118 |   let fun err () = error ("Malformed internal type constraint: " ^ Syntax.string_of_typ ctxt T);
 | 
| 
41e641a870de
pass term positions into check phase, where resulting types are reported accordingly, and eventually shown as tooltips;
 wenzelm parents: 
44116diff
changeset | 119 |   in (case T of Type ("fun", [A, B]) => if A = B then A else err () | _ => err ()) end;
 | 
| 
41e641a870de
pass term positions into check phase, where resulting types are reported accordingly, and eventually shown as tooltips;
 wenzelm parents: 
44116diff
changeset | 120 | |
| 39292 
6f085332c7d3
Type_Infer.preterm: eliminated separate Constraint;
 wenzelm parents: 
39290diff
changeset | 121 | fun strip_constraints (Const ("_type_constraint_", _) $ t) = strip_constraints t
 | 
| 
6f085332c7d3
Type_Infer.preterm: eliminated separate Constraint;
 wenzelm parents: 
39290diff
changeset | 122 | | strip_constraints (t $ u) = strip_constraints t $ strip_constraints u | 
| 
6f085332c7d3
Type_Infer.preterm: eliminated separate Constraint;
 wenzelm parents: 
39290diff
changeset | 123 | | strip_constraints (Abs (x, T, t)) = Abs (x, T, strip_constraints t) | 
| 
6f085332c7d3
Type_Infer.preterm: eliminated separate Constraint;
 wenzelm parents: 
39290diff
changeset | 124 | | strip_constraints a = a; | 
| 
6f085332c7d3
Type_Infer.preterm: eliminated separate Constraint;
 wenzelm parents: 
39290diff
changeset | 125 | |
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 126 | fun appl_error ctxt (Const ("_type_constraint_", Type ("fun", [T, _]))) _ u U =
 | 
| 39289 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 127 | cat_lines | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 128 | ["Failed to meet type constraint:", "", | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 129 | Pretty.string_of (Pretty.block | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 130 | [Pretty.str "Term:", Pretty.brk 2, Syntax.pretty_term ctxt u, | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 131 | Pretty.str " ::", Pretty.brk 1, Syntax.pretty_typ ctxt U]), | 
| 39289 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 132 | Pretty.string_of (Pretty.block | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 133 | [Pretty.str "Type:", Pretty.brk 2, Syntax.pretty_typ ctxt T])] | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 134 | | appl_error ctxt t T u U = | 
| 39289 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 135 | cat_lines | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 136 | ["Type error in application: " ^ | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 137 | (case T of | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 138 |             Type ("fun", _) => "incompatible operand type"
 | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 139 | | _ => "operator not of function type"), | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 140 | "", | 
| 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 141 | Pretty.string_of (Pretty.block | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 142 | [Pretty.str "Operator:", Pretty.brk 2, Syntax.pretty_term ctxt t, | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 143 | Pretty.str " ::", Pretty.brk 1, Syntax.pretty_typ ctxt T]), | 
| 39289 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 144 | Pretty.string_of (Pretty.block | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 145 | [Pretty.str "Operand:", Pretty.brk 3, Syntax.pretty_term ctxt u, | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42381diff
changeset | 146 | Pretty.str " ::", Pretty.brk 1, Syntax.pretty_typ ctxt U])]; | 
| 39289 
92b50c8bb67b
common Type.appl_error, which also covers explicit constraints;
 wenzelm parents: 
39288diff
changeset | 147 | |
| 39288 | 148 | |
| 149 | ||
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 150 | (** type signatures and certified types **) | 
| 2964 | 151 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 152 | (* type declarations *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 153 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 154 | datatype decl = | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 155 | LogicalType of int | | 
| 14989 | 156 | Abbreviation of string list * typ * bool | | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 157 | Nonterminal; | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 158 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 159 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 160 | (* type tsig *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 161 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 162 | datatype tsig = | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 163 |   TSig of {
 | 
| 33095 
bbd52d2f8696
renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
 wenzelm parents: 
33094diff
changeset | 164 | classes: Name_Space.T * Sorts.algebra, (*order-sorted algebra of type classes*) | 
| 16370 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 165 | default: sort, (*default sort on input*) | 
| 33173 
b8ca12f6681a
eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
 wenzelm parents: 
33097diff
changeset | 166 | types: decl Name_Space.table, (*declared types*) | 
| 26641 | 167 | log_types: string list}; (*logical types sorted by number of arguments*) | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 168 | |
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 169 | fun eq_tsig | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 170 |    (TSig {classes = classes1, default = default1, types = types1, log_types = _},
 | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 171 |     TSig {classes = classes2, default = default2, types = types2, log_types = _}) =
 | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 172 | pointer_eq (classes1, classes2) andalso | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 173 | default1 = default2 andalso | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 174 | pointer_eq (types1, types2); | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 175 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 176 | fun rep_tsig (TSig comps) = comps; | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 177 | |
| 26641 | 178 | fun make_tsig (classes, default, types, log_types) = | 
| 179 |   TSig {classes = classes, default = default, types = types, log_types = log_types};
 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 180 | |
| 56056 
4d46d53566e6
more efficient local theory operations, by imposing a linear change discipline on the main types/consts tables, in order to speed-up Proof_Context.transfer_syntax required for Local_Theory.raw_theory_result;
 wenzelm parents: 
56050diff
changeset | 181 | fun change_base begin (TSig {classes, default, types, log_types}) =
 | 
| 
4d46d53566e6
more efficient local theory operations, by imposing a linear change discipline on the main types/consts tables, in order to speed-up Proof_Context.transfer_syntax required for Local_Theory.raw_theory_result;
 wenzelm parents: 
56050diff
changeset | 182 | make_tsig (classes, default, Name_Space.change_base begin types, log_types); | 
| 
4d46d53566e6
more efficient local theory operations, by imposing a linear change discipline on the main types/consts tables, in order to speed-up Proof_Context.transfer_syntax required for Local_Theory.raw_theory_result;
 wenzelm parents: 
56050diff
changeset | 183 | |
| 56139 
b7add947a6ef
more frugal recording of changes: join merely requires information from one side;
 wenzelm parents: 
56056diff
changeset | 184 | fun change_ignore (TSig {classes, default, types, log_types}) =
 | 
| 
b7add947a6ef
more frugal recording of changes: join merely requires information from one side;
 wenzelm parents: 
56056diff
changeset | 185 | make_tsig (classes, default, Name_Space.change_ignore types, log_types); | 
| 
b7add947a6ef
more frugal recording of changes: join merely requires information from one side;
 wenzelm parents: 
56056diff
changeset | 186 | |
| 33094 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 187 | fun build_tsig (classes, default, types) = | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 188 | let | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 189 | val log_types = | 
| 56025 | 190 | Name_Space.fold_table (fn (c, LogicalType n) => cons (c, n) | _ => I) types [] | 
| 33094 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 191 | |> Library.sort (int_ord o pairself snd) |> map fst; | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 192 | in make_tsig (classes, default, types, log_types) end; | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 193 | |
| 26641 | 194 | fun map_tsig f (TSig {classes, default, types, log_types = _}) =
 | 
| 19642 | 195 | build_tsig (f (classes, default, types)); | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 196 | |
| 16370 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 197 | val empty_tsig = | 
| 50201 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
49687diff
changeset | 198 | build_tsig ((Name_Space.empty Markup.classN, Sorts.empty_algebra), [], | 
| 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
49687diff
changeset | 199 | Name_Space.empty_table Markup.type_nameN); | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 200 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 201 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 202 | (* classes and sorts *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 203 | |
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 204 | val class_space = #1 o #classes o rep_tsig; | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 205 | |
| 35680 | 206 | fun class_alias naming binding name = map_tsig (fn ((space, classes), default, types) => | 
| 207 | ((Name_Space.alias naming binding name space, classes), default, types)); | |
| 208 | ||
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 209 | fun defaultS (TSig {default, ...}) = default;
 | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 210 | fun logical_types (TSig {log_types, ...}) = log_types;
 | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 211 | |
| 16370 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 212 | fun eq_sort (TSig {classes, ...}) = Sorts.sort_eq (#2 classes);
 | 
| 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 213 | fun subsort (TSig {classes, ...}) = Sorts.sort_le (#2 classes);
 | 
| 19642 | 214 | fun of_sort (TSig {classes, ...}) = Sorts.of_sort (#2 classes);
 | 
| 19464 | 215 | fun inter_sort (TSig {classes, ...}) = Sorts.inter_sort (#2 classes);
 | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 216 | |
| 45595 | 217 | fun cert_class (TSig {classes = (_, algebra), ...}) c =
 | 
| 218 | if can (Graph.get_entry (Sorts.classes_of algebra)) c then c | |
| 219 |   else raise TYPE ("Undeclared class: " ^ quote c, [], []);
 | |
| 220 | ||
| 221 | val cert_sort = map o cert_class; | |
| 222 | ||
| 36447 | 223 | fun minimize_sort (TSig {classes, ...}) = Sorts.minimize_sort (#2 classes);
 | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 224 | |
| 32784 | 225 | fun witness_sorts (TSig {classes, log_types, ...}) =
 | 
| 19642 | 226 | Sorts.witness_sorts (#2 classes) log_types; | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 227 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 228 | |
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 229 | (* certification mode *) | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 230 | |
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 231 | datatype mode = Mode of {normalize: bool, logical: bool};
 | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 232 | |
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 233 | val mode_default = Mode {normalize = true, logical = true};
 | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 234 | val mode_syntax = Mode {normalize = true, logical = false};
 | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 235 | val mode_abbrev = Mode {normalize = false, logical = false};
 | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 236 | |
| 33519 | 237 | structure Mode = Proof_Data | 
| 24484 | 238 | ( | 
| 239 | type T = mode; | |
| 240 | fun init _ = mode_default; | |
| 241 | ); | |
| 242 | ||
| 243 | val get_mode = Mode.get; | |
| 244 | fun set_mode mode = Mode.map (K mode); | |
| 245 | fun restore_mode ctxt = set_mode (get_mode ctxt); | |
| 246 | ||
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 247 | |
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 248 | (* types *) | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 249 | |
| 56025 | 250 | val type_space = Name_Space.space_of_table o #types o rep_tsig; | 
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 251 | |
| 56025 | 252 | fun type_alias naming binding name = map_tsig (fn (classes, default, types) => | 
| 253 | (classes, default, (Name_Space.alias_table naming binding name types))); | |
| 35680 | 254 | |
| 35669 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 255 | val is_logtype = member (op =) o logical_types; | 
| 
a91c7ed801b8
added ProofContext.tsig_of -- proforma version for local name space only, not logical content;
 wenzelm parents: 
35359diff
changeset | 256 | |
| 27313 | 257 | |
| 258 | fun undecl_type c = "Undeclared type constructor: " ^ quote c; | |
| 259 | ||
| 56025 | 260 | fun lookup_type (TSig {types, ...}) = Option.map #2 o Name_Space.lookup_key types;
 | 
| 27313 | 261 | |
| 55956 
94d384d621b0
reject internal term names outright, and complete consts instead;
 wenzelm parents: 
55922diff
changeset | 262 | fun check_decl context (TSig {types, ...}) (c, pos) =
 | 
| 
94d384d621b0
reject internal term names outright, and complete consts instead;
 wenzelm parents: 
55922diff
changeset | 263 | Name_Space.check_reports context types (c, [pos]); | 
| 55841 
a232c0ff3c20
prefer Name_Space.check with its builtin reports (including completion);
 wenzelm parents: 
51930diff
changeset | 264 | |
| 42468 | 265 | fun the_decl tsig (c, pos) = | 
| 35359 
3ec03a3cd9d0
provide direct access to the different kinds of type declarations;
 wenzelm parents: 
34272diff
changeset | 266 | (case lookup_type tsig c of | 
| 48992 | 267 | NONE => error (undecl_type c ^ Position.here pos) | 
| 35359 
3ec03a3cd9d0
provide direct access to the different kinds of type declarations;
 wenzelm parents: 
34272diff
changeset | 268 | | SOME decl => decl); | 
| 
3ec03a3cd9d0
provide direct access to the different kinds of type declarations;
 wenzelm parents: 
34272diff
changeset | 269 | |
| 27313 | 270 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 271 | (* certified types *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 272 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 273 | fun bad_nargs t = "Bad number of arguments for type constructor: " ^ quote t; | 
| 14830 
faa4865ba1ce
removed norm_typ; improved output; refer to Pretty.pp;
 wenzelm parents: 
14790diff
changeset | 274 | |
| 14998 | 275 | local | 
| 276 | ||
| 277 | fun inst_typ env (Type (c, Ts)) = Type (c, map (inst_typ env) Ts) | |
| 18957 | 278 | | inst_typ env (T as TFree (x, _)) = the_default T (AList.lookup (op =) env x) | 
| 14998 | 279 | | inst_typ _ T = T; | 
| 280 | ||
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 281 | in | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 282 | |
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 283 | fun cert_typ_mode (Mode {normalize, logical}) tsig ty =
 | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 284 | let | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 285 | fun err msg = raise TYPE (msg, [ty], []); | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 286 | |
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 287 | val check_logical = | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 288 |       if logical then fn c => err ("Illegal occurrence of syntactic type: " ^ quote c)
 | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 289 | else fn _ => (); | 
| 14989 | 290 | |
| 291 | fun cert (T as Type (c, Ts)) = | |
| 292 | let | |
| 293 | val Ts' = map cert Ts; | |
| 294 | fun nargs n = if length Ts <> n then err (bad_nargs c) else (); | |
| 295 | in | |
| 42468 | 296 | (case the_decl tsig (c, Position.none) of | 
| 35359 
3ec03a3cd9d0
provide direct access to the different kinds of type declarations;
 wenzelm parents: 
34272diff
changeset | 297 | LogicalType n => (nargs n; Type (c, Ts')) | 
| 
3ec03a3cd9d0
provide direct access to the different kinds of type declarations;
 wenzelm parents: 
34272diff
changeset | 298 | | Abbreviation (vs, U, syn) => | 
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 299 | (nargs (length vs); | 
| 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 300 | if syn then check_logical c else (); | 
| 14993 | 301 | if normalize then inst_typ (vs ~~ Ts') U | 
| 14989 | 302 | else Type (c, Ts')) | 
| 35359 
3ec03a3cd9d0
provide direct access to the different kinds of type declarations;
 wenzelm parents: 
34272diff
changeset | 303 | | Nonterminal => (nargs 0; check_logical c; T)) | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 304 | end | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 305 | | cert (TFree (x, S)) = TFree (x, cert_sort tsig S) | 
| 14989 | 306 | | cert (TVar (xi as (_, i), S)) = | 
| 14993 | 307 | if i < 0 then | 
| 308 |             err ("Malformed type variable: " ^ quote (Term.string_of_vname xi))
 | |
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 309 | else TVar (xi, cert_sort tsig S); | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 310 | |
| 14989 | 311 | val ty' = cert ty; | 
| 14993 | 312 | in if ty = ty' then ty else ty' end; (*avoid copying of already normal type*) | 
| 14830 
faa4865ba1ce
removed norm_typ; improved output; refer to Pretty.pp;
 wenzelm parents: 
14790diff
changeset | 313 | |
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 314 | val cert_typ = cert_typ_mode mode_default; | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 315 | |
| 14998 | 316 | end; | 
| 317 | ||
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 318 | |
| 19464 | 319 | (* type arities *) | 
| 320 | ||
| 27302 | 321 | fun arity_number tsig a = | 
| 322 | (case lookup_type tsig a of | |
| 33173 
b8ca12f6681a
eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
 wenzelm parents: 
33097diff
changeset | 323 | SOME (LogicalType n) => n | 
| 19464 | 324 | | _ => error (undecl_type a)); | 
| 325 | ||
| 326 | fun arity_sorts _ tsig a [] = replicate (arity_number tsig a) [] | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 327 |   | arity_sorts pp (TSig {classes, ...}) a S =
 | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 328 | Sorts.mg_domain (#2 classes) a S | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 329 | handle Sorts.CLASS_ERROR err => error (Sorts.class_error pp err); | 
| 19464 | 330 | |
| 331 | ||
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 332 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 333 | (** special treatment of type vars **) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 334 | |
| 36621 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 335 | (* sort_of_atyp *) | 
| 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 336 | |
| 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 337 | fun sort_of_atyp (TFree (_, S)) = S | 
| 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 338 | | sort_of_atyp (TVar (_, S)) = S | 
| 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 339 |   | sort_of_atyp T = raise TYPE ("sort_of_atyp", [T], []);
 | 
| 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 340 | |
| 
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
 wenzelm parents: 
36450diff
changeset | 341 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 342 | (* strip_sorts *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 343 | |
| 49687 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 344 | val strip_sorts = map_atyps | 
| 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 345 | (fn TFree (x, _) => TFree (x, []) | 
| 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 346 | | TVar (xi, _) => TVar (xi, [])); | 
| 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 347 | |
| 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 348 | val strip_sorts_dummy = map_atyps | 
| 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 349 | (fn TFree (x, _) => TFree (x, dummyS) | 
| 
4b9034f089eb
use explicit Type.strip_sorts_dummy to suppress sort constraints in output;
 wenzelm parents: 
48992diff
changeset | 350 | | TVar (xi, _) => TVar (xi, dummyS)); | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 351 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 352 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 353 | (* no_tvars *) | 
| 621 | 354 | |
| 355 | fun no_tvars T = | |
| 29275 
9fa69e3858d6
moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
 wenzelm parents: 
29269diff
changeset | 356 | (case Term.add_tvarsT T [] of [] => T | 
| 12501 | 357 |   | vs => raise TYPE ("Illegal schematic type variable(s): " ^
 | 
| 29275 
9fa69e3858d6
moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
 wenzelm parents: 
29269diff
changeset | 358 | commas_quote (map (Term.string_of_vname o #1) (rev vs)), [T], [])); | 
| 621 | 359 | |
| 7641 | 360 | |
| 35845 
e5980f0ad025
renamed varify/unvarify operations to varify_global/unvarify_global to emphasize that these only work in a global situation;
 wenzelm parents: 
35680diff
changeset | 361 | (* varify_global *) | 
| 621 | 362 | |
| 35845 
e5980f0ad025
renamed varify/unvarify operations to varify_global/unvarify_global to emphasize that these only work in a global situation;
 wenzelm parents: 
35680diff
changeset | 363 | fun varify_global fixed t = | 
| 621 | 364 | let | 
| 19305 | 365 | val fs = Term.fold_types (Term.fold_atyps | 
| 366 | (fn TFree v => if member (op =) fixed v then I else insert (op =) v | _ => I)) t []; | |
| 29260 | 367 | val used = Name.context | 
| 368 | |> fold_types (fold_atyps (fn TVar ((a, _), _) => Name.declare a | _ => I)) t; | |
| 43326 
47cf4bc789aa
simplified Name.variant -- discontinued builtin fold_map;
 wenzelm parents: 
43324diff
changeset | 369 | val fmap = fs ~~ map (rpair 0) (#1 (fold_map Name.variant (map fst fs) used)); | 
| 32784 | 370 | fun thaw (f as (_, S)) = | 
| 17184 | 371 | (case AList.lookup (op =) fmap f of | 
| 15531 | 372 | NONE => TFree f | 
| 16946 | 373 | | SOME xi => TVar (xi, S)); | 
| 21116 | 374 | in (fmap, map_types (map_type_tfree thaw) t) end; | 
| 2964 | 375 | |
| 376 | ||
| 7641 | 377 | (* freeze_thaw: freeze TVars in a term; return the "thaw" inverse *) | 
| 3411 
163f8f4a42d7
Removal of freeze_vars and thaw_vars.  New freeze_thaw
 paulson parents: 
3175diff
changeset | 378 | |
| 7641 | 379 | local | 
| 380 | ||
| 44116 
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
 wenzelm parents: 
43552diff
changeset | 381 | fun new_name ix (pairs, used) = | 
| 43324 
2b47822868e4
discontinued Name.variant to emphasize that this is old-style / indirect;
 wenzelm parents: 
42468diff
changeset | 382 | let val v = singleton (Name.variant_list used) (string_of_indexname ix) | 
| 16289 | 383 | in ((ix, v) :: pairs, v :: used) end; | 
| 621 | 384 | |
| 16289 | 385 | fun freeze_one alist (ix, sort) = | 
| 17184 | 386 | TFree (the (AList.lookup (op =) alist ix), sort) | 
| 51930 
52fd62618631
prefer explicitly qualified exceptions, which is particular important for robust handlers;
 wenzelm parents: 
51701diff
changeset | 387 | handle Option.Option => | 
| 3790 | 388 |       raise TYPE ("Failure during freezing of ?" ^ string_of_indexname ix, [], []);
 | 
| 2964 | 389 | |
| 17184 | 390 | fun thaw_one alist (a, sort) = TVar (the (AList.lookup (op =) alist a), sort) | 
| 51930 
52fd62618631
prefer explicitly qualified exceptions, which is particular important for robust handlers;
 wenzelm parents: 
51701diff
changeset | 391 | handle Option.Option => TFree (a, sort); | 
| 416 | 392 | |
| 10495 | 393 | in | 
| 394 | ||
| 33832 | 395 | fun legacy_freeze_thaw_type T = | 
| 7641 | 396 | let | 
| 44116 
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
 wenzelm parents: 
43552diff
changeset | 397 | val used = Term.add_tfree_namesT T []; | 
| 
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
 wenzelm parents: 
43552diff
changeset | 398 | val (alist, _) = fold_rev new_name (map #1 (Term.add_tvarsT T [])) ([], used); | 
| 7641 | 399 | in (map_type_tvar (freeze_one alist) T, map_type_tfree (thaw_one (map swap alist))) end; | 
| 400 | ||
| 33832 | 401 | val legacy_freeze_type = #1 o legacy_freeze_thaw_type; | 
| 16289 | 402 | |
| 33832 | 403 | fun legacy_freeze_thaw t = | 
| 7641 | 404 | let | 
| 44116 
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
 wenzelm parents: 
43552diff
changeset | 405 | val used = Term.add_tfree_names t []; | 
| 
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
 wenzelm parents: 
43552diff
changeset | 406 | val (alist, _) = fold_rev new_name (map #1 (Term.add_tvars t [])) ([], used); | 
| 7641 | 407 | in | 
| 408 | (case alist of | |
| 409 | [] => (t, fn x => x) (*nothing to do!*) | |
| 20548 
8ef25fe585a8
renamed Term.map_term_types to Term.map_types (cf. Term.fold_types);
 wenzelm parents: 
20071diff
changeset | 410 | | _ => (map_types (map_type_tvar (freeze_one alist)) t, | 
| 
8ef25fe585a8
renamed Term.map_term_types to Term.map_types (cf. Term.fold_types);
 wenzelm parents: 
20071diff
changeset | 411 | map_types (map_type_tfree (thaw_one (map swap alist))))) | 
| 7641 | 412 | end; | 
| 413 | ||
| 33832 | 414 | val legacy_freeze = #1 o legacy_freeze_thaw; | 
| 16289 | 415 | |
| 7641 | 416 | end; | 
| 417 | ||
| 256 | 418 | |
| 419 | ||
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 420 | (** matching and unification of types **) | 
| 8899 | 421 | |
| 15797 | 422 | type tyenv = (sort * typ) Vartab.table; | 
| 256 | 423 | |
| 51701 
1e29891759c4
tuned exceptions -- avoid composing error messages in low-level situations;
 wenzelm parents: 
50201diff
changeset | 424 | fun tvar_clash ixn S S' = | 
| 
1e29891759c4
tuned exceptions -- avoid composing error messages in low-level situations;
 wenzelm parents: 
50201diff
changeset | 425 |   raise TYPE ("Type variable has two distinct sorts", [TVar (ixn, S), TVar (ixn, S')], []);
 | 
| 0 | 426 | |
| 26327 | 427 | fun lookup tye (ixn, S) = | 
| 17412 | 428 | (case Vartab.lookup tye ixn of | 
| 15797 | 429 | NONE => NONE | 
| 16289 | 430 | | SOME (S', T) => if S = S' then SOME T else tvar_clash ixn S S'); | 
| 431 | ||
| 0 | 432 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 433 | (* matching *) | 
| 0 | 434 | |
| 2964 | 435 | exception TYPE_MATCH; | 
| 0 | 436 | |
| 16946 | 437 | fun typ_match tsig = | 
| 2964 | 438 | let | 
| 41421 
2db1d3d2ed54
uniform treatment of typ_match and raw_match (cf. b654fa27fbc4);
 wenzelm parents: 
41254diff
changeset | 439 | fun match (V as TVar (v, S), T) subs = | 
| 26327 | 440 | (case lookup subs (v, S) of | 
| 15531 | 441 | NONE => | 
| 41421 
2db1d3d2ed54
uniform treatment of typ_match and raw_match (cf. b654fa27fbc4);
 wenzelm parents: 
41254diff
changeset | 442 | if V = T then subs | 
| 
2db1d3d2ed54
uniform treatment of typ_match and raw_match (cf. b654fa27fbc4);
 wenzelm parents: 
41254diff
changeset | 443 | else if of_sort tsig (T, S) then Vartab.update_new (v, (S, T)) subs | 
| 14993 | 444 | else raise TYPE_MATCH | 
| 15531 | 445 | | SOME U => if U = T then subs else raise TYPE_MATCH) | 
| 16340 | 446 | | match (Type (a, Ts), Type (b, Us)) subs = | 
| 2964 | 447 | if a <> b then raise TYPE_MATCH | 
| 16885 | 448 | else matches (Ts, Us) subs | 
| 16340 | 449 | | match (TFree x, TFree y) subs = | 
| 2964 | 450 | if x = y then subs else raise TYPE_MATCH | 
| 16885 | 451 | | match _ _ = raise TYPE_MATCH | 
| 452 | and matches (T :: Ts, U :: Us) subs = matches (Ts, Us) (match (T, U) subs) | |
| 453 | | matches _ subs = subs; | |
| 16946 | 454 | in match end; | 
| 0 | 455 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 456 | fun typ_instance tsig (T, U) = | 
| 16946 | 457 | (typ_match tsig (U, T) Vartab.empty; true) handle TYPE_MATCH => false; | 
| 458 | ||
| 459 | (*purely structural matching*) | |
| 41421 
2db1d3d2ed54
uniform treatment of typ_match and raw_match (cf. b654fa27fbc4);
 wenzelm parents: 
41254diff
changeset | 460 | fun raw_match (V as TVar (v, S), T) subs = | 
| 26327 | 461 | (case lookup subs (v, S) of | 
| 41421 
2db1d3d2ed54
uniform treatment of typ_match and raw_match (cf. b654fa27fbc4);
 wenzelm parents: 
41254diff
changeset | 462 | NONE => if V = T then subs else Vartab.update_new (v, (S, T)) subs | 
| 16946 | 463 | | SOME U => if U = T then subs else raise TYPE_MATCH) | 
| 464 | | raw_match (Type (a, Ts), Type (b, Us)) subs = | |
| 465 | if a <> b then raise TYPE_MATCH | |
| 466 | else raw_matches (Ts, Us) subs | |
| 467 | | raw_match (TFree x, TFree y) subs = | |
| 468 | if x = y then subs else raise TYPE_MATCH | |
| 469 | | raw_match _ _ = raise TYPE_MATCH | |
| 470 | and raw_matches (T :: Ts, U :: Us) subs = raw_matches (Ts, Us) (raw_match (T, U) subs) | |
| 19694 | 471 | | raw_matches ([], []) subs = subs | 
| 472 | | raw_matches _ _ = raise TYPE_MATCH; | |
| 16946 | 473 | |
| 56050 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 474 | (*fast matching filter*) | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 475 | fun could_match (Type (a, Ts), Type (b, Us)) = a = b andalso could_matches (Ts, Us) | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 476 | | could_match (TFree (a, _), TFree (b, _)) = a = b | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 477 | | could_match (TVar _, _) = true | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 478 | | could_match _ = false | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 479 | and could_matches (T :: Ts, U :: Us) = could_match (T, U) andalso could_matches (Ts, Us) | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 480 | | could_matches ([], []) = true | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 481 | | could_matches _ = false; | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 482 | |
| 16946 | 483 | fun raw_instance (T, U) = | 
| 56050 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 484 | if could_match (U, T) then | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 485 | (raw_match (U, T) Vartab.empty; true) handle TYPE_MATCH => false | 
| 
fdccbb97915a
minor performance tuning via fast matching filter;
 wenzelm parents: 
56025diff
changeset | 486 | else false; | 
| 2964 | 487 | |
| 0 | 488 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 489 | (* unification *) | 
| 2964 | 490 | |
| 0 | 491 | exception TUNIFY; | 
| 492 | ||
| 26641 | 493 | (*occurs check*) | 
| 2964 | 494 | fun occurs v tye = | 
| 495 | let | |
| 496 | fun occ (Type (_, Ts)) = exists occ Ts | |
| 497 | | occ (TFree _) = false | |
| 15797 | 498 | | occ (TVar (w, S)) = | 
| 29269 
5c25a2012975
moved term order operations to structure TermOrd (cf. Pure/term_ord.ML);
 wenzelm parents: 
29260diff
changeset | 499 | Term.eq_ix (v, w) orelse | 
| 26327 | 500 | (case lookup tye (w, S) of | 
| 15531 | 501 | NONE => false | 
| 502 | | SOME U => occ U); | |
| 0 | 503 | in occ end; | 
| 504 | ||
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 505 | (*chase variable assignments; if devar returns a type var then it must be unassigned*) | 
| 16885 | 506 | fun devar tye (T as TVar v) = | 
| 26327 | 507 | (case lookup tye v of | 
| 16885 | 508 | SOME U => devar tye U | 
| 15531 | 509 | | NONE => T) | 
| 32784 | 510 | | devar _ T = T; | 
| 0 | 511 | |
| 17804 | 512 | (*order-sorted unification*) | 
| 32784 | 513 | fun unify (TSig {classes = (_, classes), ...}) TU (tyenv, maxidx) =
 | 
| 2964 | 514 | let | 
| 32738 | 515 | val tyvar_count = Unsynchronized.ref maxidx; | 
| 516 | fun gen_tyvar S = TVar ((Name.aT, Unsynchronized.inc tyvar_count), S); | |
| 2964 | 517 | |
| 19642 | 518 | fun mg_domain a S = Sorts.mg_domain classes a S | 
| 519 | handle Sorts.CLASS_ERROR _ => raise TUNIFY; | |
| 2964 | 520 | |
| 16885 | 521 | fun meet (_, []) tye = tye | 
| 522 | | meet (TVar (xi, S'), S) tye = | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 523 | if Sorts.sort_le classes (S', S) then tye | 
| 17412 | 524 | else Vartab.update_new | 
| 17221 | 525 | (xi, (S', gen_tyvar (Sorts.inter_sort classes (S', S)))) tye | 
| 16885 | 526 | | meet (TFree (_, S'), S) tye = | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 527 | if Sorts.sort_le classes (S', S) then tye | 
| 2964 | 528 | else raise TUNIFY | 
| 16885 | 529 | | meet (Type (a, Ts), S) tye = meets (Ts, mg_domain a S) tye | 
| 530 | and meets (T :: Ts, S :: Ss) tye = meets (Ts, Ss) (meet (devar tye T, S) tye) | |
| 531 | | meets _ tye = tye; | |
| 2964 | 532 | |
| 16885 | 533 | fun unif (ty1, ty2) tye = | 
| 534 | (case (devar tye ty1, devar tye ty2) of | |
| 2964 | 535 | (T as TVar (v, S1), U as TVar (w, S2)) => | 
| 29269 
5c25a2012975
moved term order operations to structure TermOrd (cf. Pure/term_ord.ML);
 wenzelm parents: 
29260diff
changeset | 536 | if Term.eq_ix (v, w) then | 
| 15797 | 537 | if S1 = S2 then tye else tvar_clash v S1 S2 | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 538 | else if Sorts.sort_le classes (S1, S2) then | 
| 17412 | 539 | Vartab.update_new (w, (S2, T)) tye | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 540 | else if Sorts.sort_le classes (S2, S1) then | 
| 17412 | 541 | Vartab.update_new (v, (S1, U)) tye | 
| 2964 | 542 | else | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 543 | let val S = gen_tyvar (Sorts.inter_sort classes (S1, S2)) in | 
| 17412 | 544 | Vartab.update_new (v, (S1, S)) (Vartab.update_new (w, (S2, S)) tye) | 
| 2964 | 545 | end | 
| 546 | | (TVar (v, S), T) => | |
| 547 | if occurs v tye T then raise TUNIFY | |
| 17412 | 548 | else meet (T, S) (Vartab.update_new (v, (S, T)) tye) | 
| 2964 | 549 | | (T, TVar (v, S)) => | 
| 550 | if occurs v tye T then raise TUNIFY | |
| 17412 | 551 | else meet (T, S) (Vartab.update_new (v, (S, T)) tye) | 
| 2964 | 552 | | (Type (a, Ts), Type (b, Us)) => | 
| 553 | if a <> b then raise TUNIFY | |
| 16885 | 554 | else unifs (Ts, Us) tye | 
| 555 | | (T, U) => if T = U then tye else raise TUNIFY) | |
| 556 | and unifs (T :: Ts, U :: Us) tye = unifs (Ts, Us) (unif (T, U) tye) | |
| 557 | | unifs _ tye = tye; | |
| 558 | in (unif TU tyenv, ! tyvar_count) end; | |
| 0 | 559 | |
| 16946 | 560 | (*purely structural unification*) | 
| 561 | fun raw_unify (ty1, ty2) tye = | |
| 562 | (case (devar tye ty1, devar tye ty2) of | |
| 32784 | 563 | (T as TVar (v, S1), TVar (w, S2)) => | 
| 29269 
5c25a2012975
moved term order operations to structure TermOrd (cf. Pure/term_ord.ML);
 wenzelm parents: 
29260diff
changeset | 564 | if Term.eq_ix (v, w) then | 
| 16946 | 565 | if S1 = S2 then tye else tvar_clash v S1 S2 | 
| 17412 | 566 | else Vartab.update_new (w, (S2, T)) tye | 
| 16946 | 567 | | (TVar (v, S), T) => | 
| 568 | if occurs v tye T then raise TUNIFY | |
| 17412 | 569 | else Vartab.update_new (v, (S, T)) tye | 
| 16946 | 570 | | (T, TVar (v, S)) => | 
| 571 | if occurs v tye T then raise TUNIFY | |
| 17412 | 572 | else Vartab.update_new (v, (S, T)) tye | 
| 16946 | 573 | | (Type (a, Ts), Type (b, Us)) => | 
| 574 | if a <> b then raise TUNIFY | |
| 575 | else raw_unifys (Ts, Us) tye | |
| 576 | | (T, U) => if T = U then tye else raise TUNIFY) | |
| 577 | and raw_unifys (T :: Ts, U :: Us) tye = raw_unifys (Ts, Us) (raw_unify (T, U) tye) | |
| 19696 | 578 | | raw_unifys ([], []) tye = tye | 
| 579 | | raw_unifys _ _ = raise TUNIFY; | |
| 16946 | 580 | |
| 17804 | 581 | (*fast unification filter*) | 
| 582 | fun could_unify (Type (a, Ts), Type (b, Us)) = a = b andalso could_unifys (Ts, Us) | |
| 583 | | could_unify (TFree (a, _), TFree (b, _)) = a = b | |
| 584 | | could_unify (TVar _, _) = true | |
| 585 | | could_unify (_, TVar _) = true | |
| 586 | | could_unify _ = false | |
| 587 | and could_unifys (T :: Ts, U :: Us) = could_unify (T, U) andalso could_unifys (Ts, Us) | |
| 19696 | 588 | | could_unifys ([], []) = true | 
| 589 | | could_unifys _ = false; | |
| 450 | 590 | |
| 17804 | 591 | |
| 592 | (*equality with respect to a type environment*) | |
| 32030 | 593 | fun equal_type tye (T, T') = | 
| 16885 | 594 | (case (devar tye T, devar tye T') of | 
| 16650 | 595 | (Type (s, Ts), Type (s', Ts')) => | 
| 32030 | 596 | s = s' andalso ListPair.all (equal_type tye) (Ts, Ts') | 
| 16650 | 597 | | (U, U') => U = U'); | 
| 598 | ||
| 32030 | 599 | fun eq_type tye = | 
| 600 | if Vartab.is_empty tye then op = else equal_type tye; | |
| 601 | ||
| 450 | 602 | |
| 0 | 603 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 604 | (** extend and merge type signatures **) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 605 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 606 | (* classes *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 607 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 608 | fun add_class context (c, cs) tsig = | 
| 19642 | 609 | tsig |> map_tsig (fn ((space, classes), default, types) => | 
| 16370 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 610 | let | 
| 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 611 | val cs' = map (cert_class tsig) cs | 
| 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 612 | handle TYPE (msg, _, _) => error msg; | 
| 41254 
78c3e472bb35
extra checking of name bindings for classes, types, consts;
 wenzelm parents: 
39997diff
changeset | 613 | val _ = Binding.check c; | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 614 | val (c', space') = space |> Name_Space.declare context true c; | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 615 | val classes' = classes |> Sorts.add_class (Context.pretty_generic context) (c', cs'); | 
| 19642 | 616 | in ((space', classes'), default, types) end); | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 617 | |
| 26669 | 618 | fun hide_class fully c = map_tsig (fn ((space, classes), default, types) => | 
| 33095 
bbd52d2f8696
renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
 wenzelm parents: 
33094diff
changeset | 619 | ((Name_Space.hide fully c space, classes), default, types)); | 
| 16370 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 620 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 621 | |
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 622 | (* arities *) | 
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 623 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 624 | fun add_arity pp (t, Ss, S) tsig = tsig |> map_tsig (fn ((space, classes), default, types) => | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 625 | let | 
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 626 | val _ = | 
| 27302 | 627 | (case lookup_type tsig t of | 
| 33173 
b8ca12f6681a
eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
 wenzelm parents: 
33097diff
changeset | 628 | SOME (LogicalType n) => if length Ss <> n then error (bad_nargs t) else () | 
| 33094 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 629 |       | SOME _ => error ("Logical type constructor expected: " ^ quote t)
 | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 630 | | NONE => error (undecl_type t)); | 
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 631 | val (Ss', S') = (map (cert_sort tsig) Ss, cert_sort tsig S) | 
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 632 | handle TYPE (msg, _, _) => error msg; | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 633 | val classes' = classes |> Sorts.add_arities pp ((t, map (fn c' => (c', Ss')) S')); | 
| 19642 | 634 | in ((space, classes'), default, types) end); | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 635 | |
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 636 | |
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 637 | (* classrel *) | 
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 638 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 639 | fun add_classrel pp rel tsig = | 
| 19642 | 640 | tsig |> map_tsig (fn ((space, classes), default, types) => | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 641 | let | 
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 642 | val rel' = pairself (cert_class tsig) rel | 
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 643 | handle TYPE (msg, _, _) => error msg; | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 644 | val classes' = classes |> Sorts.add_classrel pp rel'; | 
| 19642 | 645 | in ((space, classes'), default, types) end); | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 646 | |
| 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 647 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 648 | (* default sort *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 649 | |
| 19642 | 650 | fun set_defsort S tsig = tsig |> map_tsig (fn (classes, _, types) => | 
| 651 | (classes, cert_sort tsig S handle TYPE (msg, _, _) => error msg, types)); | |
| 0 | 652 | |
| 653 | ||
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 654 | (* types *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 655 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 656 | local | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 657 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 658 | fun new_decl context (c, decl) types = | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 659 | (Binding.check c; #2 (Name_Space.define context true (c, decl) types)); | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 660 | |
| 19642 | 661 | fun map_types f = map_tsig (fn (classes, default, types) => | 
| 19579 
b802d1804b77
replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
 wenzelm parents: 
19530diff
changeset | 662 | let | 
| 56025 | 663 | val types' = f types; | 
| 664 | val _ = | |
| 665 | Name_Space.intern (Name_Space.space_of_table types') "dummy" = "dummy" orelse | |
| 666 | error "Illegal declaration of dummy type"; | |
| 667 | in (classes, default, types') end); | |
| 2964 | 668 | |
| 56025 | 669 | fun syntactic tsig (Type (c, Ts)) = | 
| 670 | (case lookup_type tsig c of SOME Nonterminal => true | _ => false) | |
| 671 | orelse exists (syntactic tsig) Ts | |
| 14989 | 672 | | syntactic _ _ = false; | 
| 673 | ||
| 27302 | 674 | in | 
| 675 | ||
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 676 | fun add_type context (c, n) = | 
| 42381 
309ec68442c6
added Binding.print convenience, which includes quote already;
 wenzelm parents: 
42375diff
changeset | 677 |   if n < 0 then error ("Bad type constructor declaration " ^ Binding.print c)
 | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 678 | else map_types (new_decl context (c, LogicalType n)); | 
| 27302 | 679 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 680 | fun add_abbrev context (a, vs, rhs) tsig = tsig |> map_types (fn types => | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 681 | let | 
| 30343 
79f022df8527
replace old bstring by binding for logical primitives: class, type, const etc.;
 wenzelm parents: 
29275diff
changeset | 682 | fun err msg = | 
| 42381 
309ec68442c6
added Binding.print convenience, which includes quote already;
 wenzelm parents: 
42375diff
changeset | 683 |       cat_error msg ("The error(s) above occurred in type abbreviation " ^ Binding.print a);
 | 
| 24274 
cb9236269af1
type mode: models certification mode (default, syntax, abbrev);
 wenzelm parents: 
23655diff
changeset | 684 | val rhs' = strip_sorts (no_tvars (cert_typ_mode mode_syntax tsig rhs)) | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 685 | handle TYPE (msg, _, _) => err msg; | 
| 33094 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 686 | val _ = | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 687 | (case duplicates (op =) vs of | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 688 | [] => [] | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 689 |       | dups => err ("Duplicate variables on lhs: " ^ commas_quote dups));
 | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 690 | val _ = | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 691 | (case subtract (op =) vs (map #1 (Term.add_tfreesT rhs' [])) of | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 692 | [] => [] | 
| 
ef0d77b1e687
eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
 wenzelm parents: 
32784diff
changeset | 693 |       | extras => err ("Extra variables on rhs: " ^ commas_quote extras));
 | 
| 56025 | 694 | in types |> new_decl context (a, Abbreviation (vs, rhs', syntactic tsig rhs')) end); | 
| 0 | 695 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 696 | fun add_nonterminal context = map_types o new_decl context o rpair Nonterminal; | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 697 | |
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 698 | end; | 
| 0 | 699 | |
| 56025 | 700 | fun hide_type fully c = map_tsig (fn (classes, default, types) => | 
| 701 | (classes, default, Name_Space.hide_table fully c types)); | |
| 16370 
033d890fe91f
name space of classes and types maintained in tsig;
 wenzelm parents: 
16340diff
changeset | 702 | |
| 3790 | 703 | |
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 704 | (* merge type signatures *) | 
| 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 705 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 706 | fun merge_tsig pp (tsig1, tsig2) = | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 707 | let | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 708 |     val (TSig {classes = (space1, classes1), default = default1, types = types1,
 | 
| 26641 | 709 | log_types = _}) = tsig1; | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 710 |     val (TSig {classes = (space2, classes2), default = default2, types = types2,
 | 
| 26641 | 711 | log_types = _}) = tsig2; | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 712 | |
| 33095 
bbd52d2f8696
renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
 wenzelm parents: 
33094diff
changeset | 713 | val space' = Name_Space.merge (space1, space2); | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46649diff
changeset | 714 | val classes' = Sorts.merge_algebra pp (classes1, classes2); | 
| 19515 
9f650083da65
build classes/arities: refer to operations in sorts.ML;
 wenzelm parents: 
19464diff
changeset | 715 | val default' = Sorts.inter_sort classes' (default1, default2); | 
| 33095 
bbd52d2f8696
renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
 wenzelm parents: 
33094diff
changeset | 716 | val types' = Name_Space.merge_tables (types1, types2); | 
| 19642 | 717 | in build_tsig ((space', classes'), default', types') end; | 
| 14790 
0d984ee030a1
major cleanup of tsig datastructures and extend/merge operations; fixes old bugs in classes/arities code; proper treatment of nonterminals and syntax-only types;
 wenzelm parents: 
13666diff
changeset | 718 | |
| 0 | 719 | end; |