src/Pure/consts.ML
author wenzelm
Tue, 10 Mar 2009 22:49:56 +0100
changeset 30424 692279df7cc2
parent 30364 577edc39b501
child 30466 5f31e24937c5
permissions -rw-r--r--
Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/consts.ML
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
     3
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
     4
Polymorphic constants: declarations, abbreviations, additional type
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
     5
constraints.
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
     6
*)
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
     7
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
     8
signature CONSTS =
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
     9
sig
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    10
  type T
30424
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    11
  val eq_consts: T * T -> bool
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    12
  val abbrevs_of: T -> string list -> (term * term) list
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
    13
  val dest: T ->
25404
1a58d1c9fe88 simplified Consts.dest;
wenzelm
parents: 25389
diff changeset
    14
   {constants: (typ * term option) NameSpace.table,
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
    15
    constraints: typ NameSpace.table}
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
    16
  val the_type: T -> string -> typ                             (*exception TYPE*)
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
    17
  val the_abbreviation: T -> string -> typ * term              (*exception TYPE*)
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
    18
  val type_scheme: T -> string -> typ                          (*exception TYPE*)
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 26050
diff changeset
    19
  val the_tags: T -> string -> Properties.T                    (*exception TYPE*)
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
    20
  val is_monomorphic: T -> string -> bool                      (*exception TYPE*)
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
    21
  val the_constraint: T -> string -> typ                       (*exception TYPE*)
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
    22
  val space_of: T -> NameSpace.T
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    23
  val intern: T -> xstring -> string
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    24
  val extern: T -> string -> xstring
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    25
  val extern_early: T -> string -> xstring
19657
25eaa3660123 added syntax interface;
wenzelm
parents: 19576
diff changeset
    26
  val syntax: T -> string * mixfix -> string * typ * mixfix
21181
13c3fdccdf0d added syntax_name;
wenzelm
parents: 20734
diff changeset
    27
  val syntax_name: T -> string -> string
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
    28
  val read_const: T -> string -> term
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
    29
  val certify: Pretty.pp -> Type.tsig -> bool -> T -> term -> term  (*exception TYPE*)
18146
47463b1825c6 uncurried Consts.typargs;
wenzelm
parents: 18117
diff changeset
    30
  val typargs: T -> string * typ -> typ list
18163
9b729737bf14 added instance;
wenzelm
parents: 18146
diff changeset
    31
  val instance: T -> string * typ list -> typ
29581
b3b33e0298eb binding is alias for Binding.T
haftmann
parents: 29251
diff changeset
    32
  val declare: bool -> NameSpace.naming -> Properties.T -> (binding * typ) -> T -> T
19098
fc736dbbe333 constrain: assert const declaration, optional type (i.e. may delete constraints);
wenzelm
parents: 19027
diff changeset
    33
  val constrain: string * typ option -> T -> T
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 26050
diff changeset
    34
  val abbreviate: Pretty.pp -> Type.tsig -> NameSpace.naming -> string -> Properties.T ->
29581
b3b33e0298eb binding is alias for Binding.T
haftmann
parents: 29251
diff changeset
    35
    binding * term -> T -> (term * term) * T
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
    36
  val revert_abbrev: string -> string -> T -> T
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    37
  val hide: bool -> string -> T -> T
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    38
  val empty: T
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    39
  val merge: T * T -> T
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    40
end;
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    41
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    42
structure Consts: CONSTS =
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    43
struct
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    44
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    45
(** consts type **)
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    46
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    47
(* datatype T *)
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    48
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 26050
diff changeset
    49
type decl = {T: typ, typargs: int list list, tags: Properties.T, authentic: bool};
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
    50
type abbrev = {rhs: term, normal_rhs: term, force_expand: bool};
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
    51
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    52
datatype T = Consts of
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
    53
 {decls: ((decl * abbrev option) * serial) NameSpace.table,
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    54
  constraints: typ Symtab.table,
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
    55
  rev_abbrevs: (term * term) list Symtab.table};
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    56
30424
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    57
fun eq_consts
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    58
   (Consts {decls = decls1, constraints = constraints1, rev_abbrevs = rev_abbrevs1},
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    59
    Consts {decls = decls2, constraints = constraints2, rev_abbrevs = rev_abbrevs2}) =
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    60
  pointer_eq (decls1, decls2) andalso
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    61
  pointer_eq (constraints1, constraints2) andalso
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    62
  pointer_eq (rev_abbrevs1, rev_abbrevs2);
692279df7cc2 Consts.eq_const is back again (cf. 907da436f8a9) -- required in ProofContext.transfer_syntax to prevent expensive merges of local_consts/global_consts;
wenzelm
parents: 30364
diff changeset
    63
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
    64
fun make_consts (decls, constraints, rev_abbrevs) =
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
    65
  Consts {decls = decls, constraints = constraints, rev_abbrevs = rev_abbrevs};
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    66
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
    67
fun map_consts f (Consts {decls, constraints, rev_abbrevs}) =
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
    68
  make_consts (f (decls, constraints, rev_abbrevs));
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    69
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
    70
fun abbrevs_of (Consts {rev_abbrevs, ...}) modes =
19482
9f11af8f7ef9 tuned basic list operators (flat, maps, map_filter);
wenzelm
parents: 19433
diff changeset
    71
  maps (Symtab.lookup_list rev_abbrevs) modes;
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    72
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
    73
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    74
(* dest consts *)
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    75
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
    76
fun dest (Consts {decls = (space, decls), constraints, ...}) =
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    77
 {constants = (space,
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
    78
    Symtab.fold (fn (c, (({T, ...}, abbr), _)) =>
25404
1a58d1c9fe88 simplified Consts.dest;
wenzelm
parents: 25389
diff changeset
    79
      Symtab.update (c, (T, Option.map #rhs abbr))) decls Symtab.empty),
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    80
  constraints = (space, constraints)};
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    81
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    82
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    83
(* lookup consts *)
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    84
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
    85
fun the_const (Consts {decls = (_, tab), ...}) c =
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
    86
  (case Symtab.lookup tab c of
24772
2b838dfeca1e maintain tags (Markup.property list);
wenzelm
parents: 24673
diff changeset
    87
    SOME (decl, _) => decl
25041
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
    88
  | NONE => raise TYPE ("Unknown constant: " ^ quote c, [], []));
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
    89
25041
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
    90
fun the_type consts c =
24772
2b838dfeca1e maintain tags (Markup.property list);
wenzelm
parents: 24673
diff changeset
    91
  (case the_const consts c of
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
    92
    ({T, ...}, NONE) => T
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
    93
  | _ => raise TYPE ("Not a logical constant: " ^ quote c, [], []));
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
    94
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
    95
fun the_abbreviation consts c =
24772
2b838dfeca1e maintain tags (Markup.property list);
wenzelm
parents: 24673
diff changeset
    96
  (case the_const consts c of
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
    97
    ({T, ...}, SOME {rhs, ...}) => (T, rhs)
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
    98
  | _ => raise TYPE ("Not an abbreviated constant: " ^ quote c, [], []));
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
    99
25041
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   100
val the_decl = #1 oo the_const;
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   101
val type_scheme = #T oo the_decl;
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   102
val type_arguments = #typargs oo the_decl;
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   103
val the_tags = #tags oo the_decl;
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   104
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
   105
val is_monomorphic = null oo type_arguments;
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   106
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
   107
fun the_constraint (consts as Consts {constraints, ...}) c =
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   108
  (case Symtab.lookup constraints c of
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   109
    SOME T => T
25041
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   110
  | NONE => type_scheme consts c);
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   111
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   112
19657
25eaa3660123 added syntax interface;
wenzelm
parents: 19576
diff changeset
   113
(* name space and syntax *)
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   114
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
   115
fun space_of (Consts {decls = (space, _), ...}) = space;
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   116
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   117
val intern = NameSpace.intern o space_of;
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   118
val extern = NameSpace.extern o space_of;
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   119
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   120
fun extern_early consts c =
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   121
  (case try (the_const consts) c of
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   122
    SOME ({authentic = true, ...}, _) => Syntax.constN ^ c
19576
179ad0076f75 extern_early: improved handling of undeclared constants;
wenzelm
parents: 19502
diff changeset
   123
  | _ => extern consts c);
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   124
19657
25eaa3660123 added syntax interface;
wenzelm
parents: 19576
diff changeset
   125
fun syntax consts (c, mx) =
25eaa3660123 added syntax interface;
wenzelm
parents: 19576
diff changeset
   126
  let
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   127
    val ({T, authentic, ...}, _) = the_const consts c handle TYPE (msg, _, _) => error msg;
30364
577edc39b501 moved basic algebra of long names from structure NameSpace to Long_Name;
wenzelm
parents: 30286
diff changeset
   128
    val c' = if authentic then Syntax.constN ^ c else Long_Name.base_name c;
19657
25eaa3660123 added syntax interface;
wenzelm
parents: 19576
diff changeset
   129
  in (c', T, mx) end;
25eaa3660123 added syntax interface;
wenzelm
parents: 19576
diff changeset
   130
21181
13c3fdccdf0d added syntax_name;
wenzelm
parents: 20734
diff changeset
   131
fun syntax_name consts c = #1 (syntax consts (c, NoSyn));
13c3fdccdf0d added syntax_name;
wenzelm
parents: 20734
diff changeset
   132
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   133
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   134
(* read_const *)
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   135
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   136
fun read_const consts raw_c =
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   137
  let
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   138
    val c = intern consts raw_c;
25041
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   139
    val T = type_scheme consts c handle TYPE (msg, _, _) => error msg;
21205
dfe338ec9f9c read_const: include type;
wenzelm
parents: 21181
diff changeset
   140
  in Const (c, T) end;
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   141
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   142
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   143
(* certify *)
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   144
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   145
fun certify pp tsig do_expand consts =
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   146
  let
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   147
    fun err msg (c, T) =
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   148
      raise TYPE (msg ^ " " ^ quote c ^ " :: " ^ Pretty.string_of_typ pp T, [], []);
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   149
    val certT = Type.cert_typ tsig;
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   150
    fun cert tm =
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   151
      let
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   152
        val (head, args) = Term.strip_comb tm;
21694
wenzelm
parents: 21680
diff changeset
   153
        val args' = map cert args;
wenzelm
parents: 21680
diff changeset
   154
        fun comb head' = Term.list_comb (head', args');
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   155
      in
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   156
        (case head of
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   157
          Abs (x, T, t) => comb (Abs (x, certT T, cert t))
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   158
        | Const (c, T) =>
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   159
            let
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   160
              val T' = certT T;
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   161
              val ({T = U, ...}, abbr) = the_const consts c;
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   162
              fun expand u =
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   163
                Term.betapplys (Envir.expand_atom T' (U, u) handle TYPE _ =>
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   164
                  err "Illegal type for abbreviation" (c, T), args');
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   165
            in
19433
c7a2b7a8c4cb certify: ignore sort constraints of declarations (MAJOR CHANGE);
wenzelm
parents: 19364
diff changeset
   166
              if not (Type.raw_instance (T', U)) then
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   167
                err "Illegal type for constant" (c, T)
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   168
              else
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   169
                (case abbr of
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   170
                  SOME {rhs, normal_rhs, force_expand} =>
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   171
                    if do_expand then expand normal_rhs
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   172
                    else if force_expand then expand rhs
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
   173
                    else comb head
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   174
                | _ => comb head)
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   175
            end
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   176
        | _ => comb head)
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   177
      end;
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   178
  in cert end;
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   179
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   180
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   181
(* typargs -- view actual const type as instance of declaration *)
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   182
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   183
local
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   184
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   185
fun args_of (Type (_, Ts)) pos = args_of_list Ts 0 pos
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   186
  | args_of (TVar v) pos = insert (eq_fst op =) (v, rev pos)
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   187
  | args_of (TFree _) _ = I
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   188
and args_of_list (T :: Ts) i is = args_of T (i :: is) #> args_of_list Ts (i + 1) is
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   189
  | args_of_list [] _ _ = I;
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   190
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   191
fun subscript (Type (_, Ts)) (i :: is) = subscript (nth Ts i) is
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   192
  | subscript T [] = T
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   193
  | subscript T _ = raise Subscript;
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   194
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   195
in
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   196
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   197
fun typargs_of T = map #2 (rev (args_of T [] []));
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   198
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   199
fun typargs consts (c, T) = map (subscript T) (type_arguments consts c);
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   200
24909
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   201
end;
afae05eb1f1c maintain typargs for abbrevs as well;
wenzelm
parents: 24772
diff changeset
   202
18163
9b729737bf14 added instance;
wenzelm
parents: 18146
diff changeset
   203
fun instance consts (c, Ts) =
9b729737bf14 added instance;
wenzelm
parents: 18146
diff changeset
   204
  let
25041
c1efae25ee76 renamed the_declaration to the_type;
wenzelm
parents: 25037
diff changeset
   205
    val declT = type_scheme consts c;
18163
9b729737bf14 added instance;
wenzelm
parents: 18146
diff changeset
   206
    val vars = map Term.dest_TVar (typargs consts (c, declT));
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   207
    val inst = vars ~~ Ts handle UnequalLengths =>
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   208
      raise TYPE ("Consts.instance", Ts, [Const (c, dummyT)]);
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   209
  in declT |> TermSubst.instantiateT inst end;
18163
9b729737bf14 added instance;
wenzelm
parents: 18146
diff changeset
   210
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   211
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   212
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   213
(** build consts **)
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   214
23655
d2d1138e0ddc replaced exception TableFun/GraphFun.DUPS by TableFun/GraphFun.DUP;
wenzelm
parents: 23086
diff changeset
   215
fun err_dup_const c =
d2d1138e0ddc replaced exception TableFun/GraphFun.DUPS by TableFun/GraphFun.DUP;
wenzelm
parents: 23086
diff changeset
   216
  error ("Duplicate declaration of constant " ^ quote c);
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   217
28965
1de908189869 cleaned up binding module and related code
haftmann
parents: 28861
diff changeset
   218
fun extend_decls naming decl tab = NameSpace.bind naming decl tab
23655
d2d1138e0ddc replaced exception TableFun/GraphFun.DUPS by TableFun/GraphFun.DUP;
wenzelm
parents: 23086
diff changeset
   219
  handle Symtab.DUP c => err_dup_const c;
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   220
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   221
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   222
(* name space *)
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   223
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   224
fun hide fully c = map_consts (fn (decls, constraints, rev_abbrevs) =>
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   225
  (apfst (NameSpace.hide fully c) decls, constraints, rev_abbrevs));
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   226
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   227
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   228
(* declarations *)
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   229
28861
f53abb0733ee using name bindings
haftmann
parents: 28017
diff changeset
   230
fun declare authentic naming tags (b, declT) = map_consts (fn (decls, constraints, rev_abbrevs) =>
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   231
  let
26050
88bb26089ef5 maintain default position;
wenzelm
parents: 25404
diff changeset
   232
    val tags' = tags |> Position.default_properties (Position.thread_data ());
88bb26089ef5 maintain default position;
wenzelm
parents: 25404
diff changeset
   233
    val decl = {T = declT, typargs = typargs_of declT, tags = tags', authentic = authentic};
28861
f53abb0733ee using name bindings
haftmann
parents: 28017
diff changeset
   234
    val (_, decls') = decls |> extend_decls naming (b, ((decl, NONE), serial ()));
24772
2b838dfeca1e maintain tags (Markup.property list);
wenzelm
parents: 24673
diff changeset
   235
  in (decls', constraints, rev_abbrevs) end);
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   236
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   237
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   238
(* constraints *)
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   239
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   240
fun constrain (c, C) consts =
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   241
  consts |> map_consts (fn (decls, constraints, rev_abbrevs) =>
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   242
    (the_const consts c handle TYPE (msg, _, _) => error msg;
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   243
      (decls,
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   244
        constraints |> (case C of SOME T => Symtab.update (c, T) | NONE => Symtab.delete_safe c),
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   245
        rev_abbrevs)));
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   246
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   247
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   248
(* abbreviations *)
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   249
19027
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   250
local
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   251
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   252
fun strip_abss tm = ([], tm) ::
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   253
  (case tm of
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   254
    Abs (a, T, t) =>
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   255
      if Term.loose_bvar1 (t, 0) then
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   256
        strip_abss t |> map (fn (xs, b) => ((a, T) :: xs, b))
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   257
      else []
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   258
  | _ => []);
19027
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   259
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
   260
fun rev_abbrev lhs rhs =
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   261
  let
19027
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   262
    fun abbrev (xs, body) =
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   263
      let val vars = fold (fn (x, T) => cons (Var ((x, 0), T))) (Term.rename_wrt_term body xs) []
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
   264
      in (Term.subst_bounds (rev vars, body), Term.list_comb (lhs, vars)) end;
19502
wenzelm
parents: 19482
diff changeset
   265
  in map abbrev (strip_abss (Envir.beta_eta_contract rhs)) end;
19027
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   266
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   267
in
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   268
28861
f53abb0733ee using name bindings
haftmann
parents: 28017
diff changeset
   269
fun abbreviate pp tsig naming mode tags (b, raw_rhs) consts =
18965
3b76383e3ab3 renamed space to space_of;
wenzelm
parents: 18935
diff changeset
   270
  let
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   271
    val cert_term = certify pp tsig false consts;
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   272
    val expand_term = certify pp tsig true consts;
25116
31551aae280f PrintMode.internal;
wenzelm
parents: 25048
diff changeset
   273
    val force_expand = mode = PrintMode.internal;
21720
059e6b8cee8e abbreviate: always authentic, force expansion of internal abbreviations;
wenzelm
parents: 21694
diff changeset
   274
30286
cf89a03ee308 Consts.abbreviate: reject schematic term variables, prevent schematic type variables (hidden polymorphism) via Term.close_schematic_term -- see also 8f84a608883d;
wenzelm
parents: 30284
diff changeset
   275
    val _ = Term.exists_subterm Term.is_Var raw_rhs andalso
cf89a03ee308 Consts.abbreviate: reject schematic term variables, prevent schematic type variables (hidden polymorphism) via Term.close_schematic_term -- see also 8f84a608883d;
wenzelm
parents: 30284
diff changeset
   276
      error ("Illegal schematic variables on rhs of abbreviation: " ^ Binding.str_of b);
cf89a03ee308 Consts.abbreviate: reject schematic term variables, prevent schematic type variables (hidden polymorphism) via Term.close_schematic_term -- see also 8f84a608883d;
wenzelm
parents: 30284
diff changeset
   277
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   278
    val rhs = raw_rhs
20548
8ef25fe585a8 renamed Term.map_term_types to Term.map_types (cf. Term.fold_types);
wenzelm
parents: 20509
diff changeset
   279
      |> Term.map_types (Type.cert_typ tsig)
30286
cf89a03ee308 Consts.abbreviate: reject schematic term variables, prevent schematic type variables (hidden polymorphism) via Term.close_schematic_term -- see also 8f84a608883d;
wenzelm
parents: 30284
diff changeset
   280
      |> cert_term
cf89a03ee308 Consts.abbreviate: reject schematic term variables, prevent schematic type variables (hidden polymorphism) via Term.close_schematic_term -- see also 8f84a608883d;
wenzelm
parents: 30284
diff changeset
   281
      |> Term.close_schematic_term;
25404
1a58d1c9fe88 simplified Consts.dest;
wenzelm
parents: 25389
diff changeset
   282
    val normal_rhs = expand_term rhs;
21794
1a9f57f1bc3a abbreviate: tuned signature;
wenzelm
parents: 21720
diff changeset
   283
    val T = Term.fastype_of rhs;
28965
1de908189869 cleaned up binding module and related code
haftmann
parents: 28861
diff changeset
   284
    val lhs = Const (NameSpace.full_name naming b, T);
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   285
  in
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   286
    consts |> map_consts (fn (decls, constraints, rev_abbrevs) =>
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   287
      let
26050
88bb26089ef5 maintain default position;
wenzelm
parents: 25404
diff changeset
   288
        val tags' = tags |> Position.default_properties (Position.thread_data ());
88bb26089ef5 maintain default position;
wenzelm
parents: 25404
diff changeset
   289
        val decl = {T = T, typargs = typargs_of T, tags = tags', authentic = true};
25404
1a58d1c9fe88 simplified Consts.dest;
wenzelm
parents: 25389
diff changeset
   290
        val abbr = {rhs = rhs, normal_rhs = normal_rhs, force_expand = force_expand};
28861
f53abb0733ee using name bindings
haftmann
parents: 28017
diff changeset
   291
        val (_, decls') = decls
f53abb0733ee using name bindings
haftmann
parents: 28017
diff changeset
   292
          |> extend_decls naming (b, ((decl, SOME abbr), serial ()));
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   293
        val rev_abbrevs' = rev_abbrevs
25389
3e58c7cb5a73 renamed Symtab.update_list to Symtab.cons_list;
wenzelm
parents: 25116
diff changeset
   294
          |> fold (curry Symtab.cons_list mode) (rev_abbrev lhs rhs);
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   295
      in (decls', constraints, rev_abbrevs') end)
21794
1a9f57f1bc3a abbreviate: tuned signature;
wenzelm
parents: 21720
diff changeset
   296
    |> pair (lhs, rhs)
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   297
  end;
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   298
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   299
fun revert_abbrev mode c consts = consts |> map_consts (fn (decls, constraints, rev_abbrevs) =>
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   300
  let
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   301
    val (T, rhs) = the_abbreviation consts c;
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   302
    val rev_abbrevs' = rev_abbrevs
25389
3e58c7cb5a73 renamed Symtab.update_list to Symtab.cons_list;
wenzelm
parents: 25116
diff changeset
   303
      |> fold (curry Symtab.cons_list mode) (rev_abbrev (Const (c, T)) rhs);
25048
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   304
  in (decls, constraints, rev_abbrevs') end);
5a94a87af697 the_abbreviation: return plain rhs only;
wenzelm
parents: 25041
diff changeset
   305
19027
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   306
end;
adf6fb0db28a added eq_consts;
wenzelm
parents: 18992
diff changeset
   307
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   308
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   309
(* empty and merge *)
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   310
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   311
val empty = make_consts (NameSpace.empty_table, Symtab.empty, Symtab.empty);
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   312
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   313
fun merge
30284
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
   314
   (Consts {decls = decls1, constraints = constraints1, rev_abbrevs = rev_abbrevs1},
907da436f8a9 eliminated Consts.eq_consts tuning -- this is built into tables and name spaces already;
wenzelm
parents: 30280
diff changeset
   315
    Consts {decls = decls2, constraints = constraints2, rev_abbrevs = rev_abbrevs2}) =
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   316
  let
18935
f22be3d61ed5 added abbreviations;
wenzelm
parents: 18163
diff changeset
   317
    val decls' = NameSpace.merge_tables (eq_snd (op =)) (decls1, decls2)
23655
d2d1138e0ddc replaced exception TableFun/GraphFun.DUPS by TableFun/GraphFun.DUP;
wenzelm
parents: 23086
diff changeset
   318
      handle Symtab.DUP c => err_dup_const c;
25037
d6a3dec2375d prefer first constant component on merge
haftmann
parents: 25001
diff changeset
   319
    val constraints' = Symtab.join (K fst) (constraints1, constraints2);
19364
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   320
    val rev_abbrevs' = (rev_abbrevs1, rev_abbrevs2) |> Symtab.join
38799cfa34e5 added intern/extern/extern_early;
wenzelm
parents: 19098
diff changeset
   321
      (K (Library.merge (fn ((t, u), (t', u')) => t aconv t' andalso u aconv u')));
24673
62b75508eb66 certify: do_expand as explicit argument, actually certify type of abstractions;
wenzelm
parents: 23655
diff changeset
   322
  in make_consts (decls', constraints', rev_abbrevs') end;
18060
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   323
afcc28d16629 Polymorphic constants.
wenzelm
parents:
diff changeset
   324
end;