src/Pure/type.ML
author wenzelm
Mon, 22 May 2006 21:27:01 +0200
changeset 19696 26a268c299d8
parent 19694 08894a78400b
child 19806 f860b7a98445
permissions -rw-r--r--
export raw_unifys, could_unifys;
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
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     2
    ID:         $Id$
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
     3
    Author:     Tobias Nipkow, Lawrence C Paulson, and Markus Wenzel
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     4
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
     5
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
     6
matching and unification of types, extend and merge type signatures.
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     7
*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     8
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     9
signature TYPE =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    10
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
    11
  (*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
    12
  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
    13
    LogicalType of int |
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
    14
    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
    15
    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
    16
  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
    17
  val rep_tsig: tsig ->
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
    18
   {classes: NameSpace.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
    19
    default: sort,
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
    20
    types: (decl * stamp) NameSpace.table,
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
    log_types: 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
    22
    witness: (typ * sort) option}
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 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
    24
  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
    25
  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
    26
  val universal_witness: tsig -> (typ * sort) option
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
    27
  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
    28
  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
    29
  val of_sort: tsig -> typ * sort -> bool
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
    30
  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
    31
  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
    32
  val cert_sort: tsig -> sort -> 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
    33
  val witness_sorts: tsig -> sort list -> sort list -> (typ * sort) list
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
    34
  val cert_typ: tsig -> typ -> typ
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
    35
  val cert_typ_syntax: tsig -> typ -> typ
16340
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
    36
  val cert_typ_abbrev: tsig -> typ -> typ
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
    37
  val arity_number: tsig -> string -> int
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
    38
  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
    39
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
    40
  (*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
    41
  val strip_sorts: typ -> typ
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
    42
  val no_tvars: typ -> typ
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
    43
  val varifyT: typ -> typ
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
    44
  val unvarifyT: typ -> typ
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
    45
  val varify: term * (string * sort) list -> term * ((string * sort) * indexname) list
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
    46
  val freeze_thaw_type: typ -> typ * (typ -> typ)
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
    47
  val freeze_type: typ -> typ
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
    48
  val freeze_thaw: term -> term * (term -> term)
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
    49
  val freeze: term -> term
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    50
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
    51
  (*matching and unification*)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    52
  exception TYPE_MATCH
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
    53
  type tyenv
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
    54
  val lookup: tyenv * (indexname * sort) -> typ option
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    55
  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
    56
  val typ_instance: tsig -> typ * typ -> bool
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    57
  val raw_match: typ * typ -> tyenv -> tyenv
19694
08894a78400b export raw_matches;
wenzelm
parents: 19642
diff changeset
    58
  val raw_matches: typ list * typ list -> tyenv -> tyenv
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    59
  val raw_instance: typ * typ -> bool
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    60
  exception TUNIFY
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    61
  val unify: tsig -> typ * typ -> tyenv * int -> tyenv * int
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
    62
  val raw_unify: typ * typ -> tyenv -> tyenv
19696
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
    63
  val raw_unifys: typ list * typ list -> tyenv -> tyenv
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
    64
  val could_unify: typ * typ -> bool
19696
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
    65
  val could_unifys: typ list * typ list -> bool
16650
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
    66
  val eq_type: tyenv -> typ * typ -> bool
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    67
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
    68
  (*extend and merge type signatures*)
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
    69
  val add_class: Pretty.pp -> NameSpace.naming -> bstring * class list -> tsig -> tsig
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
    70
  val hide_classes: bool -> string list -> 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
    71
  val set_defsort: sort -> tsig -> tsig
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
    72
  val add_types: NameSpace.naming -> (bstring * int) list -> tsig -> tsig
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
    73
  val add_abbrevs: NameSpace.naming -> (string * string list * typ) list -> tsig -> tsig
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
    74
  val add_nonterminals: NameSpace.naming -> string list -> tsig -> tsig
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
    75
  val hide_types: bool -> string list -> tsig -> tsig
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
    76
  val add_arity: Pretty.pp -> arity -> tsig -> tsig
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
    77
  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
    78
  val merge_tsigs: Pretty.pp -> tsig * tsig -> tsig
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    79
end;
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    80
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    81
structure Type: TYPE =
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    82
struct
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    83
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
    84
(** type signatures and certified types **)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
    85
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
    86
(* 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
    87
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
    88
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
    89
  LogicalType of int |
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
    90
  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
    91
  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
    92
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
    93
fun str_of_decl (LogicalType _) = "logical type constructor"
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
  | str_of_decl (Abbreviation _) = "type abbreviation"
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
  | str_of_decl Nonterminal = "syntactic type";
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
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
(* 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
    99
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
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
   101
  TSig of {
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   102
    classes: NameSpace.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
   103
    default: sort,                          (*default sort on input*)
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   104
    types: (decl * stamp) NameSpace.table,  (*declared types*)
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   105
    log_types: string list,                 (*logical types sorted by number of arguments*)
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   106
    witness: (typ * sort) option};          (*witness for non-emptiness of strictest 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
   107
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
   108
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
   109
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   110
fun make_tsig (classes, default, types, log_types, witness) =
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   111
  TSig {classes = classes, default = default, types = 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
    log_types = log_types, witness = witness};
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
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   114
fun build_tsig ((space, 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
   115
  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
   116
    val log_types =
17756
d4a35f82fbb4 minor tweaks for Poplog/ML;
wenzelm
parents: 17496
diff changeset
   117
      Symtab.fold (fn (c, (LogicalType n, _)) => cons (c, n) | _ => I) (snd types) []
d4a35f82fbb4 minor tweaks for Poplog/ML;
wenzelm
parents: 17496
diff changeset
   118
      |> Library.sort (Library.int_ord o pairself snd) |> map fst;
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
   119
    val witness =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   120
      (case Sorts.witness_sorts classes log_types [] [Sorts.classes classes] of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   121
        [w] => SOME w | _ => NONE);
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   122
  in make_tsig ((space, classes), default, types, log_types, witness) 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
   123
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   124
fun map_tsig f (TSig {classes, default, types, log_types = _, witness = _}) =
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   125
  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
   126
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   127
val empty_tsig =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   128
  build_tsig ((NameSpace.empty, Sorts.empty_algebra), [], NameSpace.empty_table);
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
   129
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
   130
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
   131
(* 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
   132
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
   133
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
   134
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
   135
fun universal_witness (TSig {witness, ...}) = witness;
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
   136
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   137
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
   138
fun subsort (TSig {classes, ...}) = Sorts.sort_le (#2 classes);
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   139
fun of_sort (TSig {classes, ...}) = Sorts.of_sort (#2 classes);
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   140
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
   141
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   142
fun cert_class (TSig {classes, ...}) = Sorts.certify_class (#2 classes);
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   143
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
   144
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   145
fun witness_sorts (tsig as TSig {classes, log_types, ...}) =
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   146
  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
   147
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
   148
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
   149
(* 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
   150
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
   151
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
   152
fun undecl_type c = "Undeclared type constructor: " ^ quote c;
faa4865ba1ce removed norm_typ; improved output; refer to Pretty.pp;
wenzelm
parents: 14790
diff changeset
   153
14998
wenzelm
parents: 14993
diff changeset
   154
local
wenzelm
parents: 14993
diff changeset
   155
wenzelm
parents: 14993
diff changeset
   156
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
   157
  | inst_typ env (T as TFree (x, _)) = the_default T (AList.lookup (op =) env x)
14998
wenzelm
parents: 14993
diff changeset
   158
  | inst_typ _ T = T;
wenzelm
parents: 14993
diff changeset
   159
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
   160
fun certify_typ normalize syntax tsig 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
   161
  let
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   162
    val TSig {types = (_, types), ...} = 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
   163
    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
   164
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   165
    val check_syntax =
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   166
      if syntax then K ()
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   167
      else fn c => err ("Illegal occurrence of syntactic type: " ^ quote c);
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   168
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   169
    fun cert (T as Type (c, Ts)) =
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   170
          let
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   171
            val Ts' = map cert Ts;
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   172
            fun nargs n = if length Ts <> n then err (bad_nargs c) else ();
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   173
          in
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   174
            (case Symtab.lookup types c of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   175
              SOME (LogicalType n, _) => (nargs n; Type (c, Ts'))
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   176
            | SOME (Abbreviation (vs, U, syn), _) => (nargs (length vs);
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   177
                if syn then check_syntax c else ();
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   178
                if normalize then inst_typ (vs ~~ Ts') U
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   179
                else Type (c, Ts'))
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   180
            | SOME (Nonterminal, _) => (nargs 0; check_syntax c; T)
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   181
            | NONE => err (undecl_type c))
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
   182
          end
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   183
      | cert (TFree (x, S)) = TFree (x, cert_sort tsig S)
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   184
      | cert (TVar (xi as (_, i), S)) =
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   185
          if i < 0 then
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   186
            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
   187
          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
   188
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   189
    val ty' = cert ty;
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14989
diff changeset
   190
  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
   191
14998
wenzelm
parents: 14993
diff changeset
   192
in
wenzelm
parents: 14993
diff changeset
   193
16340
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   194
val cert_typ        = certify_typ true false;
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   195
val cert_typ_syntax = certify_typ true true;
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   196
val cert_typ_abbrev = certify_typ false true;
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
   197
14998
wenzelm
parents: 14993
diff changeset
   198
end;
wenzelm
parents: 14993
diff changeset
   199
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
   200
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   201
(* type arities *)
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   202
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   203
fun arity_number (TSig {types = (_, types), ...}) a =
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   204
  (case Symtab.lookup types a of
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   205
    SOME (LogicalType n, _) => n
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   206
  | _ => error (undecl_type a));
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   207
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   208
fun arity_sorts _ tsig a [] = replicate (arity_number tsig a) []
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   209
  | arity_sorts pp (TSig {classes, ...}) a S = Sorts.mg_domain (#2 classes) a S
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   210
      handle Sorts.CLASS_ERROR err => Sorts.class_error pp err;
19464
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   211
d13309e30aba added inter_sort;
wenzelm
parents: 19305
diff changeset
   212
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
   213
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
   214
(** 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
   215
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
   216
(* 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
   217
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
   218
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
   219
  | 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
   220
  | 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
   221
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
   222
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
   223
(* no_tvars *)
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   224
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   225
fun no_tvars T =
12501
36b2ac65e18d varify returns newly introduced variables;
wenzelm
parents: 12314
diff changeset
   226
  (case typ_tvars T of [] => T
36b2ac65e18d varify returns newly introduced variables;
wenzelm
parents: 12314
diff changeset
   227
  | vs => raise TYPE ("Illegal schematic type variable(s): " ^
14830
faa4865ba1ce removed norm_typ; improved output; refer to Pretty.pp;
wenzelm
parents: 14790
diff changeset
   228
      commas_quote (map (Term.string_of_vname o #1) vs), [T], []));
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   229
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   230
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   231
(* varify, unvarify *)
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   232
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   233
val varifyT = map_type_tfree (fn (a, S) => TVar ((a, 0), S));
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   234
val unvarifyT = map_type_tvar (fn ((a, 0), S) => TFree (a, S) | v => TVar v);
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   235
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   236
fun varify (t, fixed) =
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   237
  let
19305
5c16895d548b avoid polymorphic equality;
wenzelm
parents: 19250
diff changeset
   238
    val fs = Term.fold_types (Term.fold_atyps
5c16895d548b avoid polymorphic equality;
wenzelm
parents: 19250
diff changeset
   239
      (fn TFree v => if member (op =) fixed v then I else insert (op =) v | _ => I)) t [];
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   240
    val ixns = add_term_tvar_ixns (t, []);
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   241
    val fmap = fs ~~ map (rpair 0) (variantlist (map fst fs, map #1 ixns))
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   242
    fun thaw (f as (a, S)) =
17184
3d80209e9a53 use AList operations;
wenzelm
parents: 16946
diff changeset
   243
      (case AList.lookup (op =) fmap f of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   244
        NONE => TFree f
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   245
      | SOME xi => TVar (xi, S));
12501
36b2ac65e18d varify returns newly introduced variables;
wenzelm
parents: 12314
diff changeset
   246
  in (map_term_types (map_type_tfree thaw) t, fmap) end;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   247
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   248
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   249
(* 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
   250
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   251
local
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   252
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   253
fun new_name (ix, (pairs, used)) =
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   254
  let val v = variant used (string_of_indexname ix)
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   255
  in ((ix, v) :: pairs, v :: used) end;
621
9d8791da0208 improved expand_typ (now handles TVars);
wenzelm
parents: 585
diff changeset
   256
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   257
fun freeze_one alist (ix, sort) =
17184
3d80209e9a53 use AList operations;
wenzelm
parents: 16946
diff changeset
   258
  TFree (the (AList.lookup (op =) alist ix), sort)
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   259
    handle Option =>
3790
95a47d8bcd69 eliminated raise_term, raise_typ;
wenzelm
parents: 3411
diff changeset
   260
      raise TYPE ("Failure during freezing of ?" ^ string_of_indexname ix, [], []);
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   261
17184
3d80209e9a53 use AList operations;
wenzelm
parents: 16946
diff changeset
   262
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
   263
  handle Option => TFree (a, sort);
416
12f9f36e4484 restored functor sig;
wenzelm
parents: 401
diff changeset
   264
10495
284ee538991c export freeze_thaw_type;
wenzelm
parents: 9504
diff changeset
   265
in
284ee538991c export freeze_thaw_type;
wenzelm
parents: 9504
diff changeset
   266
284ee538991c export freeze_thaw_type;
wenzelm
parents: 9504
diff changeset
   267
(*this sort of code could replace unvarifyT*)
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   268
fun freeze_thaw_type T =
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   269
  let
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   270
    val used = add_typ_tfree_names (T, [])
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   271
    and tvars = map #1 (add_typ_tvars (T, []));
15574
b1d1b5bfc464 Removed practically all references to Library.foldr.
skalberg
parents: 15570
diff changeset
   272
    val (alist, _) = foldr new_name ([], used) tvars;
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   273
  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
   274
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   275
val freeze_type = #1 o freeze_thaw_type;
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   276
3411
163f8f4a42d7 Removal of freeze_vars and thaw_vars. New freeze_thaw
paulson
parents: 3175
diff changeset
   277
fun freeze_thaw t =
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   278
  let
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   279
    val used = it_term_types add_typ_tfree_names (t, [])
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   280
    and tvars = map #1 (it_term_types add_typ_tvars (t, []));
15574
b1d1b5bfc464 Removed practically all references to Library.foldr.
skalberg
parents: 15570
diff changeset
   281
    val (alist, _) = foldr new_name ([], used) tvars;
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   282
  in
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   283
    (case alist of
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   284
      [] => (t, fn x => x) (*nothing to do!*)
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   285
    | _ => (map_term_types (map_type_tvar (freeze_one alist)) t,
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   286
      map_term_types (map_type_tfree (thaw_one (map swap alist)))))
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   287
  end;
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   288
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   289
val freeze = #1 o freeze_thaw;
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   290
7641
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   291
end;
f058df348272 added witness_sorts, univ_witness;
wenzelm
parents: 7247
diff changeset
   292
256
b401c3d06024 (this is a preliminary release)
wenzelm
parents: 200
diff changeset
   293
b401c3d06024 (this is a preliminary release)
wenzelm
parents: 200
diff changeset
   294
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
   295
(** matching and unification of types **)
8899
99266fe189a1 removed is_type_abbr;
wenzelm
parents: 8721
diff changeset
   296
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   297
type tyenv = (sort * typ) Vartab.table;
256
b401c3d06024 (this is a preliminary release)
wenzelm
parents: 200
diff changeset
   298
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   299
fun tvar_clash ixn S S' = raise TYPE ("Type variable " ^
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   300
  quote (Term.string_of_vname ixn) ^ " has two distinct sorts",
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   301
  [TVar (ixn, S), TVar (ixn, S')], []);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   302
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   303
fun lookup (tye, (ixn, S)) =
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   304
  (case Vartab.lookup tye ixn of
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   305
    NONE => NONE
16289
958207815931 added Type.freeze(_type);
wenzelm
parents: 15797
diff changeset
   306
  | 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
   307
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   308
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
   309
(* matching *)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   310
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   311
exception TYPE_MATCH;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   312
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   313
fun typ_match tsig =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   314
  let
16340
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   315
    fun match (TVar (v, S), T) subs =
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   316
          (case lookup (subs, (v, S)) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   317
            NONE =>
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   318
              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
   319
              else raise TYPE_MATCH
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   320
          | 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
   321
      | match (Type (a, Ts), Type (b, Us)) subs =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   322
          if a <> b then raise TYPE_MATCH
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   323
          else matches (Ts, Us) subs
16340
fd027bb32896 renamed cert_typ_raw to cert_typ_abbrev;
wenzelm
parents: 16289
diff changeset
   324
      | match (TFree x, TFree y) subs =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   325
          if x = y then subs else raise TYPE_MATCH
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   326
      | match _ _ = raise TYPE_MATCH
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   327
    and matches (T :: Ts, U :: Us) subs = matches (Ts, Us) (match (T, U) subs)
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   328
      | matches _ subs = subs;
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   329
  in match end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   330
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
   331
fun typ_instance tsig (T, U) =
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   332
  (typ_match tsig (U, T) Vartab.empty; true) handle TYPE_MATCH => false;
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   333
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   334
(*purely structural matching*)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   335
fun raw_match (TVar (v, S), T) subs =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   336
      (case lookup (subs, (v, S)) of
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   337
        NONE => Vartab.update_new (v, (S, T)) subs
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   338
      | SOME U => if U = T then subs else raise TYPE_MATCH)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   339
  | raw_match (Type (a, Ts), Type (b, Us)) subs =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   340
      if a <> b then raise TYPE_MATCH
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   341
      else raw_matches (Ts, Us) subs
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   342
  | raw_match (TFree x, TFree y) subs =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   343
      if x = y then subs else raise TYPE_MATCH
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   344
  | raw_match _ _ = raise TYPE_MATCH
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   345
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
   346
  | raw_matches ([], []) subs = subs
08894a78400b export raw_matches;
wenzelm
parents: 19642
diff changeset
   347
  | raw_matches _ _ = raise TYPE_MATCH;
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   348
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   349
fun raw_instance (T, U) =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   350
  (raw_match (U, T) Vartab.empty; true) handle TYPE_MATCH => false;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   351
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   352
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
   353
(* unification *)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   354
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   355
exception TUNIFY;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   356
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
   357
(*occurs_check*)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   358
fun occurs v tye =
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   359
  let
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   360
    fun occ (Type (_, Ts)) = exists occ Ts
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   361
      | occ (TFree _) = false
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   362
      | occ (TVar (w, S)) =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   363
          eq_ix (v, w) orelse
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   364
            (case lookup (tye, (w, S)) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   365
              NONE => false
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   366
            | SOME U => occ U);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   367
  in occ end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   368
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
   369
(*chase variable assignments; if devar returns a type var then it must be unassigned*)
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   370
fun devar tye (T as TVar v) =
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   371
      (case lookup (tye, v) of
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   372
        SOME U => devar tye U
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14998
diff changeset
   373
      | NONE => T)
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   374
  | devar tye T = T;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   375
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   376
(*order-sorted unification*)
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   377
fun unify (tsig as TSig {classes = (_, classes), ...}) TU (tyenv, maxidx) =
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   378
  let
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   379
    val tyvar_count = ref maxidx;
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   380
    fun gen_tyvar S = TVar (("'a", inc tyvar_count), S);
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   381
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   382
    fun mg_domain a S = Sorts.mg_domain classes a S
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   383
      handle Sorts.CLASS_ERROR _ => raise TUNIFY;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   384
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   385
    fun meet (_, []) tye = tye
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   386
      | 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
   387
          if Sorts.sort_le classes (S', S) then tye
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   388
          else Vartab.update_new
17221
6cd180204582 curried_lookup/update;
wenzelm
parents: 17184
diff changeset
   389
            (xi, (S', gen_tyvar (Sorts.inter_sort classes (S', S)))) tye
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   390
      | 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
   391
          if Sorts.sort_le classes (S', S) then tye
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   392
          else raise TUNIFY
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   393
      | meet (Type (a, Ts), S) tye = meets (Ts, mg_domain a S) tye
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   394
    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
   395
      | meets _ tye = tye;
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   396
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   397
    fun unif (ty1, ty2) tye =
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   398
      (case (devar tye ty1, devar tye ty2) of
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   399
        (T as TVar (v, S1), U as TVar (w, S2)) =>
15797
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   400
          if eq_ix (v, w) then
a63605582573 - Eliminated nodup_vars check.
berghofe
parents: 15574
diff changeset
   401
            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
   402
          else if Sorts.sort_le classes (S1, S2) then
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   403
            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
   404
          else if Sorts.sort_le classes (S2, S1) then
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   405
            Vartab.update_new (v, (S1, U)) tye
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   406
          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
   407
            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
   408
              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
   409
            end
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   410
      | (TVar (v, S), T) =>
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   411
          if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   412
          else meet (T, S) (Vartab.update_new (v, (S, T)) tye)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   413
      | (T, TVar (v, S)) =>
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   414
          if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   415
          else meet (T, S) (Vartab.update_new (v, (S, T)) tye)
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   416
      | (Type (a, Ts), Type (b, Us)) =>
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   417
          if a <> b then raise TUNIFY
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   418
          else unifs (Ts, Us) tye
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   419
      | (T, U) => if T = U then tye else raise TUNIFY)
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   420
    and unifs (T :: Ts, U :: Us) tye = unifs (Ts, Us) (unif (T, U) tye)
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   421
      | unifs _ tye = tye;
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   422
  in (unif TU tyenv, ! tyvar_count) end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   423
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   424
(*purely structural unification*)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   425
fun raw_unify (ty1, ty2) tye =
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   426
  (case (devar tye ty1, devar tye ty2) of
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   427
    (T as TVar (v, S1), U as TVar (w, S2)) =>
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   428
      if eq_ix (v, w) then
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   429
        if S1 = S2 then tye else tvar_clash v S1 S2
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   430
      else Vartab.update_new (w, (S2, T)) tye
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   431
  | (TVar (v, S), T) =>
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   432
      if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   433
      else Vartab.update_new (v, (S, T)) tye
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   434
  | (T, TVar (v, S)) =>
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   435
      if occurs v tye T then raise TUNIFY
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   436
      else Vartab.update_new (v, (S, T)) tye
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   437
  | (Type (a, Ts), Type (b, Us)) =>
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   438
      if a <> b then raise TUNIFY
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   439
      else raw_unifys (Ts, Us) tye
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   440
  | (T, U) => if T = U then tye else raise TUNIFY)
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   441
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
   442
  | raw_unifys ([], []) tye = tye
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
   443
  | raw_unifys _ _ = raise TUNIFY;
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   444
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   445
(*fast unification filter*)
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   446
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
   447
  | could_unify (TFree (a, _), TFree (b, _)) = a = b
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   448
  | could_unify (TVar _, _) = true
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   449
  | could_unify (_, TVar _) = true
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   450
  | could_unify _ = false
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   451
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
   452
  | could_unifys ([], []) = true
26a268c299d8 export raw_unifys, could_unifys;
wenzelm
parents: 19694
diff changeset
   453
  | could_unifys _ = false;
450
382b5368ec21 added raw_unify;
wenzelm
parents: 422
diff changeset
   454
17804
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   455
4deae4b33d97 added could_unify;
wenzelm
parents: 17756
diff changeset
   456
(*equality with respect to a type environment*)
16650
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   457
fun eq_type tye (T, T') =
16885
cabcd33cde18 tuned match, unify;
wenzelm
parents: 16650
diff changeset
   458
  (case (devar tye T, devar tye T') of
16650
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   459
     (Type (s, Ts), Type (s', Ts')) =>
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   460
       s = s' andalso ListPair.all (eq_type tye) (Ts, Ts')
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   461
   | (U, U') => U = U');
bd4f7149ba1e Moved eq_type from envir.ML to type.ML
berghofe
parents: 16444
diff changeset
   462
450
382b5368ec21 added raw_unify;
wenzelm
parents: 422
diff changeset
   463
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   464
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
   465
(** 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
   466
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
   467
(* 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
   468
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   469
fun add_class pp naming (c, cs) tsig =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   470
  tsig |> map_tsig (fn ((space, classes), default, types) =>
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   471
    let
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   472
      val c' = NameSpace.full naming c;
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   473
      val cs' = map (cert_class tsig) cs
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   474
        handle TYPE (msg, _, _) => error msg;
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   475
      val space' = space |> NameSpace.declare naming c';
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   476
      val classes' = classes |> Sorts.add_class pp (c', cs');
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   477
    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
   478
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   479
fun hide_classes fully cs = map_tsig (fn ((space, classes), default, types) =>
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   480
  ((fold (NameSpace.hide fully) cs space, classes), default, types));
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   481
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
   482
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   483
(* arities *)
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   484
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   485
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
   486
  let
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   487
    val _ =
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   488
      (case Symtab.lookup (#2 types) t of
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   489
        SOME (LogicalType n, _) => if length Ss <> n then error (bad_nargs t) else ()
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   490
      | SOME (decl, _) => error ("Illegal " ^ str_of_decl decl ^ ": " ^ quote t)
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   491
      | NONE => error (undecl_type t));
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   492
    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
   493
      handle TYPE (msg, _, _) => error msg;
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   494
    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
   495
  in ((space, classes'), default, types) end);
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   496
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   497
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   498
(* classrel *)
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   499
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   500
fun add_classrel pp rel tsig =
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   501
  tsig |> map_tsig (fn ((space, classes), default, types) =>
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   502
    let
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   503
      val rel' = pairself (cert_class tsig) rel
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   504
        handle TYPE (msg, _, _) => error msg;
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   505
      val classes' = classes |> Sorts.add_classrel pp rel;
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   506
    in ((space, classes'), default, types) end);
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   507
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   508
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
   509
(* 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
   510
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   511
fun set_defsort S tsig = tsig |> map_tsig (fn (classes, _, types) =>
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   512
  (classes, cert_sort tsig S handle TYPE (msg, _, _) => error msg, types));
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   513
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   514
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
   515
(* 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
   516
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
   517
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
   518
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
   519
fun err_neg_args c =
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
   520
  error ("Negative number of arguments in type constructor declaration: " ^ quote c);
949
83c588d6fee9 Changed treatment of during type inference internally generated type
nipkow
parents: 621
diff changeset
   521
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
   522
fun err_in_decls c decl decl' =
14906
2da524f3d785 tuned messages;
wenzelm
parents: 14830
diff changeset
   523
  let val s = str_of_decl decl and s' = str_of_decl decl' in
2da524f3d785 tuned messages;
wenzelm
parents: 14830
diff changeset
   524
    if s = s' then error ("Duplicate declaration of " ^ s ^ ": " ^ quote c)
14830
faa4865ba1ce removed norm_typ; improved output; refer to Pretty.pp;
wenzelm
parents: 14790
diff changeset
   525
    else error ("Conflict of " ^ s ^ " with " ^ s' ^ ": " ^ quote c)
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
   526
  end;
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
   527
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   528
fun new_decl naming (c, decl) (space, types) =
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   529
  let
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   530
    val c' = NameSpace.full naming c;
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   531
    val space' = NameSpace.declare naming c' space;
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   532
    val types' =
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   533
      (case Symtab.lookup types c' of
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   534
        SOME (decl', _) => err_in_decls c' decl decl'
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   535
      | NONE => Symtab.update (c', (decl, stamp ())) types);
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   536
  in (space', 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
   537
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   538
fun the_decl (_, types) = fst o the o Symtab.lookup 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
   539
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   540
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
   541
  let
b802d1804b77 replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
wenzelm
parents: 19530
diff changeset
   542
    val (space', tab') = f types;
b802d1804b77 replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
wenzelm
parents: 19530
diff changeset
   543
    val _ = assert (NameSpace.intern space' "dummy" = "dummy") "Illegal declaration of dummy type";
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   544
  in (classes, default, (space', tab')) end);
2964
557a11310988 moved classes / sorts to sorts.ML;
wenzelm
parents: 2753
diff changeset
   545
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   546
fun syntactic types (Type (c, Ts)) =
17412
e26cb20ef0cc TableFun/Symtab: curried lookup and update;
wenzelm
parents: 17221
diff changeset
   547
      (case Symtab.lookup types c of SOME (Nonterminal, _) => true | _ => false)
14989
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   548
        orelse exists (syntactic types) Ts
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   549
  | syntactic _ _ = false;
5a5d076a9863 tuned certify_typ;
wenzelm
parents: 14906
diff changeset
   550
19579
b802d1804b77 replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
wenzelm
parents: 19530
diff changeset
   551
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
   552
  let
19250
932a50e2332f got rid of type Sign.sg;
wenzelm
parents: 18964
diff changeset
   553
    fun err msg = cat_error msg ("The error(s) above occurred in type abbreviation: " ^ quote a);
16946
7f9a7fe413f3 typ_match, unify: canonical argument order;
wenzelm
parents: 16885
diff changeset
   554
    val rhs' = strip_sorts (no_tvars (cert_typ_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
   555
      handle TYPE (msg, _, _) => err msg;
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
   556
  in
18964
67f572e03236 renamed gen_duplicates to duplicates;
wenzelm
parents: 18957
diff changeset
   557
    (case duplicates (op =) vs of
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
   558
      [] => []
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
   559
    | dups => err ("Duplicate variables on lhs: " ^ commas_quote dups));
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
    (case gen_rems (op =) (map (#1 o #1) (typ_tvars rhs'), vs) of
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
   561
      [] => []
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
   562
    | extras => err ("Extra variables on rhs: " ^ commas_quote extras));
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   563
    types |> new_decl naming (a, Abbreviation (vs, rhs', syntactic (#2 types) 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
   564
  end);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   565
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
   566
in
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
   567
19579
b802d1804b77 replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
wenzelm
parents: 19530
diff changeset
   568
fun add_types naming ps = map_types (fold (new_decl naming) (ps |> map (fn (c, n) =>
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
   569
  if n < 0 then err_neg_args c else (c, LogicalType n))));
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
   570
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   571
val add_abbrevs = fold o add_abbrev;
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   572
19579
b802d1804b77 replaced Sorts.DOMAIN by general Sorts.CLASS_ERROR;
wenzelm
parents: 19530
diff changeset
   573
fun add_nonterminals naming = map_types o fold (new_decl naming) o map (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
   574
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
   575
fun merge_types (types1, types2) =
17496
26535df536ae slight adaptions to library changes
haftmann
parents: 17412
diff changeset
   576
  NameSpace.merge_tables (Library.eq_snd (op =)) (types1, types2) handle Symtab.DUPS (d :: _) =>
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
    err_in_decls d (the_decl types1 d) (the_decl types2 d);
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
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
   579
end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   580
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   581
fun hide_types fully cs = map_tsig (fn (classes, default, (space, types)) =>
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   582
  (classes, default, (fold (NameSpace.hide fully) cs space, types)));
16370
033d890fe91f name space of classes and types maintained in tsig;
wenzelm
parents: 16340
diff changeset
   583
3790
95a47d8bcd69 eliminated raise_term, raise_typ;
wenzelm
parents: 3411
diff changeset
   584
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
   585
(* 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
   586
14830
faa4865ba1ce removed norm_typ; improved output; refer to Pretty.pp;
wenzelm
parents: 14790
diff changeset
   587
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
   588
  let
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   589
    val (TSig {classes = (space1, classes1), default = default1, types = types1,
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   590
      log_types = _, witness = _}) = tsig1;
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   591
    val (TSig {classes = (space2, classes2), default = default2, types = types2,
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   592
      log_types = _, witness = _}) = 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
   593
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   594
    val space' = NameSpace.merge (space1, space2);
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   595
    val classes' = Sorts.merge_algebra pp (classes1, classes2);
19515
9f650083da65 build classes/arities: refer to operations in sorts.ML;
wenzelm
parents: 19464
diff changeset
   596
    val default' = Sorts.inter_sort classes' (default1, default2);
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
   597
    val types' = merge_types (types1, types2);
19642
ea7162f84677 more abstract interface to classes/arities;
wenzelm
parents: 19579
diff changeset
   598
  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
   599
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   600
end;