src/Pure/sign.ML
author wenzelm
Thu, 18 Jan 2001 20:37:38 +0100
changeset 10932 ad13abb0a264
parent 10443 0a68dc9edba5
child 11501 3b6415035d1a
permissions -rw-r--r--
added exists_stamp; added PureN, CPureN;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
19
929ad32d63fc Pure/ROOT.ML
wenzelm
parents: 0
diff changeset
     1
(*  Title:      Pure/sign.ML
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     2
    ID:         $Id$
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
     3
    Author:     Lawrence C Paulson and Markus Wenzel
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     4
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
     5
The abstract type "sg" of signatures.
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     6
*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     7
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
     8
(*base names*)
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
     9
type bstring = string;
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
    10
type bclass = class;
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
    11
(*external forms -- partially qualified names*)
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    12
type xstring = string;
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    13
type xclass = class;
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    14
type xsort = sort;
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    15
type xtyp = typ;
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    16
type xterm = term;
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    17
19
929ad32d63fc Pure/ROOT.ML
wenzelm
parents: 0
diff changeset
    18
signature SIGN =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    19
sig
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    20
  type sg
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
    21
  type sg_ref
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
    22
  type data
2197
e895937fcd56 added add_modesyntax(_i);
wenzelm
parents: 2187
diff changeset
    23
  val rep_sg: sg ->
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
    24
   {self: sg_ref,
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
    25
    tsig: Type.type_sig,
2197
e895937fcd56 added add_modesyntax(_i);
wenzelm
parents: 2187
diff changeset
    26
    const_tab: typ Symtab.table,
e895937fcd56 added add_modesyntax(_i);
wenzelm
parents: 2187
diff changeset
    27
    syn: Syntax.syntax,
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    28
    path: string list,
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    29
    spaces: (string * NameSpace.T) list,
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
    30
    data: data}
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
    31
  val name_of: sg -> string
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
    32
  val stamp_names_of: sg -> string list
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
    33
  val exists_stamp: string -> sg -> bool
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
    34
  val tsig_of: sg -> Type.type_sig
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
    35
  val deref: sg_ref -> sg
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
    36
  val self_ref: sg -> sg_ref
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    37
  val subsig: sg * sg -> bool
9031
8f75b9ce2f06 fixed Thm.eq_thm: use Sign.joinable;
wenzelm
parents: 8927
diff changeset
    38
  val joinable: sg * sg -> bool
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    39
  val eq_sg: sg * sg -> bool
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    40
  val same_sg: sg * sg -> bool
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    41
  val is_draft: sg -> bool
4951
8637b29e6c38 added is_stale;
wenzelm
parents: 4908
diff changeset
    42
  val is_stale: sg -> bool
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    43
  val const_type: sg -> string -> typ option
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    44
  val classes: sg -> class list
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
    45
  val defaultS: sg -> sort
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    46
  val subsort: sg -> sort * sort -> bool
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
    47
  val nodup_vars: term -> term
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    48
  val norm_sort: sg -> sort -> sort
4568
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
    49
  val of_sort: sg -> typ * sort -> bool
7640
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
    50
  val witness_sorts: sg -> sort list -> sort list -> (typ * sort) list
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
    51
  val univ_witness: sg -> (typ * sort) option
10443
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
    52
  val typ_instance: sg -> typ * typ -> bool
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
    53
  val classK: string
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
    54
  val typeK: string
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
    55
  val constK: string
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
    56
  val full_name: sg -> bstring -> string
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
    57
  val full_name_path: sg -> string -> bstring -> string
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
    58
  val base_name: string -> bstring
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
    59
  val intern: sg -> string -> xstring -> string
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
    60
  val extern: sg -> string -> string -> xstring
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    61
  val cond_extern: sg -> string -> string -> xstring
6845
598d2f32d452 added cond_extern_table;
wenzelm
parents: 6546
diff changeset
    62
  val cond_extern_table: sg -> string -> 'a Symtab.table -> (xstring * 'a) list
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    63
  val intern_class: sg -> xclass -> class
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    64
  val intern_tycon: sg -> xstring -> string
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    65
  val intern_const: sg -> xstring -> string
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    66
  val intern_sort: sg -> xsort -> sort
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    67
  val intern_typ: sg -> xtyp -> typ
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    68
  val intern_term: sg -> xterm -> term
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    69
  val intern_tycons: sg -> xtyp -> typ
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    70
  val pretty_sg: sg -> Pretty.T
4051
6b72919c9b4b added str_of_sg: sg -> string;
wenzelm
parents: 4017
diff changeset
    71
  val str_of_sg: sg -> string
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    72
  val pprint_sg: sg -> pprint_args -> unit
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    73
  val pretty_term: sg -> term -> Pretty.T
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    74
  val pretty_typ: sg -> typ -> Pretty.T
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    75
  val pretty_sort: sg -> sort -> Pretty.T
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
    76
  val pretty_classrel: sg -> class * class -> Pretty.T
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
    77
  val pretty_arity: sg -> string * sort list * sort -> Pretty.T
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    78
  val string_of_term: sg -> term -> string
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    79
  val string_of_typ: sg -> typ -> string
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    80
  val string_of_sort: sg -> sort -> string
3855
4bdf32173f6f fixed extern;
wenzelm
parents: 3850
diff changeset
    81
  val str_of_sort: sg -> sort -> string
4bdf32173f6f fixed extern;
wenzelm
parents: 3850
diff changeset
    82
  val str_of_classrel: sg -> class * class -> string
4bdf32173f6f fixed extern;
wenzelm
parents: 3850
diff changeset
    83
  val str_of_arity: sg -> string * sort list * sort -> string
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    84
  val pprint_term: sg -> term -> pprint_args -> unit
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    85
  val pprint_typ: sg -> typ -> pprint_args -> unit
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
    86
  val certify_class: sg -> class -> class
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
    87
  val certify_sort: sg -> sort -> sort
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    88
  val certify_typ: sg -> typ -> typ
9504
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
    89
  val certify_typ_no_norm: sg -> typ -> typ
10443
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
    90
  val certify_tycon: sg -> string -> string
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
    91
  val certify_tyabbr: sg -> string -> string
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
    92
  val certify_const: sg -> string -> string
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    93
  val certify_term: sg -> term -> term * typ * int
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
    94
  val read_sort: sg -> string -> sort
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
    95
  val read_raw_typ: sg * (indexname -> sort option) -> string -> typ
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    96
  val read_typ: sg * (indexname -> sort option) -> string -> typ
9504
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
    97
  val read_typ_no_norm: sg * (indexname -> sort option) -> string -> typ
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    98
  val infer_types: sg -> (indexname -> typ option) ->
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    99
    (indexname -> sort option) -> string list -> bool
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   100
    -> xterm list * typ -> term * (indexname * typ) list
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   101
  val infer_types_simult: sg -> (indexname -> typ option) ->
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   102
    (indexname -> sort option) -> string list -> bool
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   103
    -> (xterm list * typ) list -> term list * (indexname * typ) list
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   104
  val read_def_terms:
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   105
    sg * (indexname -> typ option) * (indexname -> sort option) ->
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   106
    string list -> bool -> (string * typ) list -> term list * (indexname * typ) list
8802
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   107
  val simple_read_term: sg -> typ -> string -> term
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   108
  val add_classes: (bclass * xclass list) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   109
  val add_classes_i: (bclass * class list) list -> sg -> sg
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   110
  val add_classrel: (xclass * xclass) list -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   111
  val add_classrel_i: (class * class) list -> sg -> sg
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   112
  val add_defsort: string -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   113
  val add_defsort_i: sort -> sg -> sg
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   114
  val add_types: (bstring * int * mixfix) list -> sg -> sg
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   115
  val add_nonterminals: bstring list -> sg -> sg
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   116
  val add_tyabbrs: (bstring * string list * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   117
  val add_tyabbrs_i: (bstring * string list * typ * mixfix) list -> sg -> sg
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   118
  val add_arities: (xstring * string list * string) list -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   119
  val add_arities_i: (string * sort list * sort) list -> sg -> sg
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   120
  val add_consts: (bstring * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   121
  val add_consts_i: (bstring * typ * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   122
  val add_syntax: (bstring * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   123
  val add_syntax_i: (bstring * typ * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   124
  val add_modesyntax: (string * bool) * (bstring * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   125
  val add_modesyntax_i: (string * bool) * (bstring * typ * mixfix) list -> sg -> sg
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   126
  val add_trfuns:
4344
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   127
    (string * (ast list -> ast)) list *
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   128
    (string * (term list -> term)) list *
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   129
    (string * (term list -> term)) list *
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   130
    (string * (ast list -> ast)) list -> sg -> sg
2385
73d1435aa729 added typed print translations;
wenzelm
parents: 2359
diff changeset
   131
  val add_trfunsT:
4344
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   132
    (string * (bool -> typ -> term list -> term)) list -> sg -> sg
2693
8300bba275e3 added add_tokentrfuns;
wenzelm
parents: 2672
diff changeset
   133
  val add_tokentrfuns:
6311
15652e058e28 token translation: real;
wenzelm
parents: 6191
diff changeset
   134
    (string * string * (string -> string * real)) list -> sg -> sg
4619
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   135
  val add_trrules: (xstring * string) Syntax.trrule list -> sg -> sg
1810
0eef167ebe1b Translation infixes <->, etc., no longer available at top-level
paulson
parents: 1580
diff changeset
   136
  val add_trrules_i: ast Syntax.trrule list -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   137
  val add_path: string -> sg -> sg
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   138
  val add_space: string * string list -> sg -> sg
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   139
  val hide_space: string * string list -> sg -> sg
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   140
  val hide_space_i: string * string list -> sg -> sg
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   141
  val add_name: string -> sg -> sg
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   142
  val data_kinds: data -> string list
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   143
  val merge_refs: sg_ref * sg_ref -> sg_ref
4627
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
   144
  val merge: sg * sg -> sg
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   145
  val prep_ext: sg -> sg
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   146
  val copy: sg -> sg
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
   147
  val PureN: string
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
   148
  val CPureN: string
4627
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
   149
  val nontriv_merge: sg * sg -> sg
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   150
  val pre_pure: sg
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   151
  val const_of_class: class -> string
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   152
  val class_of_const: string -> class
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   153
end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   154
6191
381b27ca0543 renamed sig to PRIVATE_SIGN;
wenzelm
parents: 6040
diff changeset
   155
signature PRIVATE_SIGN =
5642
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   156
sig
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   157
  include SIGN
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   158
  val init_data: Object.kind * (Object.T * (Object.T -> Object.T) * (Object.T -> Object.T) *
5642
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   159
    (Object.T * Object.T -> Object.T) * (sg -> Object.T -> unit)) -> sg -> sg
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   160
  val get_data: Object.kind -> (Object.T -> 'a) -> sg -> 'a
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   161
  val put_data: Object.kind -> ('a -> Object.T) -> 'a -> sg -> sg
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   162
  val print_data: Object.kind -> sg -> unit
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   163
end;
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   164
6191
381b27ca0543 renamed sig to PRIVATE_SIGN;
wenzelm
parents: 6040
diff changeset
   165
structure Sign: PRIVATE_SIGN =
143
f8152ca36cd5 Sign.extend: Syntax.extend now called with read_ty;
wenzelm
parents: 19
diff changeset
   166
struct
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   167
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   168
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   169
(** datatype sg **)
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   170
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   171
(* types sg, data, sg_ref *)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   172
19
929ad32d63fc Pure/ROOT.ML
wenzelm
parents: 0
diff changeset
   173
datatype sg =
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   174
  Sg of
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   175
   {id: string ref,                             (*id*)
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   176
    stamps: string ref list} *                  (*unique theory indentifier*)
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   177
   {self: sg_ref,                               (*mutable self reference*)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   178
    tsig: Type.type_sig,                        (*order-sorted signature of types*)
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   179
    const_tab: typ Symtab.table,                (*type schemes of constants*)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   180
    syn: Syntax.syntax,                         (*syntax for parsing and printing*)
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   181
    path: string list,                          (*current name space entry prefix*)
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   182
    spaces: (string * NameSpace.T) list,        (*name spaces for consts, types etc.*)
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   183
    data: data}                                 (*anytype data*)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   184
and data =
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   185
  Data of
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   186
    (Object.kind *                              (*kind (for authorization)*)
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   187
      (Object.T *                               (*value*)
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   188
        ((Object.T -> Object.T) *               (*prepare extend method*)
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   189
          (Object.T -> Object.T) *              (*copy method*)
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   190
          (Object.T * Object.T -> Object.T) *   (*merge and prepare extend method*)
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   191
          (sg -> Object.T -> unit))))           (*print method*)
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   192
    Symtab.table
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   193
and sg_ref =
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   194
  SgRef of sg ref option;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   195
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   196
(*make signature*)
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   197
fun make_sign (id, self, tsig, const_tab, syn, path, spaces, data, stamps) =
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   198
  Sg ({id = id, stamps = stamps}, {self = self, tsig = tsig, const_tab = const_tab,
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   199
    syn = syn, path = path, spaces = spaces, data = data});
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   200
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   201
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   202
(* basic operations *)
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   203
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   204
fun rep_sg (Sg (_, args)) = args;
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   205
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   206
(*show stamps*)
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   207
fun stamp_names_of (Sg ({stamps, ...}, _)) = rev (map ! stamps);
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
   208
fun exists_stamp name (Sg ({stamps, ...}, _)) = exists (equal name o !) stamps;
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   209
fun pretty_sg sg = Pretty.str_list "{" "}" (stamp_names_of sg);
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   210
val str_of_sg = Pretty.str_of o pretty_sg;
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   211
val pprint_sg = Pretty.pprint o pretty_sg;
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   212
402
16a8fe4f2250 added subsort, norm_sort, classes;
wenzelm
parents: 386
diff changeset
   213
val tsig_of = #tsig o rep_sg;
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   214
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   215
fun const_type (Sg (_, {const_tab, ...})) c = Symtab.lookup (const_tab, c);
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   216
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   217
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   218
(* id and self *)
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   219
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   220
fun check_stale (sg as Sg ({id, ...},
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   221
        {self = SgRef (Some (ref (Sg ({id = id', ...}, _)))), ...})) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   222
      if id = id' then sg
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   223
      else raise TERM ("Stale signature: " ^ str_of_sg sg, [])
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   224
  | check_stale _ = sys_error "Sign.check_stale";
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   225
4951
8637b29e6c38 added is_stale;
wenzelm
parents: 4908
diff changeset
   226
fun is_stale sg = (check_stale sg; false) handle TERM _ => true;
8637b29e6c38 added is_stale;
wenzelm
parents: 4908
diff changeset
   227
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   228
fun self_ref (sg as Sg (_, {self, ...})) = (check_stale sg; self);
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   229
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   230
fun deref (SgRef (Some (ref sg))) = sg
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   231
  | deref (SgRef None) = sys_error "Sign.deref";
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   232
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   233
fun name_of (sg as Sg ({id = ref name, ...}, _)) =
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   234
  if name = "" orelse ord name = ord "#" then
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   235
    raise TERM ("Nameless signature " ^ str_of_sg sg, [])
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   236
  else name;
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   237
206
0d624d1ba9cc added subsig: sg * sg -> bool to test if one signature is contained in another.
nipkow
parents: 200
diff changeset
   238
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   239
(* inclusion and equality *)
2180
934572a94139 Removal of polymorphic equality via mem, subset, eq_set, etc
paulson
parents: 2144
diff changeset
   240
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   241
local
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   242
  (*avoiding polymorphic equality: factor 10 speedup*)
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   243
  fun mem_stamp (_:string ref, []) = false
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   244
    | mem_stamp (x, y :: ys) = x = y orelse mem_stamp (x, ys);
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   245
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   246
  fun subset_stamp ([], ys) = true
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   247
    | subset_stamp (x :: xs, ys) =
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   248
        mem_stamp (x, ys) andalso subset_stamp (xs, ys);
2180
934572a94139 Removal of polymorphic equality via mem, subset, eq_set, etc
paulson
parents: 2144
diff changeset
   249
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   250
  (*fast partial test*)
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   251
  fun fast_sub ([]: string ref list, _) = true
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   252
    | fast_sub (_, []) = false
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   253
    | fast_sub (x :: xs, y :: ys) =
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   254
        if x = y then fast_sub (xs, ys)
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   255
        else fast_sub (x :: xs, ys);
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   256
in
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   257
  fun eq_sg (sg1 as Sg ({id = id1, ...}, _), sg2 as Sg ({id = id2, ...}, _)) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   258
    (check_stale sg1; check_stale sg2; id1 = id2);
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   259
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   260
  fun subsig (sg1 as Sg ({stamps = s1, ...}, _), sg2 as Sg ({stamps = s2, ...}, _)) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   261
    eq_sg (sg1, sg2) orelse subset_stamp (s1, s2);
2180
934572a94139 Removal of polymorphic equality via mem, subset, eq_set, etc
paulson
parents: 2144
diff changeset
   262
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   263
  fun fast_subsig (sg1 as Sg ({stamps = s1, ...}, _), sg2 as Sg ({stamps = s2, ...}, _)) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   264
    eq_sg (sg1, sg2) orelse fast_sub (s1, s2);
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   265
end;
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   266
402
16a8fe4f2250 added subsort, norm_sort, classes;
wenzelm
parents: 386
diff changeset
   267
9031
8f75b9ce2f06 fixed Thm.eq_thm: use Sign.joinable;
wenzelm
parents: 8927
diff changeset
   268
fun joinable (sg1, sg2) = subsig (sg1, sg2) orelse subsig (sg2, sg1);
8f75b9ce2f06 fixed Thm.eq_thm: use Sign.joinable;
wenzelm
parents: 8927
diff changeset
   269
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   270
(*test if same theory names are contained in signatures' stamps,
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   271
  i.e. if signatures belong to same theory but not necessarily to the
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   272
  same version of it*)
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   273
fun same_sg (sg1 as Sg ({stamps = s1, ...}, _), sg2 as Sg ({stamps = s2, ...}, _)) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   274
  eq_sg (sg1, sg2) orelse eq_set_string (pairself (map (op !)) (s1, s2));
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   275
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   276
(*test for drafts*)
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   277
fun is_draft (Sg ({stamps = ref name :: _, ...}, _)) = name = "" orelse ord name = ord "#";
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   278
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   279
4568
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   280
(* classes and sorts *)
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   281
7640
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
   282
val classes = Type.classes o tsig_of;
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   283
val defaultS = Type.defaultS o tsig_of;
4568
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   284
val subsort = Type.subsort o tsig_of;
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   285
val norm_sort = Type.norm_sort o tsig_of;
7640
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
   286
val of_sort = Type.of_sort o tsig_of;
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
   287
val witness_sorts = Type.witness_sorts o tsig_of;
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
   288
val univ_witness = Type.univ_witness o tsig_of;
10443
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   289
fun typ_instance sg (T, U) = Type.typ_instance (tsig_of sg, T, U);
4568
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   290
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   291
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   292
(** signature data **)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   293
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   294
(* errors *)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   295
4261
e20b9fd85811 improved error msg;
wenzelm
parents: 4256
diff changeset
   296
fun of_theory sg = "\nof theory " ^ str_of_sg sg;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   297
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   298
fun err_inconsistent kinds =
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   299
  error ("Attempt to merge different versions of " ^ commas_quote kinds ^ " data");
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   300
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   301
fun err_method name kind e =
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   302
  (writeln ("Error while invoking " ^ quote kind ^ " " ^ name ^ " method"); raise e);
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   303
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   304
fun err_dup_init sg kind =
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   305
  error ("Duplicate initialization of " ^ quote kind ^ " data" ^ of_theory sg);
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   306
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   307
fun err_uninit sg kind =
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   308
  error ("Tried to access uninitialized " ^ quote kind ^ " data" ^
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   309
         of_theory sg);
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   310
6040
bd37dc0f56d9 comments
paulson
parents: 5642
diff changeset
   311
(*Trying to access theory data using get / put operations from a different
bd37dc0f56d9 comments
paulson
parents: 5642
diff changeset
   312
  instance of the TheoryDataFun result.  Typical cure: re-load all files*)
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   313
fun err_access sg kind =
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   314
  error ("Unauthorized access to " ^ quote kind ^ " data" ^ of_theory sg);
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   315
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   316
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   317
(* prepare data *)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   318
4489
749600cb5573 renamed Symtab.null to Symtab.empty;
wenzelm
parents: 4344
diff changeset
   319
val empty_data = Data Symtab.empty;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   320
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   321
fun merge_data (Data tab1, Data tab2) =
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   322
  let
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   323
    val data1 = map snd (Symtab.dest tab1);
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   324
    val data2 = map snd (Symtab.dest tab2);
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   325
    val all_data = data1 @ data2;
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   326
    val kinds = gen_distinct Object.eq_kind (map fst all_data);
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   327
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   328
   fun entry data kind =
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   329
     (case gen_assoc Object.eq_kind (data, kind) of
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   330
       None => []
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   331
     | Some x => [(kind, x)]);
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   332
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   333
    fun merge_entries [(kind, (e, mths as (_, ext, _, _)))] =
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   334
          (kind, (ext e handle exn => err_method "prep_ext" (Object.name_of_kind kind) exn, mths))
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   335
      | merge_entries [(kind, (e1, mths as (_, _, mrg, _))), (_, (e2, _))] =
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   336
          (kind, (mrg (e1, e2)
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   337
            handle exn => err_method "merge" (Object.name_of_kind kind) exn, mths))
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   338
      | merge_entries _ = sys_error "merge_entries";
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   339
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   340
    val data = map (fn k => merge_entries (entry data1 k @ entry data2 k)) kinds;
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   341
    val data_idx = map (fn (k, x) => (Object.name_of_kind k, (k, x))) data;
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   342
  in
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   343
    Data (Symtab.make data_idx)
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   344
      handle Symtab.DUPS dups => err_inconsistent dups
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   345
  end;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   346
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   347
fun prep_ext_data data = merge_data (data, empty_data);
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   348
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   349
fun init_data_sg sg (Data tab) kind e cp ext mrg prt =
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   350
  let val name = Object.name_of_kind kind in
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   351
    Data (Symtab.update_new ((name, (kind, (e, (cp, ext, mrg, prt)))), tab))
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   352
      handle Symtab.DUP _ => err_dup_init sg name
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   353
  end;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   354
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   355
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   356
(* access data *)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   357
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   358
fun data_kinds (Data tab) = map fst (Symtab.dest tab);
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   359
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   360
fun lookup_data sg tab kind =
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   361
  let val name = Object.name_of_kind kind in
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   362
    (case Symtab.lookup (tab, name) of
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   363
      Some (k, x) =>
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   364
        if Object.eq_kind (kind, k) then x
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   365
        else err_access sg name
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   366
    | None => err_uninit sg name)
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   367
  end;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   368
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   369
fun get_data kind f (sg as Sg (_, {data = Data tab, ...})) =
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   370
  let val x = fst (lookup_data sg tab kind)
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   371
  in f x handle Match => Object.kind_error kind end;
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   372
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   373
fun print_data kind (sg as Sg (_, {data = Data tab, ...})) =
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   374
  let val (e, (_, _, _, prt)) = lookup_data sg tab kind
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   375
  in prt sg e handle exn => err_method ("print" ^ of_theory sg) (Object.name_of_kind kind) exn end;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   376
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   377
fun put_data_sg sg (Data tab) kind f x =
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   378
  Data (Symtab.update ((Object.name_of_kind kind,
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   379
    (kind, (f x, snd (lookup_data sg tab kind)))), tab));
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   380
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   381
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   382
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   383
(** build signatures **)
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   384
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   385
fun ext_stamps stamps (id as ref name) =
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   386
  let val stmps = (case stamps of ref "#" :: ss => ss | ss => ss) in
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   387
    if exists (equal name o !) stmps then
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   388
      error ("Theory already contains a " ^ quote name ^ " component")
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   389
    else id :: stmps
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   390
  end;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   391
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   392
fun create_sign self stamps name (syn, tsig, ctab, (path, spaces), data) =
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   393
  let
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   394
    val id = ref name;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   395
    val sign =
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   396
      make_sign (id, self, tsig, ctab, syn, path, spaces, data, ext_stamps stamps id);
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   397
  in
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   398
    (case self of
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   399
      SgRef (Some r) => r := sign
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   400
    | _ => sys_error "Sign.create_sign");
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   401
    sign
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   402
  end;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   403
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   404
fun extend_sign keep extfun name decls
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   405
    (sg as Sg ({id = _, stamps}, {self, tsig, const_tab, syn, path, spaces, data})) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   406
  let
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   407
    val _ = check_stale sg;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   408
    val (self', data') =
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   409
      if is_draft sg andalso keep then (self, data)
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   410
      else (SgRef (Some (ref sg)), prep_ext_data data);
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   411
  in
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   412
    create_sign self' stamps name
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   413
      (extfun (syn, tsig, const_tab, (path, spaces), data') decls)
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   414
  end;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   415
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   416
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   417
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   418
(** name spaces **)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   419
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   420
(* kinds *)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   421
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   422
val classK = "class";
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   423
val typeK = "type";
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   424
val constK = "const";
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   425
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   426
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   427
(* declare and retrieve names *)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   428
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   429
fun space_of spaces kind =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   430
  if_none (assoc (spaces, kind)) NameSpace.empty;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   431
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   432
(*input and output of qualified names*)
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   433
fun intrn spaces kind = NameSpace.intern (space_of spaces kind);
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   434
fun extrn spaces kind = NameSpace.extern (space_of spaces kind);
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   435
fun cond_extrn spaces kind = NameSpace.cond_extern (space_of spaces kind);
6845
598d2f32d452 added cond_extern_table;
wenzelm
parents: 6546
diff changeset
   436
fun cond_extrn_table spaces kind tab = NameSpace.cond_extern_table (space_of spaces kind) tab;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   437
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   438
(*add / hide names*)
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   439
fun change_space f spaces kind x = overwrite (spaces, (kind, f (space_of spaces kind, x)));
8730
d97ee7249698 made SML/NJ happy;
wenzelm
parents: 8725
diff changeset
   440
fun add_names x = change_space NameSpace.extend x;
d97ee7249698 made SML/NJ happy;
wenzelm
parents: 8725
diff changeset
   441
fun hide_names x = change_space NameSpace.hide x;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   442
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   443
(*make full names*)
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   444
fun full path name =
4489
749600cb5573 renamed Symtab.null to Symtab.empty;
wenzelm
parents: 4344
diff changeset
   445
  if name = "" then error "Attempt to declare empty name \"\""
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   446
  else if NameSpace.is_qualified name then
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   447
    error ("Attempt to declare qualified name " ^ quote name)
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   448
  else NameSpace.pack (path @ [name]);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   449
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   450
(*base name*)
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   451
val base_name = NameSpace.base;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   452
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   453
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   454
(* intern / extern names *)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   455
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   456
local
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   457
  (*prepare mapping of names*)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   458
  fun mapping f add_xs t =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   459
    let
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   460
      fun f' x = let val y = f x in if x = y then None else Some (x, y) end;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   461
      val table = mapfilter f' (add_xs (t, []));
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   462
      fun lookup x = if_none (assoc (table, x)) x;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   463
    in lookup end;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   464
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   465
  (*intern / extern typ*)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   466
  fun trn_typ trn T =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   467
    T |> map_typ
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   468
      (mapping (trn classK) add_typ_classes T)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   469
      (mapping (trn typeK) add_typ_tycons T);
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   470
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   471
  (*intern / extern term*)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   472
  fun trn_term trn t =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   473
    t |> map_term
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   474
      (mapping (trn classK) add_term_classes t)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   475
      (mapping (trn typeK) add_term_tycons t)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   476
      (mapping (trn constK) add_term_consts t);
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   477
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   478
  val spaces_of = #spaces o rep_sg;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   479
in
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   480
  fun intrn_class spaces = intrn spaces classK;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   481
  fun extrn_class spaces = extrn spaces classK;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   482
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   483
  val intrn_sort = map o intrn_class;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   484
  val intrn_typ = trn_typ o intrn;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   485
  val intrn_term = trn_term o intrn;
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   486
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   487
  val extrn_sort = map o extrn_class;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   488
  val extrn_typ = trn_typ o extrn;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   489
  val extrn_term = trn_term o extrn;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   490
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   491
  fun intrn_tycons spaces T =
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   492
    map_typ I (mapping (intrn spaces typeK) add_typ_tycons T) T;
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   493
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   494
  val intern = intrn o spaces_of;
3855
4bdf32173f6f fixed extern;
wenzelm
parents: 3850
diff changeset
   495
  val extern = extrn o spaces_of;
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   496
  val cond_extern = cond_extrn o spaces_of;
6845
598d2f32d452 added cond_extern_table;
wenzelm
parents: 6546
diff changeset
   497
  fun cond_extern_table sg = cond_extrn_table (spaces_of sg);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   498
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   499
  val intern_class = intrn_class o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   500
  val intern_sort = intrn_sort o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   501
  val intern_typ = intrn_typ o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   502
  val intern_term = intrn_term o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   503
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   504
  fun intern_tycon sg = intrn (spaces_of sg) typeK;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   505
  fun intern_const sg = intrn (spaces_of sg) constK;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   506
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   507
  val intern_tycons = intrn_tycons o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   508
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   509
  val full_name = full o #path o rep_sg;
4908
7a155899ef9c tuned comment;
wenzelm
parents: 4892
diff changeset
   510
  fun full_name_path sg elems name =
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   511
    full (#path (rep_sg sg) @ NameSpace.unpack elems) name;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   512
end;
620
f787eb061618 exported pretty_sort;
wenzelm
parents: 583
diff changeset
   513
402
16a8fe4f2250 added subsort, norm_sort, classes;
wenzelm
parents: 386
diff changeset
   514
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   515
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   516
(** pretty printing of terms, types etc. **)
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   517
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   518
fun pretty_term (sg as Sg ({stamps, ...}, {syn, spaces, ...})) t =
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   519
  Syntax.pretty_term syn
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   520
    (exists (equal "CPure" o !) stamps)
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   521
    (if ! NameSpace.long_names then t else extrn_term spaces t);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   522
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   523
fun pretty_typ (Sg (_, {syn, spaces, ...})) T =
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   524
  Syntax.pretty_typ syn
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   525
    (if ! NameSpace.long_names then T else extrn_typ spaces T);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   526
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   527
fun pretty_sort (Sg (_, {syn, spaces, ...})) S =
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   528
  Syntax.pretty_sort syn
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   529
    (if ! NameSpace.long_names then S else extrn_sort spaces S);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   530
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   531
fun pretty_classrel sg (c1, c2) = Pretty.block
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   532
  [pretty_sort sg [c1], Pretty.str " <", Pretty.brk 1, pretty_sort sg [c2]];
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   533
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   534
fun pretty_arity sg (t, Ss, S) =
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   535
  let
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   536
    val t' = cond_extern sg typeK t;
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   537
    val dom =
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   538
      if null Ss then []
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   539
      else [Pretty.list "(" ")" (map (pretty_sort sg) Ss), Pretty.brk 1];
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   540
  in
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   541
    Pretty.block
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   542
      ([Pretty.str (t' ^ " ::"), Pretty.brk 1] @ dom @ [pretty_sort sg S])
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   543
  end;
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   544
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   545
fun string_of_term sg t = Pretty.string_of (pretty_term sg t);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   546
fun string_of_typ sg T = Pretty.string_of (pretty_typ sg T);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   547
fun string_of_sort sg S = Pretty.string_of (pretty_sort sg S);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   548
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   549
fun str_of_sort sg S = Pretty.str_of (pretty_sort sg S);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   550
fun str_of_classrel sg c1_c2 = Pretty.str_of (pretty_classrel sg c1_c2);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   551
fun str_of_arity sg ar = Pretty.str_of (pretty_arity sg ar);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   552
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   553
fun pprint_term sg = Pretty.pprint o Pretty.quote o (pretty_term sg);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   554
fun pprint_typ sg = Pretty.pprint o Pretty.quote o (pretty_typ sg);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   555
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   556
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   557
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   558
(** read sorts **)  (*exception ERROR*)
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   559
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   560
fun err_in_sort s =
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   561
  error ("The error(s) above occurred in sort " ^ quote s);
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   562
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   563
fun rd_sort syn tsig spaces str =
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   564
  let val S = intrn_sort spaces (Syntax.read_sort syn str handle ERROR => err_in_sort str)
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   565
  in Type.cert_sort tsig S handle TYPE (msg, _, _) => (error_msg msg; err_in_sort str) end;
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   566
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   567
(*read and certify sort wrt a signature*)
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   568
fun read_sort (sg as Sg (_, {tsig, syn, spaces, ...})) str =
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   569
  (check_stale sg; rd_sort syn tsig spaces str);
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   570
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   571
fun cert_sort _ tsig _ = Type.cert_sort tsig;
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   572
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   573
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   574
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   575
(** read types **)  (*exception ERROR*)
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   576
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   577
fun err_in_type s =
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   578
  error ("The error(s) above occurred in type " ^ quote s);
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   579
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   580
fun rd_raw_typ syn tsig spaces def_sort str =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   581
  intrn_tycons spaces
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   582
    (Syntax.read_typ syn (Type.get_sort tsig def_sort (intrn_sort spaces)) str
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   583
      handle ERROR => err_in_type str);
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   584
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   585
fun read_raw_typ (sg as Sg (_, {tsig, syn, spaces, ...}), def_sort) str =
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   586
  (check_stale sg; rd_raw_typ syn tsig spaces def_sort str);
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   587
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   588
(*read and certify typ wrt a signature*)
9504
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   589
local
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   590
  fun read_typ_aux cert (sg, def_sort) str =
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   591
    (cert (tsig_of sg) (read_raw_typ (sg, def_sort) str)
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   592
        handle TYPE (msg, _, _) => (error_msg msg; err_in_type str));
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   593
in
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   594
  val read_typ = read_typ_aux Type.cert_typ;
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   595
  val read_typ_no_norm = read_typ_aux Type.cert_typ_no_norm;
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   596
end;
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   597
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   598
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   599
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   600
(** certify classes, sorts, types and terms **)   (*exception TYPE*)
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   601
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   602
val certify_class = Type.cert_class o tsig_of;
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   603
val certify_sort = Type.cert_sort o tsig_of;
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   604
val certify_typ = Type.cert_typ o tsig_of;
9504
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   605
val certify_typ_no_norm = Type.cert_typ_no_norm o tsig_of;
10443
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   606
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   607
fun certify_tycon sg c =
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   608
  if is_some (Symtab.lookup (#tycons (Type.rep_tsig (tsig_of sg)), c)) then c
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   609
  else raise TYPE ("Undeclared type constructor " ^ quote c, [], []);
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   610
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   611
fun certify_tyabbr sg c =
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   612
  if is_some (Symtab.lookup (#abbrs (Type.rep_tsig (tsig_of sg)), c)) then c
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   613
  else raise TYPE ("Unknown type abbreviation " ^ quote c, [], []);
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   614
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   615
fun certify_const sg c =
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   616
  if is_some (const_type sg c) then c else raise TYPE ("Undeclared constant " ^ quote c, [], []);
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   617
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   618
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   619
(* certify_term *)
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   620
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   621
(*check for duplicate occurrences of TFree/TVar with distinct sorts*)
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   622
fun nodup_tvars (env, Type (_, Ts)) = nodup_tvars_list (env, Ts)
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   623
  | nodup_tvars (env as (tfrees, tvars), T as TFree (v as (a, S))) =
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   624
      (case assoc_string (tfrees, a) of
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   625
        Some S' =>
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   626
          if S = S' then env
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   627
          else raise TYPE ("Type variable " ^ quote a ^
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   628
            " has two distinct sorts", [TFree (a, S'), T], [])
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   629
      | None => (v :: tfrees, tvars))
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   630
  | nodup_tvars (env as (tfrees, tvars), T as TVar (v as (a, S))) =
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   631
      (case assoc_string_int (tvars, a) of
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   632
        Some S' =>
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   633
          if S = S' then env
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   634
          else raise TYPE ("Type variable " ^ quote (Syntax.string_of_vname a) ^
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   635
            " has two distinct sorts", [TVar (a, S'), T], [])
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   636
      | None => (tfrees, v :: tvars))
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   637
(*equivalent to foldl nodup_tvars_list, but 3X faster under Poly/ML*)
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   638
and nodup_tvars_list (env, []) = env
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   639
  | nodup_tvars_list (env, T :: Ts) = nodup_tvars_list (nodup_tvars (env, T), Ts);
1494
22f67e796445 added nodup_Vars check in cterm_of. Prevents same var with distinct types.
nipkow
parents: 1460
diff changeset
   640
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   641
(*check for duplicate occurrences of Free/Var with distinct types*)
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   642
fun nodup_vars tm =
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   643
  let
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   644
    fun nodups (envs as (env as (frees, vars), envT)) tm =
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   645
      (case tm of
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   646
        Const (c, T) => (env, nodup_tvars (envT, T))
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   647
      | Free (v as (a, T)) =>
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   648
          (case assoc_string (frees, a) of
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   649
            Some T' =>
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   650
              if T = T' then (env, nodup_tvars (envT, T))
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   651
              else raise TYPE ("Variable " ^ quote a ^
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   652
                " has two distinct types", [T', T], [])
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   653
          | None => ((v :: frees, vars), nodup_tvars (envT, T)))
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   654
      | Var (v as (ixn, T)) =>
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   655
          (case assoc_string_int (vars, ixn) of
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   656
            Some T' =>
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   657
              if T = T' then (env, nodup_tvars (envT, T))
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   658
              else raise TYPE ("Variable " ^ quote (Syntax.string_of_vname ixn) ^
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   659
                " has two distinct types", [T', T], [])
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   660
          | None => ((frees, v :: vars), nodup_tvars (envT, T)))
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   661
      | Bound _ => envs
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   662
      | Abs (_, T, t) => nodups (env, nodup_tvars (envT, T)) t
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   663
      | s $ t => nodups (nodups envs s) t)
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   664
  in nodups (([], []), ([], [])) tm; tm end;
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   665
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   666
(*compute and check type of the term*)
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   667
fun type_check sg tm =
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   668
  let
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   669
    val prt = setmp Syntax.show_brackets true (pretty_term sg);
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   670
    val prT = pretty_typ sg;
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   671
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   672
    fun err_appl why bs t T u U =
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   673
      let
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   674
        val xs = map Free bs;           (*we do not rename here*)
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   675
        val t' = subst_bounds (xs, t);
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   676
        val u' = subst_bounds (xs, u);
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   677
        val text = cat_lines (TypeInfer.appl_error prt prT why t' T u' U);
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   678
      in raise TYPE (text, [T, U], [t', u']) end;
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   679
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   680
    fun typ_of (_, Const (_, T)) = T
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   681
      | typ_of (_, Free  (_, T)) = T
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   682
      | typ_of (_, Var (_, T)) = T
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   683
      | typ_of (bs, Bound i) = snd (nth_elem (i, bs) handle LIST _ =>
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   684
          raise TYPE ("Loose bound variable: B." ^ string_of_int i, [], [Bound i]))
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   685
      | typ_of (bs, Abs (x, T, body)) = T --> typ_of ((x, T) :: bs, body)
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   686
      | typ_of (bs, t $ u) =
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   687
          let val T = typ_of (bs, t) and U = typ_of (bs, u) in
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   688
            (case T of
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   689
              Type ("fun", [T1, T2]) =>
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   690
                if T1 = U then T2 else err_appl "Incompatible operand type." bs t T u U
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   691
            | _ => err_appl "Operator not of function type." bs t T u U)
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   692
          end;
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   693
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   694
  in typ_of ([], tm) end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   695
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   696
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   697
fun certify_term sg tm =
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   698
  let
3969
9c742951a923 certify: check_stale;
wenzelm
parents: 3967
diff changeset
   699
    val _ = check_stale sg;
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   700
    val tsig = tsig_of sg;
3969
9c742951a923 certify: check_stale;
wenzelm
parents: 3967
diff changeset
   701
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   702
    fun show_const a T = quote a ^ " :: " ^ quote (string_of_typ sg T);
169
1b2765146aab extend: cleaned up, adapted for new Syntax.extend;
wenzelm
parents: 155
diff changeset
   703
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   704
    fun atom_err (errs, Const (a, T)) =
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   705
        (case const_type sg a of
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   706
          None => ("Undeclared constant " ^ show_const a T) :: errs
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   707
        | Some U =>
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   708
            if typ_instance sg (T, U) then errs
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   709
            else ("Illegal type for constant " ^ show_const a T) :: errs)
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   710
      | atom_err (errs, Var ((x, i), _)) =
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   711
          if i < 0 then ("Negative index for Var " ^ quote x) :: errs else errs
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   712
      | atom_err (errs, _) = errs;
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   713
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   714
    val norm_tm =
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   715
      (case it_term_types (Type.typ_errors tsig) (tm, []) of
7068
d396d8b935f1 Type.norm_term;
wenzelm
parents: 6961
diff changeset
   716
        [] => Type.norm_term tsig tm
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   717
      | errs => raise TYPE (cat_lines errs, [], [tm]));
8290
7015d6b11b56 nodup_vars: fixed omission of 2 minor cases; account for Frees as well;
wenzelm
parents: 7640
diff changeset
   718
    val _ = nodup_vars norm_tm;
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   719
  in
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   720
    (case foldl_aterms atom_err ([], norm_tm) of
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   721
      [] => (norm_tm, type_check sg norm_tm, maxidx_of_term norm_tm)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   722
    | errs => raise TYPE (cat_lines errs, [], [norm_tm]))
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   723
  end;
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   724
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   725
583
550292083e66 minor internal changes;
wenzelm
parents: 573
diff changeset
   726
(** infer_types **)         (*exception ERROR*)
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   727
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   728
(*
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   729
  def_type: partial map from indexnames to types (constrains Frees, Vars)
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   730
  def_sort: partial map from indexnames to sorts (constrains TFrees, TVars)
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   731
  used: list of already used type variables
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   732
  freeze: if true then generated parameters are turned into TFrees, else TVars
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   733
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   734
  termss: lists of alternative parses (only one combination should be type-correct)
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   735
  typs: expected types
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   736
*)
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   737
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   738
fun infer_types_simult sg def_type def_sort used freeze args =
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   739
  let
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   740
    val tsig = tsig_of sg;
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   741
    val prt = setmp Syntax.show_brackets true (pretty_term sg);
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   742
    val prT = pretty_typ sg;
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   743
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   744
    val termss = foldr multiply (map fst args, [[]]);
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   745
    val typs =
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   746
      map (fn (_, T) => certify_typ sg T handle TYPE (msg, _, _) => error msg) args;
169
1b2765146aab extend: cleaned up, adapted for new Syntax.extend;
wenzelm
parents: 155
diff changeset
   747
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   748
    fun infer ts = OK
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   749
      (Type.infer_types prt prT tsig (const_type sg) def_type def_sort
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   750
        (intern_const sg) (intern_tycons sg) (intern_sort sg) used freeze typs ts)
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   751
      handle TYPE (msg, _, _) => Error msg;
623
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   752
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   753
    val err_results = map infer termss;
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   754
    val errs = mapfilter get_error err_results;
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   755
    val results = mapfilter get_ok err_results;
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   756
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   757
    val ambiguity = length termss;      (* FIXME !? *)
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   758
    (* FIXME to syntax.ML!? *)
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   759
    fun ambig_msg () =
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   760
      if ambiguity > 1 andalso ambiguity <= ! Syntax.ambiguity_level
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   761
      then
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   762
        error_msg "Got more than one parse tree.\n\
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   763
          \Retry with smaller Syntax.ambiguity_level for more information."
952
9e10962866b0 Removed an old bug which made some simultaneous instantiations fail if they
nipkow
parents: 949
diff changeset
   764
      else ();
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   765
  in
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   766
    if null results then (ambig_msg (); error (cat_lines errs))
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   767
    else if length results = 1 then
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   768
      (if ambiguity > ! Syntax.ambiguity_level then
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   769
        warning "Fortunately, only one parse tree is type correct.\n\
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   770
          \You may still want to disambiguate your grammar or your input."
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   771
      else (); hd results)
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   772
    else (ambig_msg (); error ("More than one term is type correct:\n" ^
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   773
      (cat_lines (map (Pretty.string_of o prt) (flat (map fst results))))))
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   774
  end;
623
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   775
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   776
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   777
fun infer_types sg def_type def_sort used freeze tsT =
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   778
  apfst hd (infer_types_simult sg def_type def_sort used freeze [tsT]);
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   779
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   780
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   781
(** read_def_terms **)
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   782
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   783
(*read terms, infer types*)
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   784
fun read_def_terms (sign, types, sorts) used freeze sTs =
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   785
  let
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   786
    val syn = #syn (rep_sg sign);
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   787
    fun read (s, T) =
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   788
      let val T' = certify_typ sign T handle TYPE (msg, _, _) => error msg
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   789
      in (Syntax.read syn T' s, T') end;
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   790
    val tsTs = map read sTs;
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   791
  in infer_types_simult sign types sorts used freeze tsTs end;
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   792
8802
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   793
fun simple_read_term sign T s =
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   794
  (read_def_terms (sign, K None, K None) [] true [(s, T)]
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   795
    handle ERROR => error ("The error(s) above occurred for " ^ s)) |> #1 |> hd;
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   796
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   797
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   798
623
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   799
(** extend signature **)    (*exception ERROR*)
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   800
620
f787eb061618 exported pretty_sort;
wenzelm
parents: 583
diff changeset
   801
(** signature extension functions **)  (*exception ERROR*)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   802
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   803
fun decls_of path name_of mfixs =
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   804
  map (fn (x, y, mx) => (full path (name_of x mx), y)) mfixs;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   805
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   806
fun no_read _ _ _ decl = decl;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   807
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   808
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   809
(* add default sort *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   810
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   811
fun ext_defS prep_sort (syn, tsig, ctab, (path, spaces), data) S =
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   812
  (syn, Type.ext_tsig_defsort tsig (prep_sort syn tsig spaces S), ctab, (path, spaces), data);
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   813
8927
1cf815412d78 eta-expanded to handle value polymorphism
paulson
parents: 8898
diff changeset
   814
fun ext_defsort arg   = ext_defS rd_sort arg;
1cf815412d78 eta-expanded to handle value polymorphism
paulson
parents: 8898
diff changeset
   815
fun ext_defsort_i arg = ext_defS cert_sort arg;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   816
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   817
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   818
(* add type constructors *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   819
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   820
fun ext_types (syn, tsig, ctab, (path, spaces), data) types =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   821
  let val decls = decls_of path Syntax.type_name types in
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   822
    (Syntax.extend_type_gram syn types,
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   823
      Type.ext_tsig_types tsig decls, ctab,
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   824
      (path, add_names spaces typeK (map fst decls)), data)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   825
  end;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   826
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   827
fun ext_nonterminals sg nonterms =
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   828
  ext_types sg (map (fn n => (n, 0, Syntax.NoSyn)) nonterms);
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   829
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   830
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   831
(* add type abbreviations *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   832
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   833
fun read_abbr syn tsig spaces (t, vs, rhs_src) =
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   834
  (t, vs, rd_raw_typ syn tsig spaces (K None) rhs_src)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   835
    handle ERROR => error ("in type abbreviation " ^ t);
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   836
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   837
fun ext_abbrs rd_abbr (syn, tsig, ctab, (path, spaces), data) abbrs =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   838
  let
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   839
    fun mfix_of (t, vs, _, mx) = (t, length vs, mx);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   840
    val syn' = Syntax.extend_type_gram syn (map mfix_of abbrs);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   841
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   842
    val abbrs' =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   843
      map (fn (t, vs, rhs, mx) =>
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   844
        (full path (Syntax.type_name t mx), vs, rhs)) abbrs;
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   845
    val spaces' = add_names spaces typeK (map #1 abbrs');
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   846
    val decls = map (rd_abbr syn' tsig spaces') abbrs';
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   847
  in
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   848
    (syn', Type.ext_tsig_abbrs tsig decls, ctab, (path, spaces'), data)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   849
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   850
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   851
fun ext_tyabbrs abbrs = ext_abbrs read_abbr abbrs;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   852
fun ext_tyabbrs_i abbrs = ext_abbrs no_read abbrs;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   853
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   854
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   855
(* add type arities *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   856
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   857
fun ext_ars int prep_sort (syn, tsig, ctab, (path, spaces), data) arities =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   858
  let
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   859
    val prepS = prep_sort syn tsig spaces;
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   860
    fun prep_arity (c, Ss, S) =
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   861
      (if int then intrn spaces typeK c else c, map prepS Ss, prepS S);
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   862
    val tsig' = Type.ext_tsig_arities tsig (map prep_arity arities);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   863
    val log_types = Type.logical_types tsig';
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   864
  in
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   865
    (Syntax.extend_log_types syn log_types, tsig', ctab, (path, spaces), data)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   866
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   867
8927
1cf815412d78 eta-expanded to handle value polymorphism
paulson
parents: 8898
diff changeset
   868
fun ext_arities arg   = ext_ars true rd_sort arg;
1cf815412d78 eta-expanded to handle value polymorphism
paulson
parents: 8898
diff changeset
   869
fun ext_arities_i arg = ext_ars false cert_sort arg;
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   870
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   871
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   872
(* add term constants and syntax *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   873
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   874
fun const_name path c mx =
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   875
  full path (Syntax.const_name c mx);
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   876
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   877
fun err_in_const c =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   878
  error ("in declaration of constant " ^ quote c);
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   879
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   880
fun err_dup_consts cs =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   881
  error ("Duplicate declaration of constant(s) " ^ commas_quote cs);
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   882
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   883
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   884
fun read_const syn tsig (path, spaces) (c, ty_src, mx) =
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   885
  (c, rd_raw_typ syn tsig spaces (K None) ty_src, mx)
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   886
    handle ERROR => err_in_const (const_name path c mx);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   887
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   888
fun ext_cnsts rd_const syn_only prmode (syn, tsig, ctab, (path, spaces), data) raw_consts =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   889
  let
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   890
    fun prep_const (c, ty, mx) =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   891
      (c, compress_type (Type.varifyT (Type.cert_typ tsig (Type.no_tvars ty))), mx)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   892
        handle TYPE (msg, _, _) =>
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   893
          (error_msg msg; err_in_const (const_name path c mx));
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   894
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   895
    val consts = map (prep_const o rd_const syn tsig (path, spaces)) raw_consts;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   896
    val decls =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   897
      if syn_only then []
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   898
      else decls_of path Syntax.const_name consts;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   899
  in
2197
e895937fcd56 added add_modesyntax(_i);
wenzelm
parents: 2187
diff changeset
   900
    (Syntax.extend_const_gram syn prmode consts, tsig,
4489
749600cb5573 renamed Symtab.null to Symtab.empty;
wenzelm
parents: 4344
diff changeset
   901
      Symtab.extend (ctab, decls)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   902
        handle Symtab.DUPS cs => err_dup_consts cs,
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   903
      (path, add_names spaces constK (map fst decls)), data)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   904
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   905
4007
1d6aed7ff375 made SML/NJ happy;
wenzelm
parents: 3995
diff changeset
   906
fun ext_consts_i sg = ext_cnsts no_read false ("", true) sg;
1d6aed7ff375 made SML/NJ happy;
wenzelm
parents: 3995
diff changeset
   907
fun ext_consts sg = ext_cnsts read_const false ("", true) sg;
1d6aed7ff375 made SML/NJ happy;
wenzelm
parents: 3995
diff changeset
   908
fun ext_syntax_i sg = ext_cnsts no_read true ("", true) sg;
1d6aed7ff375 made SML/NJ happy;
wenzelm
parents: 3995
diff changeset
   909
fun ext_syntax sg = ext_cnsts read_const true ("", true) sg;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   910
fun ext_modesyntax_i sg (prmode, consts) = ext_cnsts no_read true prmode sg consts;
2197
e895937fcd56 added add_modesyntax(_i);
wenzelm
parents: 2187
diff changeset
   911
fun ext_modesyntax sg (prmode, consts) = ext_cnsts read_const true prmode sg consts;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   912
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   913
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   914
(* add type classes *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   915
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   916
fun const_of_class c = c ^ "_class";
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   917
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   918
fun class_of_const c_class =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   919
  let
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   920
    val c = implode (take (size c_class - size "_class", explode c_class));
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   921
  in
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   922
    if const_of_class c = c_class then c
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   923
    else raise TERM ("class_of_const: bad name " ^ quote c_class, [])
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   924
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   925
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   926
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   927
fun ext_classes int (syn, tsig, ctab, (path, spaces), data) classes =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   928
  let
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   929
    val names = map fst classes;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   930
    val consts =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   931
      map (fn c => (const_of_class c, a_itselfT --> propT, NoSyn)) names;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   932
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   933
    val full_names = map (full path) names;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   934
    val spaces' = add_names spaces classK full_names;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   935
    val intrn = if int then map (intrn_class spaces') else I;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   936
    val classes' =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   937
      ListPair.map (fn (c, (_, cs)) => (c, intrn cs)) (full_names, classes);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   938
  in
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   939
    ext_consts_i
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   940
      (Syntax.extend_consts syn names,
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   941
        Type.ext_tsig_classes tsig classes', ctab, (path, spaces'), data)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   942
    consts
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   943
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   944
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   945
2963
f3b5af1c5a67 renamed subclass to classrel;
wenzelm
parents: 2693
diff changeset
   946
(* add to classrel *)
421
95e1d4faa863 added add_classrel;
wenzelm
parents: 418
diff changeset
   947
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   948
fun ext_classrel int (syn, tsig, ctab, (path, spaces), data) pairs =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   949
  let val intrn = if int then map (pairself (intrn_class spaces)) else I in
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   950
    (syn, Type.ext_tsig_classrel tsig (intrn pairs), ctab, (path, spaces), data)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   951
  end;
421
95e1d4faa863 added add_classrel;
wenzelm
parents: 418
diff changeset
   952
95e1d4faa863 added add_classrel;
wenzelm
parents: 418
diff changeset
   953
4619
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   954
(* add translation rules *)
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   955
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   956
fun ext_trrules (syn, tsig, ctab, (path, spaces), data) args =
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   957
  (Syntax.extend_trrules syn
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   958
    (map (Syntax.map_trrule (fn (root, str) => (intrn spaces typeK root, str))) args),
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   959
      tsig, ctab, (path, spaces), data);
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   960
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   961
1159
998a5c3451bf added add_trrules_i;
wenzelm
parents: 986
diff changeset
   962
(* add to syntax *)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   963
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   964
fun ext_syn extfun (syn, tsig, ctab, names, data) args =
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   965
  (extfun syn args, tsig, ctab, names, data);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   966
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   967
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   968
(* add to path *)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   969
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   970
fun ext_path (syn, tsig, ctab, (path, spaces), data) elems =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   971
  let
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   972
    val path' =
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   973
      if elems = ".." andalso not (null path) then fst (split_last path)
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   974
      else if elems = "/" then []
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   975
      else path @ NameSpace.unpack elems;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   976
  in
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   977
    (syn, tsig, ctab, (path', spaces), data)
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   978
  end;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   979
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   980
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   981
(* change name space *)
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   982
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   983
fun ext_add_space (syn, tsig, ctab, (path, spaces), data) (kind, names) =
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   984
  (syn, tsig, ctab, (path, add_names spaces kind names), data);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   985
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   986
fun ext_hide_space (syn, tsig, ctab, (path, spaces), data) (kind, xnames) =
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   987
  (syn, tsig, ctab, (path, hide_names spaces kind (map (intrn spaces kind) xnames)), data);
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   988
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   989
fun ext_hide_space_i (syn, tsig, ctab, (path, spaces), data) (kind, names) =
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   990
  (syn, tsig, ctab, (path, hide_names spaces kind names), data);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   991
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   992
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   993
(* signature data *)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   994
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   995
fun ext_init_data sg (syn, tsig, ctab, names, data) (kind, (e, cp, ext, mrg, prt)) =
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   996
  (syn, tsig, ctab, names, init_data_sg sg data kind e cp ext mrg prt);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   997
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   998
fun ext_put_data sg (syn, tsig, ctab, names, data) (kind, f, x) =
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   999
  (syn, tsig, ctab, names, put_data_sg sg data kind f x);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1000
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1001
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1002
fun copy_data (k, (e, mths as (cp, _, _, _))) =
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
  1003
  (k, (cp e handle exn => err_method "copy" (Object.name_of_kind k) exn, mths));
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1004
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1005
fun copy (sg as Sg ({id = _, stamps}, {self, tsig, const_tab, syn, path, spaces, data})) =
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1006
  let
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1007
    val _ = check_stale sg;
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1008
    val self' = SgRef (Some (ref sg));
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1009
    val Data tab = data;
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1010
    val data' = Data (Symtab.map copy_data tab);
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1011
  in create_sign self' stamps "#" (syn, tsig, const_tab, (path, spaces), data') end;
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1012
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1013
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1014
(* the external interfaces *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1015
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1016
val add_classes       = extend_sign true (ext_classes true) "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1017
val add_classes_i     = extend_sign true (ext_classes false) "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1018
val add_classrel      = extend_sign true (ext_classrel true) "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1019
val add_classrel_i    = extend_sign true (ext_classrel false) "#";
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
  1020
val add_defsort       = extend_sign true ext_defsort "#";
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
  1021
val add_defsort_i     = extend_sign true ext_defsort_i "#";
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1022
val add_types         = extend_sign true ext_types "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1023
val add_nonterminals  = extend_sign true ext_nonterminals "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1024
val add_tyabbrs       = extend_sign true ext_tyabbrs "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1025
val add_tyabbrs_i     = extend_sign true ext_tyabbrs_i "#";
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
  1026
val add_arities       = extend_sign true ext_arities "#";
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
  1027
val add_arities_i     = extend_sign true ext_arities_i "#";
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1028
val add_consts        = extend_sign true ext_consts "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1029
val add_consts_i      = extend_sign true ext_consts_i "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1030
val add_syntax        = extend_sign true ext_syntax "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1031
val add_syntax_i      = extend_sign true ext_syntax_i "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1032
val add_modesyntax    = extend_sign true ext_modesyntax "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1033
val add_modesyntax_i  = extend_sign true ext_modesyntax_i "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1034
val add_trfuns        = extend_sign true (ext_syn Syntax.extend_trfuns) "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1035
val add_trfunsT       = extend_sign true (ext_syn Syntax.extend_trfunsT) "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1036
val add_tokentrfuns   = extend_sign true (ext_syn Syntax.extend_tokentrfuns) "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1037
val add_trrules       = extend_sign true ext_trrules "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1038
val add_trrules_i     = extend_sign true (ext_syn Syntax.extend_trrules_i) "#";
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1039
val add_path          = extend_sign true ext_path "#";
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
  1040
val add_space         = extend_sign true ext_add_space "#";
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
  1041
val hide_space        = extend_sign true ext_hide_space "#";
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
  1042
val hide_space_i      = extend_sign true ext_hide_space_i "#";
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1043
fun init_data arg sg  = extend_sign true (ext_init_data sg) "#" arg sg;
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1044
fun put_data k f x sg = extend_sign true (ext_put_data sg) "#" (k, f, x) sg;
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1045
fun add_name name sg  = extend_sign true K name () sg;
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1046
fun prep_ext sg       = extend_sign false K "#" () sg;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1047
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1048
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1049
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
  1050
(** merge signatures **)        (*exception TERM*)
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1051
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1052
(* merge_stamps *)
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1053
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1054
fun merge_stamps stamps1 stamps2 =
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1055
  let val stamps = merge_rev_lists stamps1 stamps2 in
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1056
    (case duplicates (map ! stamps) of
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1057
      [] => stamps
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1058
    | dups => raise TERM ("Attempt to merge different versions of theories "
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1059
        ^ commas_quote dups, []))
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1060
  end;
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1061
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1062
4627
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
  1063
(* implicit merge -- trivial only *)
3877
83c5310aaaab make_draft replaced by prep_ext;
wenzelm
parents: 3867
diff changeset
  1064
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1065
fun merge_refs (sgr1 as SgRef (Some (ref (sg1 as Sg ({stamps = s1, ...}, _)))),
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1066
        sgr2 as SgRef (Some (ref (sg2 as Sg ({stamps = s2, ...}, _))))) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1067
      if fast_subsig (sg2, sg1) then sgr1
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1068
      else if fast_subsig (sg1, sg2) then sgr2
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1069
      else if subsig (sg2, sg1) then sgr1
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1070
      else if subsig (sg1, sg2) then sgr2
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1071
      else (merge_stamps s1 s2; (*check for different versions*)
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1072
        raise TERM ("Attempt to do non-trivial merge of signatures", []))
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1073
  | merge_refs _ = sys_error "Sign.merge_refs";
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1074
4627
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
  1075
val merge = deref o merge_refs o pairself self_ref;
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
  1076
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1077
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
  1078
(* proper merge *)              (*exception TERM/ERROR*)
143
f8152ca36cd5 Sign.extend: Syntax.extend now called with read_ty;
wenzelm
parents: 19
diff changeset
  1079
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1080
val PureN = "Pure";
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1081
val CPureN = "CPure";
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1082
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
  1083
fun nontriv_merge (sg1, sg2) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1084
  if subsig (sg2, sg1) then sg1
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1085
  else if subsig (sg1, sg2) then sg2
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1086
  else if is_draft sg1 orelse is_draft sg2 then
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1087
    raise TERM ("Attempt to merge draft signatures", [])
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1088
  else if exists_stamp PureN sg1 andalso exists_stamp CPureN sg2 orelse
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1089
      exists_stamp CPureN sg1 andalso exists_stamp PureN sg2 then
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1090
    raise TERM ("Cannot merge Pure and CPure signatures", [])
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1091
  else
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1092
    (*neither is union already; must form union*)
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1093
    let
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
  1094
      val Sg ({id = _, stamps = stamps1}, {self = _, tsig = tsig1, const_tab = const_tab1,
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
  1095
        syn = syn1, path = _, spaces = spaces1, data = data1}) = sg1;
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
  1096
      val Sg ({id = _, stamps = stamps2}, {self = _, tsig = tsig2, const_tab = const_tab2,
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
  1097
        syn = syn2, path = _, spaces = spaces2, data = data2}) = sg2;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1098
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1099
      val id = ref "";
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
  1100
      val self_ref = ref sg1;                   (*dummy value*)
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1101
      val self = SgRef (Some self_ref);
402
16a8fe4f2250 added subsort, norm_sort, classes;
wenzelm
parents: 386
diff changeset
  1102
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1103
      val stamps = merge_stamps stamps1 stamps2;
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
  1104
      val tsig = Type.merge_tsigs (tsig1, tsig2);
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1105
      val const_tab = Symtab.merge (op =) (const_tab1, const_tab2)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1106
        handle Symtab.DUPS cs =>
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1107
          raise TERM ("Incompatible types for constant(s) " ^ commas_quote cs, []);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1108
      val syn = Syntax.merge_syntaxes syn1 syn2;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1109
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1110
      val path = [];
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1111
      val kinds = distinct (map fst (spaces1 @ spaces2));
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1112
      val spaces =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1113
        kinds ~~
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1114
          ListPair.map NameSpace.merge
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1115
            (map (space_of spaces1) kinds, map (space_of spaces2) kinds);
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1116
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
  1117
      val data = merge_data (data1, data2);
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1118
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1119
      val sign = make_sign (id, self, tsig, const_tab, syn, path, spaces, data, stamps);
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1120
    in
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1121
      self_ref := sign; sign
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1122
    end;
143
f8152ca36cd5 Sign.extend: Syntax.extend now called with read_ty;
wenzelm
parents: 19
diff changeset
  1123
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
  1124
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
  1125
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
  1126
(** partial Pure signature **)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
  1127
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1128
val dummy_sg = make_sign (ref "", SgRef None, Type.tsig0,
4489
749600cb5573 renamed Symtab.null to Symtab.empty;
wenzelm
parents: 4344
diff changeset
  1129
  Symtab.empty, Syntax.pure_syn, [], [], empty_data, []);
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1130
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
  1131
val pre_pure =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1132
  create_sign (SgRef (Some (ref dummy_sg))) [] "#"
4489
749600cb5573 renamed Symtab.null to Symtab.empty;
wenzelm
parents: 4344
diff changeset
  1133
    (Syntax.pure_syn, Type.tsig0, Symtab.empty, ([], []), empty_data);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
  1134
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1135
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
  1136
end;