src/Pure/type.ML
author wenzelm
Thu, 25 Feb 2010 22:05:34 +0100
changeset 35359 3ec03a3cd9d0
parent 34272 95df5e6dd41c
child 35669 a91c7ed801b8
permissions -rw-r--r--
provide direct access to the different kinds of type declarations;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
256
b401c3d06024 (this is a preliminary release)
wenzelm
parents: 200
diff changeset
     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: 13666
diff changeset
     2
    Author:     Tobias Nipkow, Lawrence C Paulson, and Markus Wenzel
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     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: 13666
diff 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: 13666
diff changeset
     5
matching and unification of types, extend and merge type signatures.
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     6
*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     7
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     8
signature TYPE =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
     9
sig
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: 13666
diff changeset
    10
  (*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: 13666
diff changeset
    11
  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: 13666
diff changeset
    12
    LogicalType of int |
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
    13
    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: 13666
diff changeset
    14
    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: 13666
diff changeset
    15
  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: 13666
diff changeset
    16
  val rep_tsig: tsig ->
33095
bbd52d2f8696 renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
wenzelm
parents: 33094
diff changeset
    17
   {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: 13666
diff changeset
    18
    default: sort,
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
    19
    types: decl Name_Space.table,
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
    20
    log_types: string 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: 13666
diff changeset
    21
  val empty_tsig: 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: 13666
diff changeset
    22
  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: 13666
diff changeset
    23
  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: 13666
diff changeset
    24
  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: 13666
diff changeset
    25
  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: 13666
diff changeset
    26
  val of_sort: tsig -> typ * sort -> bool
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
    27
  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: 13666
diff changeset
    28
  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: 13666
diff changeset
    29
  val cert_sort: tsig -> sort -> sort
31946
99ac0321cd47 witness_sorts: proper type witnesses for hyps, not invented "'hyp" variables;
wenzelm
parents: 30343
diff changeset
    30
  val witness_sorts: tsig -> (typ * sort) list -> sort list -> (typ * sort) list
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
    31
  type mode
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
    32
  val mode_default: mode
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
    33
  val mode_syntax: mode
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
    34
  val mode_abbrev: mode
24484
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
    35
  val get_mode: Proof.context -> mode
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
    36
  val set_mode: mode -> Proof.context -> Proof.context
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
    37
  val restore_mode: Proof.context -> Proof.context -> Proof.context
35359
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
    38
  val the_decl: tsig -> string -> decl
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
    39
  val cert_typ_mode: mode -> tsig -> typ -> typ
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
    40
  val cert_typ: tsig -> typ -> typ
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
    41
  val arity_number: tsig -> string -> int
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
    42
  val arity_sorts: Pretty.pp -> 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: 13666
diff changeset
    43
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: 13666
diff changeset
    44
  (*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: 13666
diff changeset
    45
  val strip_sorts: typ -> typ
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
    46
  val no_tvars: typ -> typ
21116
be58cded79da fixed type signature of Type.varify
haftmann
parents: 20951
diff changeset
    47
  val varify: (string * sort) list -> term -> ((string * sort) * indexname) list * term
33832
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
    48
  val legacy_freeze_thaw_type: typ -> typ * (typ -> typ)
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
    49
  val legacy_freeze_type: typ -> typ
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
    50
  val legacy_freeze_thaw: term -> term * (term -> term)
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
    51
  val legacy_freeze: term -> term
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    52
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: 13666
diff changeset
    53
  (*matching and unification*)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    54
  exception TYPE_MATCH
25324
ed4ac5966c68 tuned signature;
wenzelm
parents: 24982
diff changeset
    55
  type tyenv = (sort * typ) Vartab.table
26327
fc8df36e2644 Type.lookup now curried; typ_of_sort
haftmann
parents: 25384
diff changeset
    56
  val lookup: tyenv -> indexname * sort -> typ option
32648
143e0b0a6b33 Correct chasing of type variable instantiations during type unification.
paulson
parents: 32030
diff changeset
    57
  val devar: tyenv -> typ -> typ
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    58
  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: 13666
diff changeset
    59
  val typ_instance: tsig -> typ * typ -> bool
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    60
  val raw_match: typ * typ -> tyenv -> tyenv
19694
08894a78400b export raw_matches;
wenzelm
parents: 19642
diff changeset
    61
  val raw_matches: typ list * typ list -> tyenv -> tyenv
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    62
  val raw_instance: typ * typ -> bool
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    63
  exception TUNIFY
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    64
  val unify: tsig -> typ * typ -> tyenv * int -> tyenv * int
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    65
  val raw_unify: typ * typ -> tyenv -> tyenv
19696
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
    66
  val raw_unifys: typ list * typ list -> tyenv -> tyenv
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
    67
  val could_unify: typ * typ -> bool
19696
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
    68
  val could_unifys: typ list * typ list -> bool
16650
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
    69
  val eq_type: tyenv -> typ * typ -> bool
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    70
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: 13666
diff changeset
    71
  (*extend and merge type signatures*)
33095
bbd52d2f8696 renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
wenzelm
parents: 33094
diff changeset
    72
  val add_class: Pretty.pp -> Name_Space.naming -> binding * class list -> tsig -> tsig
26669
c27efd6de25d simplified hide_XXX interfaces;
wenzelm
parents: 26641
diff changeset
    73
  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: 13666
diff changeset
    74
  val set_defsort: sort -> tsig -> tsig
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
    75
  val add_type: Name_Space.naming -> binding * int -> tsig -> tsig
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
    76
  val add_abbrev: Name_Space.naming -> binding * string list * typ -> tsig -> tsig
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
    77
  val add_nonterminal: Name_Space.naming -> binding -> tsig -> tsig
26669
c27efd6de25d simplified hide_XXX interfaces;
wenzelm
parents: 26641
diff changeset
    78
  val hide_type: bool -> string -> tsig -> tsig
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
    79
  val add_arity: Pretty.pp -> arity -> tsig -> tsig
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
    80
  val add_classrel: Pretty.pp -> class * class -> tsig -> tsig
14830
faa4865ba1ce removed norm_typ; improved output; refer to Pretty.pp;
wenzelm
parents: 14790
diff changeset
    81
  val merge_tsigs: Pretty.pp -> tsig * tsig -> tsig
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    82
end;
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    83
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    84
structure Type: TYPE =
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    85
struct
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    86
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: 13666
diff changeset
    87
(** type signatures and certified types **)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    88
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: 13666
diff changeset
    89
(* 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: 13666
diff changeset
    90
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: 13666
diff changeset
    91
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: 13666
diff changeset
    92
  LogicalType of int |
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
    93
  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: 13666
diff changeset
    94
  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: 13666
diff changeset
    95
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: 13666
diff changeset
    96
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: 13666
diff changeset
    97
(* 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: 13666
diff changeset
    98
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: 13666
diff changeset
    99
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: 13666
diff changeset
   100
  TSig of {
33095
bbd52d2f8696 renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
wenzelm
parents: 33094
diff changeset
   101
    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: 16340
diff changeset
   102
    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: 33097
diff changeset
   103
    types: decl Name_Space.table,           (*declared types*)
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   104
    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: 13666
diff changeset
   105
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: 13666
diff changeset
   106
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: 13666
diff changeset
   107
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   108
fun make_tsig (classes, default, types, log_types) =
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   109
  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: 13666
diff changeset
   110
33094
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   111
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: 13666
diff changeset
   112
  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: 13666
diff changeset
   113
    val log_types =
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   114
      Symtab.fold (fn (c, LogicalType n) => cons (c, n) | _ => I) (snd types) []
33094
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   115
      |> Library.sort (int_ord o pairself snd) |> map fst;
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   116
  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: 13666
diff changeset
   117
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   118
fun map_tsig f (TSig {classes, default, types, log_types = _}) =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   119
  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: 13666
diff changeset
   120
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   121
val empty_tsig =
33096
db3c18fd9708 maintain explicit name space kind;
wenzelm
parents: 33095
diff changeset
   122
  build_tsig ((Name_Space.empty "class", Sorts.empty_algebra), [], Name_Space.empty_table "type");
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: 13666
diff changeset
   123
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: 13666
diff changeset
   124
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: 13666
diff changeset
   125
(* 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: 13666
diff changeset
   126
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: 13666
diff changeset
   127
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: 13666
diff changeset
   128
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: 13666
diff changeset
   129
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   130
fun eq_sort (TSig {classes, ...}) = Sorts.sort_eq (#2 classes);
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   131
fun subsort (TSig {classes, ...}) = Sorts.sort_le (#2 classes);
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   132
fun of_sort (TSig {classes, ...}) = Sorts.of_sort (#2 classes);
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   133
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: 13666
diff changeset
   134
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   135
fun cert_class (TSig {classes, ...}) = Sorts.certify_class (#2 classes);
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   136
fun cert_sort (TSig {classes, ...}) = Sorts.certify_sort (#2 classes);
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   137
32784
1a5dde5079ac eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   138
fun witness_sorts (TSig {classes, log_types, ...}) =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   139
  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: 13666
diff changeset
   140
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: 13666
diff changeset
   141
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   142
(* certification mode *)
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   143
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   144
datatype mode = Mode of {normalize: bool, logical: bool};
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   145
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   146
val mode_default = Mode {normalize = true, logical = true};
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   147
val mode_syntax = Mode {normalize = true, logical = false};
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   148
val mode_abbrev = Mode {normalize = false, logical = false};
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   149
33519
e31a85f92ce9 adapted Generic_Data, Proof_Data;
wenzelm
parents: 33173
diff changeset
   150
structure Mode = Proof_Data
24484
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   151
(
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   152
  type T = mode;
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   153
  fun init _ = mode_default;
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   154
);
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   155
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   156
val get_mode = Mode.get;
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   157
fun set_mode mode = Mode.map (K mode);
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   158
fun restore_mode ctxt = set_mode (get_mode ctxt);
013b98b57b86 maintain mode in context (get/set/restore_mode);
wenzelm
parents: 24274
diff changeset
   159
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   160
27313
07754b7ba89d the_tags: explicit error message;
wenzelm
parents: 27302
diff changeset
   161
(* lookup types *)
07754b7ba89d the_tags: explicit error message;
wenzelm
parents: 27302
diff changeset
   162
07754b7ba89d the_tags: explicit error message;
wenzelm
parents: 27302
diff changeset
   163
fun undecl_type c = "Undeclared type constructor: " ^ quote c;
07754b7ba89d the_tags: explicit error message;
wenzelm
parents: 27302
diff changeset
   164
33094
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   165
fun lookup_type (TSig {types = (_, types), ...}) = Symtab.lookup types;
27313
07754b7ba89d the_tags: explicit error message;
wenzelm
parents: 27302
diff changeset
   166
35359
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   167
fun the_decl tsig c =
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   168
  (case lookup_type tsig c of
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   169
    NONE => error (undecl_type c)
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   170
  | SOME decl => decl);
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   171
27313
07754b7ba89d the_tags: explicit error message;
wenzelm
parents: 27302
diff changeset
   172
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: 13666
diff changeset
   173
(* 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: 13666
diff changeset
   174
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: 13666
diff changeset
   175
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: 14790
diff changeset
   176
14998
wenzelm
parents: 14993
diff changeset
   177
local
wenzelm
parents: 14993
diff changeset
   178
wenzelm
parents: 14993
diff changeset
   179
fun inst_typ env (Type (c, Ts)) = Type (c, map (inst_typ env) Ts)
18957
8c3abd63bce3 TableFun: renamed xxx_multi to xxx_list;
wenzelm
parents: 18928
diff changeset
   180
  | inst_typ env (T as TFree (x, _)) = the_default T (AList.lookup (op =) env x)
14998
wenzelm
parents: 14993
diff changeset
   181
  | inst_typ _ T = T;
wenzelm
parents: 14993
diff changeset
   182
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   183
in
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   184
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   185
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: 13666
diff changeset
   186
  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: 13666
diff changeset
   187
    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: 13666
diff changeset
   188
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   189
    val check_logical =
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   190
      if logical then fn c => err ("Illegal occurrence of syntactic type: " ^ quote c)
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   191
      else fn _ => ();
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   192
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   193
    fun cert (T as Type (c, Ts)) =
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   194
          let
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   195
            val Ts' = map cert Ts;
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   196
            fun nargs n = if length Ts <> n then err (bad_nargs c) else ();
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   197
          in
35359
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   198
            (case the_decl tsig c of
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   199
              LogicalType n => (nargs n; Type (c, Ts'))
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   200
            | Abbreviation (vs, U, syn) =>
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   201
               (nargs (length vs);
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   202
                if syn then check_logical c else ();
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   203
                if normalize then inst_typ (vs ~~ Ts') U
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   204
                else Type (c, Ts'))
35359
3ec03a3cd9d0 provide direct access to the different kinds of type declarations;
wenzelm
parents: 34272
diff changeset
   205
            | 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: 13666
diff changeset
   206
          end
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   207
      | cert (TFree (x, S)) = TFree (x, cert_sort tsig S)
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   208
      | cert (TVar (xi as (_, i), S)) =
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   209
          if i < 0 then
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   210
            err ("Malformed type variable: " ^ quote (Term.string_of_vname xi))
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   211
          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: 13666
diff changeset
   212
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   213
    val ty' = cert ty;
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   214
  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: 14790
diff changeset
   215
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   216
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: 13666
diff changeset
   217
14998
wenzelm
parents: 14993
diff changeset
   218
end;
wenzelm
parents: 14993
diff changeset
   219
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: 13666
diff changeset
   220
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   221
(* type arities *)
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   222
27302
8d12ac6a3e1c type constructors now with markup
haftmann
parents: 27273
diff changeset
   223
fun arity_number tsig a =
8d12ac6a3e1c type constructors now with markup
haftmann
parents: 27273
diff changeset
   224
  (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: 33097
diff changeset
   225
    SOME (LogicalType n) => n
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   226
  | _ => error (undecl_type a));
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   227
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   228
fun arity_sorts _ tsig a [] = replicate (arity_number tsig a) []
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   229
  | arity_sorts pp (TSig {classes, ...}) a S = Sorts.mg_domain (#2 classes) a S
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   230
      handle Sorts.CLASS_ERROR err => error (Sorts.class_error pp err);
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   231
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   232
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: 13666
diff changeset
   233
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: 13666
diff changeset
   234
(** 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: 13666
diff changeset
   235
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: 13666
diff changeset
   236
(* 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: 13666
diff changeset
   237
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: 13666
diff changeset
   238
fun strip_sorts (Type (a, Ts)) = Type (a, map strip_sorts Ts)
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: 13666
diff changeset
   239
  | strip_sorts (TFree (x, _)) = TFree (x, [])
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: 13666
diff changeset
   240
  | strip_sorts (TVar (xi, _)) = TVar (xi, []);
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: 13666
diff changeset
   241
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: 13666
diff changeset
   242
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: 13666
diff changeset
   243
(* no_tvars *)
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   244
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   245
fun no_tvars T =
29275
9fa69e3858d6 moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
wenzelm
parents: 29269
diff changeset
   246
  (case Term.add_tvarsT T [] of [] => T
12501
36b2ac65e18d varify returns newly introduced variables;
wenzelm
parents: 12314
diff changeset
   247
  | vs => raise TYPE ("Illegal schematic type variable(s): " ^
29275
9fa69e3858d6 moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
wenzelm
parents: 29269
diff changeset
   248
      commas_quote (map (Term.string_of_vname o #1) (rev vs)), [T], []));
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   249
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   250
19806
f860b7a98445 renamed Type.(un)varifyT to Logic.(un)varifyT;
wenzelm
parents: 19696
diff changeset
   251
(* varify *)
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   252
21116
be58cded79da fixed type signature of Type.varify
haftmann
parents: 20951
diff changeset
   253
fun varify fixed t =
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   254
  let
19305
5c16895d548b avoid polymorphic equality;
wenzelm
parents: 19250
diff changeset
   255
    val fs = Term.fold_types (Term.fold_atyps
5c16895d548b avoid polymorphic equality;
wenzelm
parents: 19250
diff changeset
   256
      (fn TFree v => if member (op =) fixed v then I else insert (op =) v | _ => I)) t [];
29260
010b4dd637fe varify: regular name context;
wenzelm
parents: 28991
diff changeset
   257
    val used = Name.context
010b4dd637fe varify: regular name context;
wenzelm
parents: 28991
diff changeset
   258
      |> fold_types (fold_atyps (fn TVar ((a, _), _) => Name.declare a | _ => I)) t;
010b4dd637fe varify: regular name context;
wenzelm
parents: 28991
diff changeset
   259
    val fmap = fs ~~ map (rpair 0) (#1 (Name.variants (map fst fs) used));
32784
1a5dde5079ac eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   260
    fun thaw (f as (_, S)) =
17184
3d80209e9a53 use AList operations;
wenzelm
parents: 16946
diff changeset
   261
      (case AList.lookup (op =) fmap f of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   262
        NONE => TFree f
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   263
      | SOME xi => TVar (xi, S));
21116
be58cded79da fixed type signature of Type.varify
haftmann
parents: 20951
diff changeset
   264
  in (fmap, map_types (map_type_tfree thaw) t) end;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   265
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   266
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   267
(* 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: 3175
diff changeset
   268
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   269
local
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   270
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   271
fun new_name (ix, (pairs, used)) =
20071
8f3e1ddb50e6 replaced Term.variant(list) by Name.variant(_list);
wenzelm
parents: 19806
diff changeset
   272
  let val v = Name.variant used (string_of_indexname ix)
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   273
  in ((ix, v) :: pairs, v :: used) end;
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   274
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   275
fun freeze_one alist (ix, sort) =
17184
3d80209e9a53 use AList operations;
wenzelm
parents: 16946
diff changeset
   276
  TFree (the (AList.lookup (op =) alist ix), sort)
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   277
    handle Option =>
3790
95a47d8bcd69 eliminated raise_term, raise_typ;
wenzelm
parents: 3411
diff changeset
   278
      raise TYPE ("Failure during freezing of ?" ^ string_of_indexname ix, [], []);
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   279
17184
3d80209e9a53 use AList operations;
wenzelm
parents: 16946
diff changeset
   280
fun thaw_one alist (a, sort) = TVar (the (AList.lookup (op =) alist a), sort)
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   281
  handle Option => TFree (a, sort);
416
12f9f36e4484 restored functor sig;
wenzelm
parents: 401
diff changeset
   282
10495
284ee538991c export freeze_thaw_type;
wenzelm
parents: 9504
diff changeset
   283
in
284ee538991c export freeze_thaw_type;
wenzelm
parents: 9504
diff changeset
   284
33832
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
   285
fun legacy_freeze_thaw_type T =
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   286
  let
29275
9fa69e3858d6 moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
wenzelm
parents: 29269
diff changeset
   287
    val used = OldTerm.add_typ_tfree_names (T, [])
9fa69e3858d6 moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
wenzelm
parents: 29269
diff changeset
   288
    and tvars = map #1 (OldTerm.add_typ_tvars (T, []));
23178
07ba6b58b3d2 simplified/unified list fold;
wenzelm
parents: 21934
diff changeset
   289
    val (alist, _) = List.foldr new_name ([], used) tvars;
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   290
  in (map_type_tvar (freeze_one alist) T, map_type_tfree (thaw_one (map swap alist))) end;
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   291
33832
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
   292
val legacy_freeze_type = #1 o legacy_freeze_thaw_type;
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   293
33832
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
   294
fun legacy_freeze_thaw t =
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   295
  let
29275
9fa69e3858d6 moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
wenzelm
parents: 29269
diff changeset
   296
    val used = OldTerm.it_term_types OldTerm.add_typ_tfree_names (t, [])
9fa69e3858d6 moved old add_type_XXX, add_term_XXX etc. to structure OldTerm;
wenzelm
parents: 29269
diff changeset
   297
    and tvars = map #1 (OldTerm.it_term_types OldTerm.add_typ_tvars (t, []));
23178
07ba6b58b3d2 simplified/unified list fold;
wenzelm
parents: 21934
diff changeset
   298
    val (alist, _) = List.foldr new_name ([], used) tvars;
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   299
  in
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   300
    (case alist of
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   301
      [] => (t, fn x => x) (*nothing to do!*)
20548
8ef25fe585a8 renamed Term.map_term_types to Term.map_types (cf. Term.fold_types);
wenzelm
parents: 20071
diff changeset
   302
    | _ => (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: 20071
diff changeset
   303
      map_types (map_type_tfree (thaw_one (map swap alist)))))
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   304
  end;
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   305
33832
cff42395c246 explicitly mark some legacy freeze operations;
wenzelm
parents: 33537
diff changeset
   306
val legacy_freeze = #1 o legacy_freeze_thaw;
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   307
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   308
end;
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   309
256
b401c3d06024 (this is a preliminary release)
wenzelm
parents: 200
diff changeset
   310
b401c3d06024 (this is a preliminary release)
wenzelm
parents: 200
diff changeset
   311
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: 13666
diff changeset
   312
(** matching and unification of types **)
8899
99266fe189a1 removed is_type_abbr;
wenzelm
parents: 8721
diff changeset
   313
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   314
type tyenv = (sort * typ) Vartab.table;
256
b401c3d06024 (this is a preliminary release)
wenzelm
parents: 200
diff changeset
   315
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   316
fun tvar_clash ixn S S' = raise TYPE ("Type variable " ^
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   317
  quote (Term.string_of_vname ixn) ^ " has two distinct sorts",
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   318
  [TVar (ixn, S), TVar (ixn, S')], []);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   319
26327
fc8df36e2644 Type.lookup now curried; typ_of_sort
haftmann
parents: 25384
diff changeset
   320
fun lookup tye (ixn, S) =
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   321
  (case Vartab.lookup tye ixn of
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   322
    NONE => NONE
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   323
  | SOME (S', T) => if S = S' then SOME T else tvar_clash ixn S S');
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   324
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   325
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: 13666
diff changeset
   326
(* matching *)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   327
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   328
exception TYPE_MATCH;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   329
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   330
fun typ_match tsig =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   331
  let
16340
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   332
    fun match (TVar (v, S), T) subs =
26327
fc8df36e2644 Type.lookup now curried; typ_of_sort
haftmann
parents: 25384
diff changeset
   333
          (case lookup subs (v, S) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   334
            NONE =>
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   335
              if of_sort tsig (T, S) then Vartab.update_new (v, (S, T)) subs
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   336
              else raise TYPE_MATCH
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   337
          | SOME U => if U = T then subs else raise TYPE_MATCH)
16340
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   338
      | match (Type (a, Ts), Type (b, Us)) subs =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   339
          if a <> b then raise TYPE_MATCH
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   340
          else matches (Ts, Us) subs
16340
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   341
      | match (TFree x, TFree y) subs =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   342
          if x = y then subs else raise TYPE_MATCH
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   343
      | match _ _ = raise TYPE_MATCH
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   344
    and matches (T :: Ts, U :: Us) subs = matches (Ts, Us) (match (T, U) subs)
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   345
      | matches _ subs = subs;
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   346
  in match end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   347
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: 13666
diff changeset
   348
fun typ_instance tsig (T, U) =
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   349
  (typ_match tsig (U, T) Vartab.empty; true) handle TYPE_MATCH => false;
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   350
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   351
(*purely structural matching*)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   352
fun raw_match (TVar (v, S), T) subs =
26327
fc8df36e2644 Type.lookup now curried; typ_of_sort
haftmann
parents: 25384
diff changeset
   353
      (case lookup subs (v, S) of
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   354
        NONE => Vartab.update_new (v, (S, T)) subs
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   355
      | SOME U => if U = T then subs else raise TYPE_MATCH)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   356
  | raw_match (Type (a, Ts), Type (b, Us)) subs =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   357
      if a <> b then raise TYPE_MATCH
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   358
      else raw_matches (Ts, Us) subs
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   359
  | raw_match (TFree x, TFree y) subs =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   360
      if x = y then subs else raise TYPE_MATCH
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   361
  | raw_match _ _ = raise TYPE_MATCH
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   362
and raw_matches (T :: Ts, U :: Us) subs = raw_matches (Ts, Us) (raw_match (T, U) subs)
19694
08894a78400b export raw_matches;
wenzelm
parents: 19642
diff changeset
   363
  | raw_matches ([], []) subs = subs
08894a78400b export raw_matches;
wenzelm
parents: 19642
diff changeset
   364
  | raw_matches _ _ = raise TYPE_MATCH;
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   365
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   366
fun raw_instance (T, U) =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   367
  (raw_match (U, T) Vartab.empty; true) handle TYPE_MATCH => false;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   368
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   369
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: 13666
diff changeset
   370
(* unification *)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   371
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   372
exception TUNIFY;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   373
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   374
(*occurs check*)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   375
fun occurs v tye =
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   376
  let
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   377
    fun occ (Type (_, Ts)) = exists occ Ts
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   378
      | occ (TFree _) = false
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   379
      | occ (TVar (w, S)) =
29269
5c25a2012975 moved term order operations to structure TermOrd (cf. Pure/term_ord.ML);
wenzelm
parents: 29260
diff changeset
   380
          Term.eq_ix (v, w) orelse
26327
fc8df36e2644 Type.lookup now curried; typ_of_sort
haftmann
parents: 25384
diff changeset
   381
            (case lookup tye (w, S) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   382
              NONE => false
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   383
            | SOME U => occ U);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   384
  in occ end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   385
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: 13666
diff changeset
   386
(*chase variable assignments; if devar returns a type var then it must be unassigned*)
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   387
fun devar tye (T as TVar v) =
26327
fc8df36e2644 Type.lookup now curried; typ_of_sort
haftmann
parents: 25384
diff changeset
   388
      (case lookup tye v of
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   389
        SOME U => devar tye U
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   390
      | NONE => T)
32784
1a5dde5079ac eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   391
  | devar _ T = T;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   392
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   393
(*order-sorted unification*)
32784
1a5dde5079ac eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   394
fun unify (TSig {classes = (_, classes), ...}) TU (tyenv, maxidx) =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   395
  let
32738
15bb09ca0378 explicit indication of Unsynchronized.ref;
wenzelm
parents: 32648
diff changeset
   396
    val tyvar_count = Unsynchronized.ref maxidx;
15bb09ca0378 explicit indication of Unsynchronized.ref;
wenzelm
parents: 32648
diff changeset
   397
    fun gen_tyvar S = TVar ((Name.aT, Unsynchronized.inc tyvar_count), S);
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   398
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   399
    fun mg_domain a S = Sorts.mg_domain classes a S
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   400
      handle Sorts.CLASS_ERROR _ => raise TUNIFY;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   401
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   402
    fun meet (_, []) tye = tye
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   403
      | 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: 13666
diff changeset
   404
          if Sorts.sort_le classes (S', S) then tye
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   405
          else Vartab.update_new
17221
6cd180204582 curried_lookup/update;
wenzelm
parents: 17184
diff changeset
   406
            (xi, (S', gen_tyvar (Sorts.inter_sort classes (S', S)))) tye
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   407
      | 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: 13666
diff changeset
   408
          if Sorts.sort_le classes (S', S) then tye
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   409
          else raise TUNIFY
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   410
      | meet (Type (a, Ts), S) tye = meets (Ts, mg_domain a S) tye
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   411
    and meets (T :: Ts, S :: Ss) tye = meets (Ts, Ss) (meet (devar tye T, S) tye)
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   412
      | meets _ tye = tye;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   413
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   414
    fun unif (ty1, ty2) tye =
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   415
      (case (devar tye ty1, devar tye ty2) of
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   416
        (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: 29260
diff changeset
   417
          if Term.eq_ix (v, w) then
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   418
            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: 13666
diff changeset
   419
          else if Sorts.sort_le classes (S1, S2) then
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   420
            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: 13666
diff changeset
   421
          else if Sorts.sort_le classes (S2, S1) then
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   422
            Vartab.update_new (v, (S1, U)) tye
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   423
          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: 13666
diff changeset
   424
            let val S = gen_tyvar (Sorts.inter_sort classes (S1, S2)) in
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   425
              Vartab.update_new (v, (S1, S)) (Vartab.update_new (w, (S2, S)) tye)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   426
            end
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   427
      | (TVar (v, S), T) =>
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   428
          if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   429
          else meet (T, S) (Vartab.update_new (v, (S, T)) tye)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   430
      | (T, TVar (v, S)) =>
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   431
          if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   432
          else meet (T, S) (Vartab.update_new (v, (S, T)) tye)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   433
      | (Type (a, Ts), Type (b, Us)) =>
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   434
          if a <> b then raise TUNIFY
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   435
          else unifs (Ts, Us) tye
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   436
      | (T, U) => if T = U then tye else raise TUNIFY)
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   437
    and unifs (T :: Ts, U :: Us) tye = unifs (Ts, Us) (unif (T, U) tye)
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   438
      | unifs _ tye = tye;
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   439
  in (unif TU tyenv, ! tyvar_count) end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   440
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   441
(*purely structural unification*)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   442
fun raw_unify (ty1, ty2) tye =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   443
  (case (devar tye ty1, devar tye ty2) of
32784
1a5dde5079ac eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   444
    (T as TVar (v, S1), TVar (w, S2)) =>
29269
5c25a2012975 moved term order operations to structure TermOrd (cf. Pure/term_ord.ML);
wenzelm
parents: 29260
diff changeset
   445
      if Term.eq_ix (v, w) then
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   446
        if S1 = S2 then tye else tvar_clash v S1 S2
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   447
      else Vartab.update_new (w, (S2, T)) tye
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   448
  | (TVar (v, S), T) =>
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   449
      if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   450
      else Vartab.update_new (v, (S, T)) tye
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   451
  | (T, TVar (v, S)) =>
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   452
      if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   453
      else Vartab.update_new (v, (S, T)) tye
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   454
  | (Type (a, Ts), Type (b, Us)) =>
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   455
      if a <> b then raise TUNIFY
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   456
      else raw_unifys (Ts, Us) tye
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   457
  | (T, U) => if T = U then tye else raise TUNIFY)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   458
and raw_unifys (T :: Ts, U :: Us) tye = raw_unifys (Ts, Us) (raw_unify (T, U) tye)
19696
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
   459
  | raw_unifys ([], []) tye = tye
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
   460
  | raw_unifys _ _ = raise TUNIFY;
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   461
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   462
(*fast unification filter*)
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   463
fun could_unify (Type (a, Ts), Type (b, Us)) = a = b andalso could_unifys (Ts, Us)
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   464
  | could_unify (TFree (a, _), TFree (b, _)) = a = b
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   465
  | could_unify (TVar _, _) = true
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   466
  | could_unify (_, TVar _) = true
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   467
  | could_unify _ = false
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   468
and could_unifys (T :: Ts, U :: Us) = could_unify (T, U) andalso could_unifys (Ts, Us)
19696
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
   469
  | could_unifys ([], []) = true
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
   470
  | could_unifys _ = false;
450
382b5368ec21 added raw_unify;
wenzelm
parents: 422
diff changeset
   471
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   472
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   473
(*equality with respect to a type environment*)
32030
49d7d0bb90c6 eq_type: special case for empty environment;
wenzelm
parents: 31946
diff changeset
   474
fun equal_type tye (T, T') =
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   475
  (case (devar tye T, devar tye T') of
16650
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   476
     (Type (s, Ts), Type (s', Ts')) =>
32030
49d7d0bb90c6 eq_type: special case for empty environment;
wenzelm
parents: 31946
diff changeset
   477
       s = s' andalso ListPair.all (equal_type tye) (Ts, Ts')
16650
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   478
   | (U, U') => U = U');
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   479
32030
49d7d0bb90c6 eq_type: special case for empty environment;
wenzelm
parents: 31946
diff changeset
   480
fun eq_type tye =
49d7d0bb90c6 eq_type: special case for empty environment;
wenzelm
parents: 31946
diff changeset
   481
  if Vartab.is_empty tye then op = else equal_type tye;
49d7d0bb90c6 eq_type: special case for empty environment;
wenzelm
parents: 31946
diff changeset
   482
450
382b5368ec21 added raw_unify;
wenzelm
parents: 422
diff changeset
   483
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   484
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: 13666
diff changeset
   485
(** 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: 13666
diff changeset
   486
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: 13666
diff changeset
   487
(* 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: 13666
diff changeset
   488
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   489
fun add_class pp naming (c, cs) tsig =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   490
  tsig |> map_tsig (fn ((space, classes), default, types) =>
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   491
    let
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   492
      val cs' = map (cert_class tsig) cs
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   493
        handle TYPE (msg, _, _) => error msg;
33095
bbd52d2f8696 renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
wenzelm
parents: 33094
diff changeset
   494
      val (c', space') = space |> Name_Space.declare true naming c;
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   495
      val classes' = classes |> Sorts.add_class pp (c', cs');
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   496
    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: 13666
diff changeset
   497
26669
c27efd6de25d simplified hide_XXX interfaces;
wenzelm
parents: 26641
diff changeset
   498
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: 33094
diff changeset
   499
  ((Name_Space.hide fully c space, classes), default, types));
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   500
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: 13666
diff changeset
   501
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   502
(* arities *)
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   503
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   504
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: 19464
diff changeset
   505
  let
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   506
    val _ =
27302
8d12ac6a3e1c type constructors now with markup
haftmann
parents: 27273
diff changeset
   507
      (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: 33097
diff changeset
   508
        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: 32784
diff changeset
   509
      | SOME _ => error ("Logical type constructor expected: " ^ quote t)
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   510
      | NONE => error (undecl_type t));
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   511
    val (Ss', S') = (map (cert_sort tsig) Ss, cert_sort tsig S)
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   512
      handle TYPE (msg, _, _) => error msg;
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   513
    val classes' = classes |> Sorts.add_arities pp ((t, map (fn c' => (c', Ss')) S'));
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   514
  in ((space, classes'), default, types) end);
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   516
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   517
(* classrel *)
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   518
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   519
fun add_classrel pp rel tsig =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   520
  tsig |> map_tsig (fn ((space, classes), default, types) =>
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   521
    let
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   522
      val rel' = pairself (cert_class tsig) rel
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   523
        handle TYPE (msg, _, _) => error msg;
32784
1a5dde5079ac eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   524
      val classes' = classes |> Sorts.add_classrel pp rel';
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   525
    in ((space, classes'), default, types) end);
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   526
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   527
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: 13666
diff changeset
   528
(* 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: 13666
diff changeset
   529
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   530
fun set_defsort S tsig = tsig |> map_tsig (fn (classes, _, types) =>
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   531
  (classes, cert_sort tsig S handle TYPE (msg, _, _) => error msg, types));
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   532
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   533
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: 13666
diff changeset
   534
(* 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: 13666
diff changeset
   535
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: 13666
diff changeset
   536
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: 13666
diff changeset
   537
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   538
fun new_decl naming (c, decl) types =
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   539
  #2 (Name_Space.define true naming (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: 13666
diff changeset
   540
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   541
fun map_types f = map_tsig (fn (classes, default, types) =>
19579
b802d1804b77 replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
wenzelm
parents: 19530
diff changeset
   542
  let
b802d1804b77 replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
wenzelm
parents: 19530
diff changeset
   543
    val (space', tab') = f types;
33095
bbd52d2f8696 renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
wenzelm
parents: 33094
diff changeset
   544
    val _ = Name_Space.intern space' "dummy" = "dummy" orelse
21858
05f57309170c avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents: 21116
diff changeset
   545
      error "Illegal declaration of dummy type";
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   546
  in (classes, default, (space', tab')) end);
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   547
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   548
fun syntactic types (Type (c, Ts)) =
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   549
      (case Symtab.lookup types c of SOME Nonterminal => true | _ => false)
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   550
        orelse exists (syntactic types) Ts
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   551
  | syntactic _ _ = false;
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   552
27302
8d12ac6a3e1c type constructors now with markup
haftmann
parents: 27273
diff changeset
   553
in
8d12ac6a3e1c type constructors now with markup
haftmann
parents: 27273
diff changeset
   554
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   555
fun add_type naming (c, n) =
33094
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   556
  if n < 0 then error ("Bad type constructor declaration " ^ quote (Binding.str_of c))
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   557
  else map_types (new_decl naming (c, LogicalType n));
27302
8d12ac6a3e1c type constructors now with markup
haftmann
parents: 27273
diff changeset
   558
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   559
fun add_abbrev naming (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: 13666
diff changeset
   560
  let
30343
79f022df8527 replace old bstring by binding for logical primitives: class, type, const etc.;
wenzelm
parents: 29275
diff changeset
   561
    fun err msg =
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   562
      cat_error msg ("The error(s) above occurred in type abbreviation " ^
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   563
        quote (Binding.str_of a));
24274
cb9236269af1 type mode: models certification mode (default, syntax, abbrev);
wenzelm
parents: 23655
diff changeset
   564
    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: 13666
diff changeset
   565
      handle TYPE (msg, _, _) => err msg;
33094
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   566
    val _ =
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   567
      (case duplicates (op =) vs of
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   568
        [] => []
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   569
      | dups => err ("Duplicate variables on lhs: " ^ commas_quote dups));
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   570
    val _ =
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   571
      (case subtract (op =) vs (map #1 (Term.add_tfreesT rhs' [])) of
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   572
        [] => []
ef0d77b1e687 eliminated separate stamp -- NameSpace.define/merge etc. ensure uniqueness already;
wenzelm
parents: 32784
diff changeset
   573
      | extras => err ("Extra variables on rhs: " ^ commas_quote extras));
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   574
  in types |> new_decl naming (a, Abbreviation (vs, rhs', syntactic (#2 types) rhs')) end);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   575
33173
b8ca12f6681a eliminated obsolete tags for types/consts -- now handled via name space, in strongly typed fashion;
wenzelm
parents: 33097
diff changeset
   576
fun add_nonterminal naming = map_types o new_decl naming 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: 13666
diff changeset
   577
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: 13666
diff changeset
   578
end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   579
26669
c27efd6de25d simplified hide_XXX interfaces;
wenzelm
parents: 26641
diff changeset
   580
fun hide_type fully c = map_tsig (fn (classes, default, (space, types)) =>
33095
bbd52d2f8696 renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
wenzelm
parents: 33094
diff changeset
   581
  (classes, default, (Name_Space.hide fully c space, types)));
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   582
3790
95a47d8bcd69 eliminated raise_term, raise_typ;
wenzelm
parents: 3411
diff changeset
   583
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: 13666
diff changeset
   584
(* 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: 13666
diff changeset
   585
14830
faa4865ba1ce removed norm_typ; improved output; refer to Pretty.pp;
wenzelm
parents: 14790
diff changeset
   586
fun merge_tsigs 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: 13666
diff changeset
   587
  let
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   588
    val (TSig {classes = (space1, classes1), default = default1, types = types1,
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   589
      log_types = _}) = tsig1;
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   590
    val (TSig {classes = (space2, classes2), default = default2, types = types2,
26641
cf67665296c2 tsig: removed unnecessary universal witness;
wenzelm
parents: 26517
diff changeset
   591
      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: 13666
diff changeset
   592
33095
bbd52d2f8696 renamed NameSpace to Name_Space -- also to emphasize its subtle change in semantics;
wenzelm
parents: 33094
diff changeset
   593
    val space' = Name_Space.merge (space1, space2);
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   594
    val classes' = Sorts.merge_algebra pp (classes1, classes2);
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   595
    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: 33094
diff changeset
   596
    val types' = Name_Space.merge_tables (types1, types2);
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   597
  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: 13666
diff changeset
   598
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   599
end;