src/Pure/sign.ML
author ballarin
Thu, 24 Mar 2005 17:03:37 +0100
changeset 15624 484178635bd8
parent 15574 b1d1b5bfc464
child 15703 727ef1b8b3ee
permissions -rw-r--r--
Further work on interpretation commands. New command `interpret' for interpretation in proof contexts.
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,
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
    25
    tsig: Type.tsig,
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
    26
    consts: (typ * stamp) Symtab.table,
11501
3b6415035d1a support for absolute namespace entry paths;
wenzelm
parents: 10932
diff changeset
    27
    path: string list option,
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    28
    spaces: (string * NameSpace.T) list,
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
    29
    data: data}
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
    30
  val name_of: sg -> string
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
    31
  val stamp_names_of: sg -> string list
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
    32
  val exists_stamp: string -> sg -> bool
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
    33
  val tsig_of: sg -> Type.tsig
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
    34
  val is_logtype: sg -> string -> bool
3967
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
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
    43
  val syn_of: sg -> Syntax.syntax
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    44
  val const_type: sg -> string -> typ option
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    45
  val classes: sg -> class list
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
    46
  val defaultS: sg -> sort
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    47
  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
    48
  val nodup_vars: term -> term
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
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
    51
  val universal_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
15624
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
    57
  val full_name': sg -> bstring -> string
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
    58
  val full_name_path: sg -> string -> bstring -> string
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
    59
  val base_name: string -> bstring
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
    60
  val intern: sg -> string -> xstring -> string
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
    61
  val extern: sg -> string -> string -> xstring
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    62
  val cond_extern: sg -> string -> string -> xstring
6845
598d2f32d452 added cond_extern_table;
wenzelm
parents: 6546
diff changeset
    63
  val cond_extern_table: sg -> string -> 'a Symtab.table -> (xstring * 'a) list
14700
2f885b7e5ba7 reimplementation of HOL records; only one type is created for
schirmer
parents: 14688
diff changeset
    64
  val extern_typ: sg -> typ -> typ
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    65
  val intern_class: sg -> xclass -> class
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    66
  val intern_tycon: sg -> xstring -> string
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
    67
  val intern_const: sg -> xstring -> string
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    68
  val intern_sort: sg -> xsort -> sort
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    69
  val intern_typ: sg -> xtyp -> typ
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    70
  val intern_term: sg -> xterm -> term
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
    71
  val intern_tycons: sg -> xtyp -> typ
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    72
  val pretty_sg: sg -> Pretty.T
4051
6b72919c9b4b added str_of_sg: sg -> string;
wenzelm
parents: 4017
diff changeset
    73
  val str_of_sg: sg -> string
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    74
  val pprint_sg: sg -> pprint_args -> unit
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
    75
  val PureN: string
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
    76
  val CPureN: string
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
    77
  val pre_pure: sg
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    78
  val pretty_term: sg -> term -> Pretty.T
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
    79
  val pretty_term': Syntax.syntax -> sg -> term -> Pretty.T
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    80
  val pretty_typ: sg -> typ -> Pretty.T
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    81
  val pretty_sort: sg -> sort -> Pretty.T
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
    82
  val pretty_classrel: sg -> class list -> Pretty.T
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
    83
  val pretty_arity: sg -> arity -> Pretty.T
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    84
  val string_of_term: sg -> term -> string
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    85
  val string_of_typ: sg -> typ -> string
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
    86
  val string_of_sort: sg -> sort -> string
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
    87
  val string_of_classrel: sg -> class list -> string
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
    88
  val string_of_arity: sg -> arity -> string
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    89
  val pprint_term: sg -> term -> pprint_args -> unit
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    90
  val pprint_typ: sg -> typ -> pprint_args -> unit
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
    91
  val pp: sg -> Pretty.pp
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
    92
  val certify_class: sg -> class -> class
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
    93
  val certify_sort: sg -> sort -> sort
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
    94
  val certify_typ: sg -> typ -> typ
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
    95
  val certify_typ_raw: sg -> typ -> typ
11720
5341e38309e8 added certify_tyname;
wenzelm
parents: 11501
diff changeset
    96
  val certify_tyname: sg -> string -> string
10443
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
    97
  val certify_const: sg -> string -> string
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
    98
  val certify_term: Pretty.pp -> sg -> term -> term * typ * int
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
    99
  val read_sort: sg -> string -> sort
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   100
  val read_raw_typ: sg * (indexname -> sort option) -> string -> typ
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   101
  val read_typ: sg * (indexname -> sort option) -> string -> typ
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   102
  val read_typ': Syntax.syntax -> sg * (indexname -> sort option) -> string -> typ
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   103
  val read_typ_raw': Syntax.syntax -> sg * (indexname -> sort option) -> string -> typ
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   104
  val inst_typ_tvars: sg -> (indexname * typ) list -> typ -> typ
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   105
  val inst_term_tvars: sg -> (indexname * typ) list -> term -> term
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   106
  val infer_types: Pretty.pp -> sg -> (indexname -> typ option) ->
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   107
    (indexname -> sort option) -> string list -> bool
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   108
    -> xterm list * typ -> term * (indexname * typ) list
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   109
  val infer_types_simult: Pretty.pp -> sg -> (indexname -> typ option) ->
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   110
    (indexname -> sort option) -> string list -> bool
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   111
    -> (xterm list * typ) list -> term list * (indexname * typ) list
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   112
  val read_def_terms': Pretty.pp -> (string -> bool) -> Syntax.syntax ->
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   113
    sg * (indexname -> typ option) * (indexname -> sort option) ->
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   114
    string list -> bool -> (string * typ) list -> term list * (indexname * typ) list
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   115
  val read_def_terms:
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   116
    sg * (indexname -> typ option) * (indexname -> sort option) ->
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   117
    string list -> bool -> (string * typ) list -> term list * (indexname * typ) list
8802
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   118
  val simple_read_term: sg -> typ -> string -> term
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   119
  val const_of_class: class -> string
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   120
  val class_of_const: string -> class
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   121
  val add_classes: (bclass * xclass list) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   122
  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
   123
  val add_classrel: (xclass * xclass) list -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   124
  val add_classrel_i: (class * class) list -> sg -> sg
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   125
  val add_defsort: string -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   126
  val add_defsort_i: sort -> sg -> sg
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   127
  val add_types: (bstring * int * mixfix) list -> sg -> sg
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   128
  val add_nonterminals: bstring list -> sg -> sg
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   129
  val add_tyabbrs: (bstring * string list * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   130
  val add_tyabbrs_i: (bstring * string list * typ * mixfix) list -> sg -> sg
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   131
  val add_arities: (xstring * string list * string) list -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   132
  val add_arities_i: (string * sort list * sort) list -> sg -> sg
3956
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   133
  val add_consts: (bstring * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   134
  val add_consts_i: (bstring * typ * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   135
  val add_syntax: (bstring * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   136
  val add_syntax_i: (bstring * typ * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   137
  val add_modesyntax: (string * bool) * (bstring * string * mixfix) list -> sg -> sg
d59fe4579004 tuned types;
wenzelm
parents: 3937
diff changeset
   138
  val add_modesyntax_i: (string * bool) * (bstring * typ * mixfix) list -> sg -> sg
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   139
  val add_trfuns:
4344
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   140
    (string * (ast list -> ast)) list *
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   141
    (string * (term list -> term)) list *
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   142
    (string * (term list -> term)) list *
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   143
    (string * (ast list -> ast)) list -> sg -> sg
2385
73d1435aa729 added typed print translations;
wenzelm
parents: 2359
diff changeset
   144
  val add_trfunsT:
4344
e000b5db4087 tuned trfuns types;
wenzelm
parents: 4261
diff changeset
   145
    (string * (bool -> typ -> term list -> term)) list -> sg -> sg
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   146
  val add_advanced_trfuns:
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   147
    (string * (sg -> ast list -> ast)) list *
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   148
    (string * (sg -> term list -> term)) list *
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   149
    (string * (sg -> term list -> term)) list *
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   150
    (string * (sg -> ast list -> ast)) list -> sg -> sg
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   151
  val add_advanced_trfunsT:
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   152
    (string * (sg -> bool -> typ -> term list -> term)) list -> sg -> sg
2693
8300bba275e3 added add_tokentrfuns;
wenzelm
parents: 2672
diff changeset
   153
  val add_tokentrfuns:
6311
15652e058e28 token translation: real;
wenzelm
parents: 6191
diff changeset
   154
    (string * string * (string -> string * real)) list -> sg -> sg
4619
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
   155
  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
   156
  val add_trrules_i: ast Syntax.trrule list -> sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   157
  val add_path: string -> sg -> sg
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   158
  val add_space: string * string list -> sg -> sg
12588
0361fd72f1a7 hide: flag for full/base name;
wenzelm
parents: 12313
diff changeset
   159
  val hide_space: bool -> string * string list -> sg -> sg
0361fd72f1a7 hide: flag for full/base name;
wenzelm
parents: 12313
diff changeset
   160
  val hide_space_i: bool -> string * string list -> sg -> sg
1501
bb7f99a0a6f0 Elimination of fully-functorial style.
paulson
parents: 1494
diff changeset
   161
  val add_name: string -> sg -> sg
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   162
  val data_kinds: data -> string list
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   163
  val merge_refs: sg_ref * sg_ref -> sg_ref
4627
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
   164
  val merge: sg * sg -> sg
12123
739eba13e2cd theory data: finish method;
wenzelm
parents: 12068
diff changeset
   165
  val copy: sg -> sg
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   166
  val prep_ext: sg -> sg
4627
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
   167
  val nontriv_merge: sg * sg -> sg
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   168
end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   169
6191
381b27ca0543 renamed sig to PRIVATE_SIGN;
wenzelm
parents: 6040
diff changeset
   170
signature PRIVATE_SIGN =
5642
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   171
sig
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   172
  include SIGN
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
   173
  val init_data: Object.kind * (Object.T * (Object.T -> Object.T) * (Object.T -> Object.T) *
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
   174
    (Object.T * Object.T -> Object.T) * (sg -> Object.T -> unit)) -> sg -> sg
5642
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   175
  val get_data: Object.kind -> (Object.T -> 'a) -> sg -> 'a
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   176
  val put_data: Object.kind -> ('a -> Object.T) -> 'a -> sg -> sg
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   177
  val print_data: Object.kind -> sg -> unit
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   178
end;
1b3e48bdbb93 PRIVATE sig parts;
wenzelm
parents: 5635
diff changeset
   179
6191
381b27ca0543 renamed sig to PRIVATE_SIGN;
wenzelm
parents: 6040
diff changeset
   180
structure Sign: PRIVATE_SIGN =
143
f8152ca36cd5 Sign.extend: Syntax.extend now called with read_ty;
wenzelm
parents: 19
diff changeset
   181
struct
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   182
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   183
(** datatype sg **)
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   184
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   185
(* types sg, data, syn, sg_ref *)
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   186
19
929ad32d63fc Pure/ROOT.ML
wenzelm
parents: 0
diff changeset
   187
datatype sg =
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   188
  Sg of
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   189
   {id: string ref,                             (*id*)
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   190
    stamps: string ref list,                    (*unique theory indentifier*)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   191
    syn: syn} *                                 (*syntax for parsing and printing*)
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   192
   {self: sg_ref,                               (*mutable self reference*)
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   193
    tsig: Type.tsig,                            (*order-sorted signature of types*)
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   194
    consts: (typ * stamp) Symtab.table,         (*type schemes of constants*)
11501
3b6415035d1a support for absolute namespace entry paths;
wenzelm
parents: 10932
diff changeset
   195
    path: string list option,                   (*current name space entry prefix*)
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   196
    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
   197
    data: data}                                 (*anytype data*)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   198
and data =
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   199
  Data of
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   200
    (Object.kind *                              (*kind (for authorization)*)
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   201
      (Object.T *                               (*value*)
12123
739eba13e2cd theory data: finish method;
wenzelm
parents: 12068
diff changeset
   202
        ((Object.T -> Object.T) *               (*copy method*)
739eba13e2cd theory data: finish method;
wenzelm
parents: 12068
diff changeset
   203
          (Object.T -> Object.T) *              (*prepare extend method*)
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   204
          (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
   205
          (sg -> Object.T -> unit))))           (*print method*)
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   206
    Symtab.table
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   207
and syn =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   208
  Syn of
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   209
    Syntax.syntax *
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   210
     (((sg -> ast list -> ast) * stamp) Symtab.table *
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   211
      ((sg -> term list -> term) * stamp) Symtab.table *
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   212
      ((sg -> bool -> typ -> term list -> term) * stamp) list Symtab.table *
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   213
      ((sg -> ast list -> ast) * stamp) list Symtab.table)
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   214
and sg_ref =
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   215
  SgRef of sg ref option;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   216
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   217
(*make signature*)
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   218
fun make_sign (id, self, tsig, consts, syn, path, spaces, data, stamps) =
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   219
  Sg ({id = id, stamps = stamps, syn = syn}, {self = self, tsig = tsig,
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   220
    consts = consts, path = path, spaces = spaces, data = data});
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   221
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   222
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   223
(* basic operations *)
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   224
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   225
fun rep_sg (Sg (_, args)) = args;
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   226
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   227
fun stamp_names_of (Sg ({stamps, ...}, _)) = rev (map ! stamps);
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
   228
fun exists_stamp name (Sg ({stamps, ...}, _)) = exists (equal name o !) stamps;
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   229
fun pretty_sg sg = Pretty.str_list "{" "}" (stamp_names_of sg);
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   230
val str_of_sg = Pretty.str_of o pretty_sg;
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   231
val pprint_sg = Pretty.pprint o pretty_sg;
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   232
402
16a8fe4f2250 added subsort, norm_sort, classes;
wenzelm
parents: 386
diff changeset
   233
val tsig_of = #tsig o rep_sg;
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   234
fun is_logtype sg c = c mem_string Type.logical_types (tsig_of sg);
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   235
fun const_type (Sg (_, {consts, ...})) c = Option.map #1 (Symtab.lookup (consts, c));
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   236
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   237
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   238
(* id and self *)
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   239
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   240
fun check_stale (sg as Sg ({id, ...},
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   241
        {self = SgRef (SOME (ref (Sg ({id = id', ...}, _)))), ...})) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   242
      if id = id' then sg
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   243
      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
   244
  | check_stale _ = sys_error "Sign.check_stale";
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   245
4951
8637b29e6c38 added is_stale;
wenzelm
parents: 4908
diff changeset
   246
fun is_stale sg = (check_stale sg; false) handle TERM _ => true;
8637b29e6c38 added is_stale;
wenzelm
parents: 4908
diff changeset
   247
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   248
fun self_ref (sg as Sg (_, {self, ...})) = (check_stale sg; self);
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   249
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   250
fun deref (SgRef (SOME (ref sg))) = sg
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   251
  | deref (SgRef NONE) = sys_error "Sign.deref";
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   252
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   253
fun name_of (sg as Sg ({id = ref name, ...}, _)) =
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   254
  if name = "" orelse ord name = ord "#" then
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   255
    raise TERM ("Nameless signature " ^ str_of_sg sg, [])
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   256
  else name;
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   257
206
0d624d1ba9cc added subsig: sg * sg -> bool to test if one signature is contained in another.
nipkow
parents: 200
diff changeset
   258
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   259
(* inclusion and equality *)
2180
934572a94139 Removal of polymorphic equality via mem, subset, eq_set, etc
paulson
parents: 2144
diff changeset
   260
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   261
local
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   262
  (*avoiding polymorphic equality: factor 10 speedup*)
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   263
  fun mem_stamp (_:string ref, []) = false
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   264
    | mem_stamp (x, y :: ys) = x = y orelse mem_stamp (x, ys);
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   265
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   266
  fun subset_stamp ([], ys) = true
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   267
    | subset_stamp (x :: xs, ys) =
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   268
        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
   269
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   270
  (*fast partial test*)
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   271
  fun fast_sub ([]: string ref list, _) = true
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   272
    | fast_sub (_, []) = false
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   273
    | fast_sub (x :: xs, y :: ys) =
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   274
        if x = y then fast_sub (xs, ys)
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   275
        else fast_sub (x :: xs, ys);
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   276
in
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   277
  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
   278
    (check_stale sg1; check_stale sg2; id1 = id2);
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   279
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   280
  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
   281
    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
   282
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   283
  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
   284
    eq_sg (sg1, sg2) orelse fast_sub (s1, s2);
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   285
end;
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   286
402
16a8fe4f2250 added subsort, norm_sort, classes;
wenzelm
parents: 386
diff changeset
   287
9031
8f75b9ce2f06 fixed Thm.eq_thm: use Sign.joinable;
wenzelm
parents: 8927
diff changeset
   288
fun joinable (sg1, sg2) = subsig (sg1, sg2) orelse subsig (sg2, sg1);
8f75b9ce2f06 fixed Thm.eq_thm: use Sign.joinable;
wenzelm
parents: 8927
diff changeset
   289
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   290
(*test if same theory names are contained in signatures' stamps,
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   291
  i.e. if signatures belong to same theory but not necessarily to the
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   292
  same version of it*)
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   293
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
   294
  eq_sg (sg1, sg2) orelse eq_set_string (pairself (map (op !)) (s1, s2));
2185
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   295
f9686e7e6d4d subsig tuning;
wenzelm
parents: 2184
diff changeset
   296
(*test for drafts*)
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   297
fun is_draft (Sg ({stamps = ref name :: _, ...}, _)) =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   298
  name = "" orelse ord name = ord "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   299
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   300
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   301
(* syntax *)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   302
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   303
fun map_syntax f (Syn (syntax, trfuns)) = Syn (f syntax, trfuns);
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   304
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   305
fun make_syntax sg (Syn (syntax, (atrs, trs, tr's, atr's))) =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   306
  let
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   307
    fun apply (s, (f, _: stamp)) = (s, f sg);
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   308
    fun prep tab = map apply (Symtab.dest tab);
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   309
    fun prep' tab = map apply (Symtab.dest_multi tab);
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   310
  in syntax |> Syntax.extend_trfuns (prep atrs, prep trs, prep' tr's, prep' atr's) end;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   311
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   312
fun syn_of (sg as Sg ({syn, ...}, _)) = make_syntax sg syn;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   313
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   314
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   315
(* advanced translation functions *)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   316
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   317
fun extend_trfuns (atrs, trs, tr's, atr's)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   318
    (Syn (syn, (parse_ast_trtab, parse_trtab, print_trtab, print_ast_trtab))) =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   319
  Syn (syn, (Syntax.extend_trtab parse_ast_trtab atrs "parse ast translation",
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   320
    Syntax.extend_trtab parse_trtab trs "parse translation",
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   321
    Syntax.extend_tr'tab print_trtab tr's,
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   322
    Syntax.extend_tr'tab print_ast_trtab atr's));
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   323
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   324
fun merge_trfuns
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   325
    (parse_ast_trtab1, parse_trtab1, print_trtab1, print_ast_trtab1)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   326
    (parse_ast_trtab2, parse_trtab2, print_trtab2, print_ast_trtab2) =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   327
  (Syntax.merge_trtabs parse_ast_trtab1 parse_ast_trtab2 "parse ast translation",
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   328
    Syntax.merge_trtabs parse_trtab1 parse_trtab2 "parse translation",
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   329
    Syntax.merge_tr'tabs print_trtab1 print_trtab2,
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   330
    Syntax.merge_tr'tabs print_ast_trtab1 print_ast_trtab2);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   331
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   332
4568
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   333
(* classes and sorts *)
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   334
7640
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
   335
val classes = Type.classes o tsig_of;
4844
4fb63c77f2df added defaultS: sg -> sort;
wenzelm
parents: 4627
diff changeset
   336
val defaultS = Type.defaultS o tsig_of;
4568
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   337
val subsort = Type.subsort o tsig_of;
7640
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
   338
val of_sort = Type.of_sort o tsig_of;
6b7daae5d316 added witness_sorts, univ_witness;
wenzelm
parents: 7068
diff changeset
   339
val witness_sorts = Type.witness_sorts o tsig_of;
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   340
val universal_witness = Type.universal_witness o tsig_of;
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   341
val typ_instance = Type.typ_instance o tsig_of;
4568
7be03035c553 added of_sort;
wenzelm
parents: 4489
diff changeset
   342
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   343
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   344
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   345
(** signature data **)
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
(* errors *)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   348
4261
e20b9fd85811 improved error msg;
wenzelm
parents: 4256
diff changeset
   349
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
   350
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   351
fun err_inconsistent kinds =
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   352
  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
   353
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   354
fun err_method name kind e =
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   355
  (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
   356
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   357
fun err_dup_init sg kind =
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   358
  error ("Duplicate initialization of " ^ quote kind ^ " data" ^ of_theory sg);
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 err_uninit sg kind =
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   361
  error ("Tried to access uninitialized " ^ quote kind ^ " data" ^ of_theory sg);
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   362
6040
bd37dc0f56d9 comments
paulson
parents: 5642
diff changeset
   363
(*Trying to access theory data using get / put operations from a different
bd37dc0f56d9 comments
paulson
parents: 5642
diff changeset
   364
  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
   365
fun err_access sg kind =
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   366
  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
   367
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   368
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   369
(* prepare data *)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   370
4489
749600cb5573 renamed Symtab.null to Symtab.empty;
wenzelm
parents: 4344
diff changeset
   371
val empty_data = Data Symtab.empty;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   372
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   373
fun merge_data (Data tab1, Data tab2) =
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   374
  let
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   375
    val data1 = map snd (Symtab.dest tab1);
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   376
    val data2 = map snd (Symtab.dest tab2);
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   377
    val all_data = data1 @ data2;
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   378
    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
   379
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   380
   fun entry data kind =
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   381
     (case gen_assoc Object.eq_kind (data, kind) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   382
       NONE => []
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   383
     | SOME x => [(kind, x)]);
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   384
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
   385
    fun merge_entries [(kind, (e, mths as (_, ext, _, _)))] =
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   386
          (kind, (ext e handle exn => err_method "prep_ext" (Object.name_of_kind kind) exn, mths))
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
   387
      | merge_entries [(kind, (e1, mths as (_, _, mrg, _))), (_, (e2, _))] =
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   388
          (kind, (mrg (e1, e2)
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   389
            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
   390
      | merge_entries _ = sys_error "merge_entries";
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   391
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   392
    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
   393
    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
   394
  in
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   395
    Data (Symtab.make data_idx)
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   396
      handle Symtab.DUPS dups => err_inconsistent dups
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   397
  end;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   398
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   399
fun prep_ext_data data = merge_data (data, empty_data);
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   400
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
   401
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
   402
  let val name = Object.name_of_kind kind in
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
   403
    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
   404
      handle Symtab.DUP _ => err_dup_init sg name
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   405
  end;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   406
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   407
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   408
(* access data *)
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   409
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   410
fun data_kinds (Data tab) = map fst (Symtab.dest tab);
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   411
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   412
fun lookup_data sg tab kind =
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   413
  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
   414
    (case Symtab.lookup (tab, name) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   415
      SOME (k, x) =>
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   416
        if Object.eq_kind (kind, k) then x
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   417
        else err_access sg name
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   418
    | NONE => err_uninit sg name)
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   419
  end;
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   420
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   421
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
   422
  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
   423
  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
   424
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   425
fun print_data kind (sg as Sg (_, {data = Data tab, ...})) =
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
   426
  let val (e, (_, _, _, prt)) = lookup_data sg tab kind
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
   427
  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
   428
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   429
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
   430
  Data (Symtab.update ((Object.name_of_kind kind,
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
   431
    (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
   432
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   433
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   434
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
   435
(** build signatures **)
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   436
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   437
fun ext_stamps stamps (id as ref name) =
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   438
  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
   439
    if exists (equal name o !) stmps then
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   440
      error ("Theory already contains a " ^ quote name ^ " component")
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   441
    else id :: stmps
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   442
  end;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   443
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   444
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
   445
  let
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   446
    val id = ref name;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   447
    val sign =
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   448
      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
   449
  in
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   450
    (case self of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   451
      SgRef (SOME r) => r := sign
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   452
    | _ => sys_error "Sign.create_sign");
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   453
    sign
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   454
  end;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   455
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   456
fun extend_sign keep extfun name decls
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   457
    (sg as Sg ({id = _, stamps, syn}, {self, tsig, consts, path, spaces, data})) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   458
  let
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   459
    val _ = check_stale sg;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   460
    val (self', data') =
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   461
      if is_draft sg andalso keep then (self, data)
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   462
      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
   463
  in
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   464
    create_sign self' stamps name
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   465
      (extfun sg (syn, tsig, consts, (path, spaces), data') decls)
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   466
  end;
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   467
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
   468
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   469
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   470
(** name spaces **)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   471
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   472
(* kinds *)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   473
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   474
val classK = "class";
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   475
val typeK = "type";
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   476
val constK = "const";
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   477
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   478
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   479
(* declare and retrieve names *)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   480
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   481
fun space_of spaces kind =
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   482
  getOpt (assoc (spaces, kind), NameSpace.empty);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   483
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   484
(*input and output of qualified names*)
3995
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   485
fun intrn spaces kind = NameSpace.intern (space_of spaces kind);
88fc1015d241 self_ref: check_stale;
wenzelm
parents: 3975
diff changeset
   486
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
   487
fun cond_extrn spaces kind = NameSpace.cond_extern (space_of spaces kind);
6845
598d2f32d452 added cond_extern_table;
wenzelm
parents: 6546
diff changeset
   488
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
   489
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   490
(*add / hide names*)
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
   491
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
   492
fun add_names x = change_space NameSpace.extend x;
12588
0361fd72f1a7 hide: flag for full/base name;
wenzelm
parents: 12313
diff changeset
   493
fun hide_names b x = change_space (NameSpace.hide b) x;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   494
15624
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   495
(*make full names, standard version*)
11501
3b6415035d1a support for absolute namespace entry paths;
wenzelm
parents: 10932
diff changeset
   496
fun full _ "" = error "Attempt to declare empty name \"\""
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   497
  | full NONE bname = bname
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   498
  | full (SOME path) bname =
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   499
      if NameSpace.is_qualified bname then
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   500
        error ("Attempt to declare qualified name " ^ quote bname)
14688
edb7dacde656 warning: non-identifier declaration;
wenzelm
parents: 14645
diff changeset
   501
      else
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   502
        let val name = NameSpace.pack (path @ [bname]) in
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   503
          if Syntax.is_identifier bname then ()
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   504
          else warning ("Declared non-identifier " ^ quote name); name
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   505
        end;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   506
15624
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   507
(*make full names, variant permitting qualified names*)
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   508
fun full' _ "" = error "Attempt to declare empty name \"\""
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   509
  | full' NONE bname = bname
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   510
  | full' (SOME path) bname =
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   511
      let
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   512
        val bnames = NameSpace.unpack bname;
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   513
        val name = NameSpace.pack (path @ bnames)
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   514
      in
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   515
        if forall Syntax.is_identifier bnames then ()
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   516
        else warning ("Declared non-identifier " ^ quote name); name
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   517
      end;
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   518
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   519
(*base name*)
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   520
val base_name = NameSpace.base;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   521
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   522
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   523
(* intern / extern names *)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   524
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   525
local
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   526
  (*prepare mapping of names*)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   527
  fun mapping f add_xs t =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   528
    let
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   529
      fun f' x = let val y = f x in if x = y then NONE else SOME (x, y) end;
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   530
      val table = List.mapPartial f' (add_xs (t, []));
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   531
      fun lookup x = getOpt (assoc (table, x), x);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   532
    in lookup end;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   533
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   534
  (*intern / extern typ*)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   535
  fun trn_typ trn T =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   536
    T |> map_typ
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   537
      (mapping (trn classK) add_typ_classes T)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   538
      (mapping (trn typeK) add_typ_tycons T);
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   539
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   540
  (*intern / extern term*)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   541
  fun trn_term trn t =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   542
    t |> map_term
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   543
      (mapping (trn classK) add_term_classes t)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   544
      (mapping (trn typeK) add_term_tycons t)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   545
      (mapping (trn constK) add_term_consts t);
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   546
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   547
  val spaces_of = #spaces o rep_sg;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   548
in
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   549
  fun intrn_class spaces = intrn spaces classK;
14383
09aab4710789 Printing functions now use cond_extrn instead of extrn
berghofe
parents: 12785
diff changeset
   550
  fun extrn_class spaces = cond_extrn spaces classK;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   551
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   552
  val intrn_sort = map o intrn_class;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   553
  val intrn_typ = trn_typ o intrn;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   554
  val intrn_term = trn_term o intrn;
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   555
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   556
  val extrn_sort = map o extrn_class;
14383
09aab4710789 Printing functions now use cond_extrn instead of extrn
berghofe
parents: 12785
diff changeset
   557
  val extrn_typ = trn_typ o cond_extrn;
09aab4710789 Printing functions now use cond_extrn instead of extrn
berghofe
parents: 12785
diff changeset
   558
  val extrn_term = trn_term o cond_extrn;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   559
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   560
  fun intrn_tycons spaces T =
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   561
    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
   562
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   563
  val intern = intrn o spaces_of;
3855
4bdf32173f6f fixed extern;
wenzelm
parents: 3850
diff changeset
   564
  val extern = extrn o spaces_of;
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   565
  val cond_extern = cond_extrn o spaces_of;
6845
598d2f32d452 added cond_extern_table;
wenzelm
parents: 6546
diff changeset
   566
  fun cond_extern_table sg = cond_extrn_table (spaces_of sg);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   567
14700
2f885b7e5ba7 reimplementation of HOL records; only one type is created for
schirmer
parents: 14688
diff changeset
   568
  fun extern_typ (sg as Sg (_, {spaces, ...})) T =
2f885b7e5ba7 reimplementation of HOL records; only one type is created for
schirmer
parents: 14688
diff changeset
   569
       if ! NameSpace.long_names then T else extrn_typ spaces T;
2f885b7e5ba7 reimplementation of HOL records; only one type is created for
schirmer
parents: 14688
diff changeset
   570
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   571
  val intern_class = intrn_class o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   572
  val intern_sort = intrn_sort o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   573
  val intern_typ = intrn_typ o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   574
  val intern_term = intrn_term o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   575
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   576
  fun intern_tycon sg = intrn (spaces_of sg) typeK;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   577
  fun intern_const sg = intrn (spaces_of sg) constK;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   578
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   579
  val intern_tycons = intrn_tycons o spaces_of;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   580
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   581
  val full_name = full o #path o rep_sg;
15624
484178635bd8 Further work on interpretation commands. New command `interpret' for
ballarin
parents: 15574
diff changeset
   582
  val full_name' = full' o #path o rep_sg;
11501
3b6415035d1a support for absolute namespace entry paths;
wenzelm
parents: 10932
diff changeset
   583
3b6415035d1a support for absolute namespace entry paths;
wenzelm
parents: 10932
diff changeset
   584
  fun full_name_path sg elems =
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   585
    full (SOME (getOpt (#path (rep_sg sg), []) @ NameSpace.unpack elems));
11501
3b6415035d1a support for absolute namespace entry paths;
wenzelm
parents: 10932
diff changeset
   586
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   587
end;
620
f787eb061618 exported pretty_sort;
wenzelm
parents: 583
diff changeset
   588
402
16a8fe4f2250 added subsort, norm_sort, classes;
wenzelm
parents: 386
diff changeset
   589
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   590
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   591
(** partial Pure signature **)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   592
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   593
val pure_syn =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   594
  Syn (Syntax.pure_syn, (Symtab.empty, Symtab.empty, Symtab.empty, Symtab.empty));
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   595
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   596
val dummy_sg = make_sign (ref "", SgRef NONE, Type.empty_tsig,
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   597
  Symtab.empty, pure_syn, SOME [], [], empty_data, []);
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   598
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   599
val pre_pure =
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   600
  create_sign (SgRef (SOME (ref dummy_sg))) [] "#"
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   601
    (pure_syn, Type.empty_tsig, Symtab.empty, (SOME [], []), empty_data);
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   602
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   603
val PureN = "Pure";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   604
val CPureN = "CPure";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   605
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   606
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   607
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   608
(** pretty printing of terms, types etc. **)
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   609
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   610
fun pretty_term' syn (sg as Sg ({stamps, ...}, {spaces, ...})) t =
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   611
  Syntax.pretty_term syn
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   612
    (exists (equal CPureN o !) stamps)
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   613
    (if ! NameSpace.long_names then t else extrn_term spaces t);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   614
14974
b1ecb7859c99 avoid premature evaluation of syn_of (wastes time in conjunction with pp);
wenzelm
parents: 14905
diff changeset
   615
fun pretty_term sg t = pretty_term' (syn_of sg) sg t;
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   616
14700
2f885b7e5ba7 reimplementation of HOL records; only one type is created for
schirmer
parents: 14688
diff changeset
   617
fun pretty_typ sg T =
2f885b7e5ba7 reimplementation of HOL records; only one type is created for
schirmer
parents: 14688
diff changeset
   618
  Syntax.pretty_typ (syn_of sg) (extern_typ sg T);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   619
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   620
fun pretty_sort (sg as Sg (_, {spaces, ...})) S =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   621
  Syntax.pretty_sort (syn_of sg)
5175
2dbef0104bcf moved long_names / cond_extern to name_space.ML;
wenzelm
parents: 4998
diff changeset
   622
    (if ! NameSpace.long_names then S else extrn_sort spaces S);
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   623
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   624
fun pretty_classrel sg cs = Pretty.block (List.concat
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   625
  (separate [Pretty.str " <", Pretty.brk 1] (map (single o pretty_sort sg o single) cs)));
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   626
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   627
fun pretty_arity sg (t, Ss, S) =
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   628
  let
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   629
    val t' = cond_extern sg typeK t;
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   630
    val dom =
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   631
      if null Ss then []
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   632
      else [Pretty.list "(" ")" (map (pretty_sort sg) Ss), Pretty.brk 1];
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   633
  in
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   634
    Pretty.block
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   635
      ([Pretty.str (t' ^ " ::"), Pretty.brk 1] @ dom @ [pretty_sort sg S])
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   636
  end;
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   637
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   638
val string_of_term = Pretty.string_of oo pretty_term;
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   639
val string_of_typ = Pretty.string_of oo pretty_typ;
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   640
val string_of_sort = Pretty.string_of oo pretty_sort;
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   641
val string_of_classrel = Pretty.string_of oo pretty_classrel;
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   642
val string_of_arity = Pretty.string_of oo pretty_arity;
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   643
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   644
fun pprint_term sg = Pretty.pprint o Pretty.quote o (pretty_term sg);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   645
fun pprint_typ sg = Pretty.pprint o Pretty.quote o (pretty_typ sg);
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   646
14974
b1ecb7859c99 avoid premature evaluation of syn_of (wastes time in conjunction with pp);
wenzelm
parents: 14905
diff changeset
   647
fun pp sg = Pretty.pp (pretty_term sg, pretty_typ sg, pretty_sort sg,
b1ecb7859c99 avoid premature evaluation of syn_of (wastes time in conjunction with pp);
wenzelm
parents: 14905
diff changeset
   648
  pretty_classrel sg, pretty_arity sg);
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   649
3937
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   650
988ce6fbf85b fixed types of add_XXX;
wenzelm
parents: 3899
diff changeset
   651
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   652
(** read sorts **)  (*exception ERROR*)
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   653
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   654
fun err_in_sort s =
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   655
  error ("The error(s) above occurred in sort " ^ quote s);
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   656
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   657
fun rd_sort sg syn tsig spaces str =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   658
  let val S = intrn_sort spaces (Syntax.read_sort (make_syntax sg syn) str
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   659
    handle ERROR => err_in_sort str)
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   660
  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
   661
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   662
(*read and certify sort wrt a signature*)
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   663
fun read_sort (sg as Sg ({syn, ...}, {tsig, spaces, ...})) str =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   664
  (check_stale sg; rd_sort sg syn tsig spaces str);
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   665
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   666
fun cert_sort _ _ tsig _ = Type.cert_sort tsig;
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   667
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   668
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   669
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   670
(** read types **)  (*exception ERROR*)
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   671
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   672
fun err_in_type s =
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   673
  error ("The error(s) above occurred in type " ^ quote s);
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   674
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   675
fun rd_raw_typ syn tsig spaces def_sort str =
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   676
  intrn_tycons spaces (Syntax.read_typ syn
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   677
    (TypeInfer.get_sort tsig def_sort (intrn_sort spaces)) (intrn_sort spaces) str
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   678
      handle ERROR => err_in_type str);
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   679
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   680
fun read_raw_typ' syn (sg as Sg (_, {tsig, spaces, ...}), def_sort) str =
4227
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   681
  (check_stale sg; rd_raw_typ syn tsig spaces def_sort str);
a5c947d7c56c export read_raw_typ;
wenzelm
parents: 4140
diff changeset
   682
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   683
fun read_raw_typ (sg, def_sort) = read_raw_typ' (syn_of sg) (sg, def_sort);
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   684
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   685
(*read and certify typ wrt a signature*)
9504
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   686
local
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   687
  fun read_typ_aux rd cert (sg, def_sort) str =
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14987
diff changeset
   688
    cert (tsig_of sg) (rd (sg, def_sort) str)
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14987
diff changeset
   689
      handle TYPE (msg, _, _) => (error_msg msg; err_in_type str);
9504
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   690
in
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   691
  val read_typ          = read_typ_aux read_raw_typ Type.cert_typ;
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   692
  val read_typ_raw      = read_typ_aux read_raw_typ Type.cert_typ_raw;
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   693
  fun read_typ' syn     = read_typ_aux (read_raw_typ' syn) Type.cert_typ;
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   694
  fun read_typ_raw' syn = read_typ_aux (read_raw_typ' syn) Type.cert_typ_raw;
9504
8168600e88a5 typ_no_norm;
wenzelm
parents: 9031
diff changeset
   695
end;
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   696
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   697
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
   698
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   699
(** certify classes, sorts, types and terms **)   (*exception TYPE*)
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   700
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   701
val certify_class = Type.cert_class o tsig_of;
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   702
val certify_sort = Type.cert_sort o tsig_of;
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14987
diff changeset
   703
val certify_typ = Type.cert_typ o tsig_of;
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14987
diff changeset
   704
val certify_typ_raw = Type.cert_typ_raw o tsig_of;
10443
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   705
11720
5341e38309e8 added certify_tyname;
wenzelm
parents: 11501
diff changeset
   706
fun certify_tyname sg c =
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   707
  if isSome (Symtab.lookup (#types (Type.rep_tsig (tsig_of sg)), c)) then c
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   708
  else raise TYPE ("Undeclared type constructor: " ^ quote c, [], []);
11720
5341e38309e8 added certify_tyname;
wenzelm
parents: 11501
diff changeset
   709
10443
0a68dc9edba5 added certify_tycon, certify_tyabbr, certify_const;
wenzelm
parents: 10404
diff changeset
   710
fun certify_const sg c =
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   711
  if isSome (const_type sg c) then c
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   712
  else raise TYPE ("Undeclared constant: " ^ quote c, [], []);
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   713
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   714
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   715
(* certify_term *)
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   716
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   717
local
1494
22f67e796445 added nodup_Vars check in cterm_of. Prevents same var with distinct types.
nipkow
parents: 1460
diff changeset
   718
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   719
(*compute and check type of the term*)
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   720
fun type_check pp sg tm =
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   721
  let
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   722
    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
   723
      let
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
   724
        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
   725
        val t' = subst_bounds (xs, t);
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   726
        val u' = subst_bounds (xs, u);
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   727
        val text = cat_lines
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   728
          (TypeInfer.appl_error (Syntax.pp_show_brackets pp) why t' T u' U);
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   729
      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
   730
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   731
    fun typ_of (_, Const (_, T)) = T
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   732
      | typ_of (_, Free  (_, T)) = T
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   733
      | typ_of (_, Var (_, T)) = T
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   734
      | typ_of (bs, Bound i) = snd (List.nth (bs, i) handle Subscript =>
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   735
          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
   736
      | 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
   737
      | typ_of (bs, t $ u) =
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   738
          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
   739
            (case T of
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   740
              Type ("fun", [T1, T2]) =>
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   741
                if T1 = U then T2 else err_appl "Incompatible operand type" bs t T u U
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   742
            | _ => err_appl "Operator not of function type" bs t T u U)
4961
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   743
          end;
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   744
27f559b54c57 certify_term: type_check replaces Term.type_of, providing sensible
wenzelm
parents: 4951
diff changeset
   745
  in typ_of ([], tm) end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   746
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   747
(*check for duplicate occurrences of TFree/TVar with distinct sorts*)
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   748
fun nodup_tvars (env, Type (_, Ts)) = nodup_tvars_list (env, Ts)
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   749
  | nodup_tvars (env as (tfrees, tvars), T as TFree (v as (a, S))) =
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   750
      (case assoc_string (tfrees, a) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   751
        SOME S' =>
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   752
          if S = S' then env
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   753
          else raise TYPE ("Type variable " ^ quote a ^
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   754
            " has two distinct sorts", [TFree (a, S'), T], [])
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   755
      | NONE => (v :: tfrees, tvars))
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   756
  | nodup_tvars (env as (tfrees, tvars), T as TVar (v as (a, S))) =
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   757
      (case assoc_string_int (tvars, a) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   758
        SOME S' =>
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   759
          if S = S' then env
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   760
          else raise TYPE ("Type variable " ^ quote (Syntax.string_of_vname a) ^
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   761
            " has two distinct sorts", [TVar (a, S'), T], [])
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   762
      | NONE => (tfrees, v :: tvars))
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   763
(*equivalent to foldl nodup_tvars_list, but 3X faster under Poly/ML*)
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   764
and nodup_tvars_list (env, []) = env
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   765
  | nodup_tvars_list (env, T :: Ts) = nodup_tvars_list (nodup_tvars (env, T), Ts);
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   766
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   767
in
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   768
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   769
(*check for duplicate occurrences of Free/Var with distinct types*)
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   770
fun nodup_vars tm =
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   771
  let
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   772
    fun nodups (envs as (env as (frees, vars), envT)) tm =
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   773
      (case tm of
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   774
        Const (c, T) => (env, nodup_tvars (envT, T))
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   775
      | Free (v as (a, T)) =>
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   776
          (case assoc_string (frees, a) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   777
            SOME T' =>
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   778
              if T = T' then (env, nodup_tvars (envT, T))
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   779
              else raise TYPE ("Variable " ^ quote a ^
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   780
                " has two distinct types", [T', T], [])
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   781
          | NONE => ((v :: frees, vars), nodup_tvars (envT, T)))
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   782
      | Var (v as (ixn, T)) =>
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   783
          (case assoc_string_int (vars, ixn) of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   784
            SOME T' =>
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   785
              if T = T' then (env, nodup_tvars (envT, T))
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   786
              else raise TYPE ("Variable " ^ quote (Syntax.string_of_vname ixn) ^
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   787
                " has two distinct types", [T', T], [])
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   788
          | NONE => ((frees, v :: vars), nodup_tvars (envT, T)))
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   789
      | Bound _ => envs
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   790
      | Abs (_, T, t) => nodups (env, nodup_tvars (envT, T)) t
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   791
      | s $ t => nodups (nodups envs s) t)
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   792
  in nodups (([], []), ([], [])) tm; tm end;
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   793
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   794
fun certify_term pp sg tm =
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   795
  let
3969
9c742951a923 certify: check_stale;
wenzelm
parents: 3967
diff changeset
   796
    val _ = check_stale sg;
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   797
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14987
diff changeset
   798
    val tm' = map_term_types (Type.cert_typ (tsig_of sg)) tm;
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   799
    val tm' = if tm = tm' then tm else tm';  (*avoid copying of already normal term*)
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   800
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   801
    fun err msg = raise TYPE (msg, [], [tm']);
3969
9c742951a923 certify: check_stale;
wenzelm
parents: 3967
diff changeset
   802
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   803
    fun show_const a T = quote a ^ " :: " ^ Pretty.string_of_typ pp T;
169
1b2765146aab extend: cleaned up, adapted for new Syntax.extend;
wenzelm
parents: 155
diff changeset
   804
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   805
    fun check_atoms (t $ u) = (check_atoms t; check_atoms u)
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   806
      | check_atoms (Abs (_, _, t)) = check_atoms t
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   807
      | check_atoms (Const (a, T)) =
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   808
          (case const_type sg a of
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   809
            NONE => err ("Undeclared constant " ^ show_const a T)
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   810
          | SOME U =>
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   811
              if typ_instance sg (T, U) then ()
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   812
              else err ("Illegal type for constant " ^ show_const a T))
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   813
      | check_atoms (Var ((x, i), _)) =
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   814
          if i < 0 then err ("Malformed variable: " ^ quote x) else ()
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   815
      | check_atoms _ = ();
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   816
  in
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   817
    check_atoms tm';
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   818
    nodup_vars tm';
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14987
diff changeset
   819
    (tm', type_check pp sg tm', maxidx_of_term tm')
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   820
  end;
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   821
14987
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   822
end;
699239c7632c tuned certify_term;
wenzelm
parents: 14981
diff changeset
   823
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   824
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   825
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   826
(** instantiation **)
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   827
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   828
fun inst_typ_tvars sg = Type.inst_typ_tvars (pp sg) (tsig_of sg);
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   829
fun inst_term_tvars sg = Type.inst_term_tvars (pp sg) (tsig_of sg);
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   830
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   831
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   832
583
550292083e66 minor internal changes;
wenzelm
parents: 573
diff changeset
   833
(** infer_types **)         (*exception ERROR*)
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   834
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   835
(*
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   836
  def_type: partial map from indexnames to types (constrains Frees, Vars)
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   837
  def_sort: partial map from indexnames to sorts (constrains TFrees, TVars)
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   838
  used: list of already used type variables
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   839
  freeze: if true then generated parameters are turned into TFrees, else TVars
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   840
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   841
  termss: lists of alternative parses (only one combination should be type-correct)
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   842
  typs: expected types
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   843
*)
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   844
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   845
fun infer_types_simult pp sg def_type def_sort used freeze args =
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   846
  let
3975
ddeb5a0fd08d hide id, stamps;
wenzelm
parents: 3969
diff changeset
   847
    val tsig = tsig_of sg;
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   848
15574
b1d1b5bfc464 Removed practically all references to Library.foldr.
skalberg
parents: 15570
diff changeset
   849
    val termss = foldr multiply [[]] (map fst args);
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   850
    val typs =
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   851
      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
   852
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   853
    fun infer ts = OK (TypeInfer.infer_types (Syntax.pp_show_brackets pp) tsig
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   854
        (const_type sg) def_type def_sort (intern_const sg) (intern_tycons sg)
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   855
        (intern_sort sg) used freeze typs ts)
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   856
      handle TYPE (msg, _, _) => Error msg;
623
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   857
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   858
    val err_results = map infer termss;
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   859
    val errs = List.mapPartial get_error err_results;
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   860
    val results = List.mapPartial get_ok err_results;
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   861
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   862
    val ambiguity = length termss;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   863
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   864
    fun ambig_msg () =
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   865
      if ambiguity > 1 andalso ambiguity <= ! Syntax.ambiguity_level
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   866
      then
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   867
        error_msg "Got more than one parse tree.\n\
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   868
          \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
   869
      else ();
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   870
  in
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   871
    if null results then (ambig_msg (); error (cat_lines errs))
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   872
    else if length results = 1 then
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   873
      (if ambiguity > ! Syntax.ambiguity_level then
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   874
        warning "Fortunately, only one parse tree is type correct.\n\
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   875
          \You may still want to disambiguate your grammar or your input."
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   876
      else (); hd results)
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   877
    else (ambig_msg (); error ("More than one term is type correct:\n" ^
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   878
      cat_lines (map (Pretty.string_of_term pp) (List.concat (map fst results)))))
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   879
  end;
623
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   880
4249
34b7aafdc1bc exported pretty_classrel, pretty_arity;
wenzelm
parents: 4228
diff changeset
   881
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   882
fun infer_types pp sg def_type def_sort used freeze tsT =
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   883
  apfst hd (infer_types_simult pp sg def_type def_sort used freeze [tsT]);
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   884
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   885
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   886
(** read_def_terms **)
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   887
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   888
(*read terms, infer types*)
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   889
fun read_def_terms' pp is_logtype syn (sign, types, sorts) used freeze sTs =
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   890
  let
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   891
    fun read (s, T) =
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   892
      let val T' = certify_typ sign T handle TYPE (msg, _, _) => error msg
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   893
      in (Syntax.read is_logtype syn T' s, T') end;
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   894
    val tsTs = map read sTs;
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   895
  in infer_types_simult pp sign types sorts used freeze tsTs end;
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   896
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   897
fun read_def_terms (sign, types, sorts) =
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   898
  read_def_terms' (pp sign) (is_logtype sign) (syn_of sign) (sign, types, sorts);
12068
469f372d63db added pretty_term', read_typ', read_typ_no_norm', read_def_terms'
wenzelm
parents: 11720
diff changeset
   899
8802
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   900
fun simple_read_term sign T s =
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   901
  (read_def_terms (sign, K NONE, K NONE) [] true [(s, T)]
8802
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   902
    handle ERROR => error ("The error(s) above occurred for " ^ s)) |> #1 |> hd;
2c37263eb903 added simple_read_term;
wenzelm
parents: 8730
diff changeset
   903
8607
bf129c6505de read_def_terms (no certify yet);
wenzelm
parents: 8290
diff changeset
   904
2979
db6941221197 improved type check error messages;
wenzelm
parents: 2963
diff changeset
   905
623
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   906
(** extend signature **)    (*exception ERROR*)
ca9f5dbab880 added print_msg;
clasohm
parents: 620
diff changeset
   907
620
f787eb061618 exported pretty_sort;
wenzelm
parents: 583
diff changeset
   908
(** signature extension functions **)  (*exception ERROR*)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   909
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   910
fun decls_of path name_of mfixs =
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   911
  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
   912
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   913
fun no_read _ _ _ _ decl = decl;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   914
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
(* add default sort *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   917
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   918
fun ext_defS prep_sort sg (syn, tsig, ctab, (path, spaces), data) S =
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   919
  (syn, Type.set_defsort (prep_sort sg syn tsig spaces S) tsig,
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   920
    ctab, (path, spaces), data);
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   921
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   922
fun ext_defsort arg = ext_defS rd_sort arg;
8927
1cf815412d78 eta-expanded to handle value polymorphism
paulson
parents: 8898
diff changeset
   923
fun ext_defsort_i arg = ext_defS cert_sort arg;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   924
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
(* add type constructors *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   927
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   928
fun ext_types sg (syn, tsig, ctab, (path, spaces), data) types =
14856
669a9a0e7279 proper treatment of logical types within syntax;
wenzelm
parents: 14828
diff changeset
   929
  let
669a9a0e7279 proper treatment of logical types within syntax;
wenzelm
parents: 14828
diff changeset
   930
    val decls = decls_of path Syntax.type_name types;
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   931
    val syn' = map_syntax (Syntax.extend_type_gram types) syn;
14856
669a9a0e7279 proper treatment of logical types within syntax;
wenzelm
parents: 14828
diff changeset
   932
    val tsig' = Type.add_types decls tsig;
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   933
  in (syn', tsig', ctab, (path, add_names spaces typeK (map fst decls)), data) end;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   934
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   935
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   936
(* add type abbreviations *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   937
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   938
fun read_abbr sg syn tsig spaces (t, vs, rhs_src) =
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   939
  (t, vs, rd_raw_typ (make_syntax sg syn) tsig spaces (K NONE) rhs_src)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   940
    handle ERROR => error ("in type abbreviation " ^ t);
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   941
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   942
fun ext_abbrs rd_abbr sg (syn, tsig, ctab, (path, spaces), data) abbrs =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   943
  let
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   944
    fun mfix_of (t, vs, _, mx) = (t, length vs, mx);
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   945
    val syn' = syn |> map_syntax (Syntax.extend_type_gram (map mfix_of abbrs));
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   946
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   947
    val abbrs' =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   948
      map (fn (t, vs, rhs, mx) =>
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   949
        (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
   950
    val spaces' = add_names spaces typeK (map #1 abbrs');
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   951
    val decls = map (rd_abbr sg syn' tsig spaces') abbrs';
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
   952
  in (syn', Type.add_abbrs decls tsig, ctab, (path, spaces'), data) end;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   953
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   954
fun ext_tyabbrs abbrs = ext_abbrs read_abbr abbrs;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
   955
fun ext_tyabbrs_i abbrs = ext_abbrs no_read abbrs;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   956
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   957
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   958
(* add nonterminals *)
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   959
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   960
fun ext_nonterminals _ (syn, tsig, ctab, (path, spaces), data) bnames =
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   961
  let val names = map (full path) bnames in
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   962
    (map_syntax (Syntax.extend_consts names) syn,
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   963
      Type.add_nonterminals names tsig, ctab,
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   964
      (path, add_names spaces typeK names), data)
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   965
  end;
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   966
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
   967
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   968
(* add type arities *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   969
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   970
fun ext_ars int prep_sort sg (syn, tsig, ctab, (path, spaces), data) arities =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   971
  let
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   972
    val prepS = prep_sort sg syn tsig spaces;
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   973
    fun prep_arity (c, Ss, S) =
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   974
      (if int then intrn spaces typeK c else c, map prepS Ss, prepS S);
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
   975
    val tsig' = Type.add_arities (pp sg) (map prep_arity arities) tsig;
14856
669a9a0e7279 proper treatment of logical types within syntax;
wenzelm
parents: 14828
diff changeset
   976
  in (syn, tsig', ctab, (path, spaces), data) end;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   977
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   978
fun ext_arities arg = ext_ars true rd_sort arg;
8927
1cf815412d78 eta-expanded to handle value polymorphism
paulson
parents: 8898
diff changeset
   979
fun ext_arities_i arg = ext_ars false cert_sort arg;
8898
a1ee54500516 removed is_type_abbr;
wenzelm
parents: 8802
diff changeset
   980
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   981
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   982
(* add term constants and syntax *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   983
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   984
fun const_name path c mx =
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
   985
  full path (Syntax.const_name c mx);
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   986
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   987
fun err_in_const c =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   988
  error ("in declaration of constant " ^ quote c);
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   989
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   990
fun err_dup_consts cs =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   991
  error ("Duplicate declaration of constant(s) " ^ commas_quote cs);
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   992
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
   993
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   994
fun read_const sg syn tsig (path, spaces) (c, ty_src, mx) =
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
   995
  (c, rd_raw_typ (make_syntax sg syn) tsig spaces (K NONE) ty_src, mx)
3805
a50d0b5219dd improved types of add_XXX funs (xtyp etc.);
wenzelm
parents: 3791
diff changeset
   996
    handle ERROR => err_in_const (const_name path c mx);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
   997
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   998
fun ext_cnsts rd_const syn_only prmode sg (syn, tsig, ctab, (path, spaces), data)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
   999
    raw_consts =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1000
  let
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1001
    val prep_typ = compress_type o Type.varifyT o Type.no_tvars o
14993
802f3732a54e tuned certify_typ/term;
wenzelm
parents: 14987
diff changeset
  1002
     (if syn_only then Type.cert_typ_syntax tsig else Term.no_dummyT o Type.cert_typ tsig);
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1003
    fun prep_const (c, ty, mx) = (c, prep_typ ty, mx) handle TYPE (msg, _, _) =>
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1004
      (error_msg msg; err_in_const (const_name path c mx));
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1005
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1006
    val consts = map (prep_const o rd_const sg syn tsig (path, spaces)) raw_consts;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1007
    val decls =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1008
      if syn_only then []
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1009
      else decls_of path Syntax.const_name consts;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1010
  in
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1011
    (map_syntax (Syntax.extend_const_gram (is_logtype sg) prmode consts) syn, tsig,
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1012
      Symtab.extend (ctab, map (fn (c, T) => (c, (T, stamp ()))) decls)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1013
        handle Symtab.DUPS cs => err_dup_consts cs,
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1014
      (path, add_names spaces constK (map fst decls)), data)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1015
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1016
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1017
fun ext_consts_i x = ext_cnsts no_read false Syntax.default_mode x;
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1018
fun ext_consts x = ext_cnsts read_const false Syntax.default_mode x;
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1019
fun ext_syntax_i x = ext_cnsts no_read true Syntax.default_mode x;
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1020
fun ext_syntax x = ext_cnsts read_const true Syntax.default_mode x;
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1021
fun ext_modesyntax_i x y (prmode, consts) = ext_cnsts no_read true prmode x y consts;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1022
fun ext_modesyntax x y (prmode, consts) = ext_cnsts read_const true prmode x y consts;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1023
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1024
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1025
(* add type classes *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1026
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1027
fun const_of_class c = c ^ "_class";
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1028
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1029
fun class_of_const c_class =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1030
  let
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
  1031
    val c = implode (Library.take (size c_class - size "_class", explode c_class));
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1032
  in
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1033
    if const_of_class c = c_class then c
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1034
    else raise TERM ("class_of_const: bad name " ^ quote c_class, [])
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1035
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1036
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1037
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1038
fun ext_classes int sg (syn, tsig, ctab, (path, spaces), data) classes =
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1039
  let
562
e9572d03b724 added pretty_sg;
wenzelm
parents: 421
diff changeset
  1040
    val names = map fst classes;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1041
    val consts =
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1042
      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
  1043
3810
350150bd3744 tuned exports;
wenzelm
parents: 3805
diff changeset
  1044
    val full_names = map (full path) names;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1045
    val spaces' = add_names spaces classK full_names;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1046
    val intrn = if int then map (intrn_class spaces') else I;
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1047
    val classes' =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1048
      ListPair.map (fn (c, (_, cs)) => (c, intrn cs)) (full_names, classes);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1049
  in
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1050
    ext_consts_i sg
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1051
      (map_syntax (Syntax.extend_consts names) syn,
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
  1052
        Type.add_classes (pp sg) classes' tsig, ctab, (path, spaces'), data)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1053
    consts
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1054
  end;
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1055
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1056
2963
f3b5af1c5a67 renamed subclass to classrel;
wenzelm
parents: 2693
diff changeset
  1057
(* add to classrel *)
421
95e1d4faa863 added add_classrel;
wenzelm
parents: 418
diff changeset
  1058
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
  1059
fun ext_classrel int sg (syn, tsig, ctab, (path, spaces), data) pairs =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1060
  let val intrn = if int then map (pairself (intrn_class spaces)) else I in
14828
15d12761ba54 improved output; refer to Pretty.pp;
wenzelm
parents: 14784
diff changeset
  1061
    (syn, Type.add_classrel (pp sg) (intrn pairs) tsig, ctab, (path, spaces), data)
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1062
  end;
421
95e1d4faa863 added add_classrel;
wenzelm
parents: 418
diff changeset
  1063
95e1d4faa863 added add_classrel;
wenzelm
parents: 418
diff changeset
  1064
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1065
(* add translation functions *)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1066
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1067
fun ext_trfs ext non_typed sg (syn, tsig, ctab, names, data) (atrs, trs, tr's, atr's) =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1068
  let val syn' = syn |> ext (atrs, trs, map (apsnd non_typed) tr's, atr's)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1069
  in make_syntax sg syn'; (syn', tsig, ctab, names, data) end;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1070
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1071
fun ext_trfsT ext sg (syn, tsig, ctab, names, data) tr's =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1072
  let val syn' = syn |> ext ([], [], tr's, [])
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1073
  in make_syntax sg syn'; (syn', tsig, ctab, names, data) end;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1074
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1075
fun ext_trfuns sg = ext_trfs (map_syntax o Syntax.extend_trfuns) Syntax.non_typed_tr' sg;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1076
fun ext_trfunsT sg = ext_trfsT (map_syntax o Syntax.extend_trfuns) sg;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1077
fun ext_advanced_trfuns sg = ext_trfs extend_trfuns Syntax.non_typed_tr'' sg;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1078
fun ext_advanced_trfunsT sg = ext_trfsT extend_trfuns sg;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1079
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1080
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1081
(* add token translation functions *)
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1082
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1083
fun ext_tokentrfuns sg (syn, tsig, ctab, names, data) args =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1084
  (map_syntax (Syntax.extend_tokentrfuns args) syn, tsig, ctab, names, data);
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1085
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1086
4619
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
  1087
(* add translation rules *)
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
  1088
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1089
fun ext_trrules sg (syn, tsig, ctab, (path, spaces), data) args =
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1090
  (syn |> map_syntax (Syntax.extend_trrules (is_logtype sg) (make_syntax sg syn)
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1091
      (map (Syntax.map_trrule (fn (root, str) => (intrn spaces typeK root, str))) args)),
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1092
    tsig, ctab, (path, spaces), data);
4619
72edc2a9200f fixed add_trrules: intern root;
wenzelm
parents: 4568
diff changeset
  1093
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1094
fun ext_trrules_i _ (syn, tsig, ctab, names, data) args =
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1095
  (syn |> map_syntax (Syntax.extend_trrules_i args), tsig, ctab, names, data);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1096
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1097
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1098
(* add to path *)
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1099
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1100
fun ext_path _ (syn, tsig, ctab, (path, spaces), data) elems =
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1101
  let
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1102
    val path' =
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1103
      if elems = "//" then NONE
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1104
      else if elems = "/" then SOME []
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
  1105
      else if elems = ".." andalso isSome path andalso path <> SOME [] then
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
  1106
        SOME (fst (split_last (valOf path)))
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
  1107
      else SOME (getOpt (path,[]) @ NameSpace.unpack elems);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1108
  in
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1109
    (syn, tsig, ctab, (path', spaces), data)
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
  1110
  end;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1111
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1112
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
  1113
(* change name space *)
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
  1114
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1115
fun ext_add_space _ (syn, tsig, ctab, (path, spaces), data) (kind, names) =
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
  1116
  (syn, tsig, ctab, (path, add_names spaces kind names), data);
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1117
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1118
fun ext_hide_space _ (syn, tsig, ctab, (path, spaces), data) (b, (kind, xnames)) =
12588
0361fd72f1a7 hide: flag for full/base name;
wenzelm
parents: 12313
diff changeset
  1119
  (syn, tsig, ctab, (path, hide_names b spaces kind (map (intrn spaces kind) xnames)), data);
8725
0e48ee5b52db name space hide operations;
wenzelm
parents: 8715
diff changeset
  1120
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1121
fun ext_hide_space_i _ (syn, tsig, ctab, (path, spaces), data) (b, (kind, names)) =
12588
0361fd72f1a7 hide: flag for full/base name;
wenzelm
parents: 12313
diff changeset
  1122
  (syn, tsig, ctab, (path, hide_names b spaces kind names), data);
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1123
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1124
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1125
(* signature data *)
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1126
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
  1127
fun ext_init_data sg (syn, tsig, ctab, names, data) (kind, (e, cp, ext, mrg, prt)) =
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
  1128
  (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
  1129
4998
28fe46a570d7 improved data: secure version using Object.T and Object.kind;
wenzelm
parents: 4961
diff changeset
  1130
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
  1131
  (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
  1132
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1133
12310
26407b087c8e data: removed obsolete finish method;
wenzelm
parents: 12296
diff changeset
  1134
fun copy_data (k, (e, mths as (cp, _, _, _))) =
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
  1135
  (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
  1136
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1137
fun copy (sg as Sg ({id = _, stamps, syn}, {self, tsig, consts, path, spaces, data})) =
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1138
  let
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1139
    val _ = check_stale sg;
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1140
    val self' = SgRef (SOME (ref sg));
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1141
    val Data tab = data;
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1142
    val data' = Data (Symtab.map copy_data tab);
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1143
  in create_sign self' stamps "#" (syn, tsig, consts, (path, spaces), data') end;
6546
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1144
995a66249a9b theory data: copy;
wenzelm
parents: 6311
diff changeset
  1145
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1146
(* the external interfaces *)
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1147
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1148
val add_classes          = extend_sign true (ext_classes true) "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1149
val add_classes_i        = extend_sign true (ext_classes false) "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1150
val add_classrel         = extend_sign true (ext_classrel true) "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1151
val add_classrel_i       = extend_sign true (ext_classrel false) "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1152
val add_defsort          = extend_sign true ext_defsort "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1153
val add_defsort_i        = extend_sign true ext_defsort_i "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1154
val add_types            = extend_sign true ext_types "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1155
val add_nonterminals     = extend_sign true ext_nonterminals "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1156
val add_tyabbrs          = extend_sign true ext_tyabbrs "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1157
val add_tyabbrs_i        = extend_sign true ext_tyabbrs_i "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1158
val add_arities          = extend_sign true ext_arities "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1159
val add_arities_i        = extend_sign true ext_arities_i "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1160
val add_consts           = extend_sign true ext_consts "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1161
val add_consts_i         = extend_sign true ext_consts_i "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1162
val add_syntax           = extend_sign true ext_syntax "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1163
val add_syntax_i         = extend_sign true ext_syntax_i "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1164
val add_modesyntax       = extend_sign true ext_modesyntax "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1165
val add_modesyntax_i     = extend_sign true ext_modesyntax_i "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1166
val add_trfuns           = extend_sign true ext_trfuns "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1167
val add_trfunsT          = extend_sign true ext_trfunsT "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1168
val add_advanced_trfuns  = extend_sign true ext_advanced_trfuns "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1169
val add_advanced_trfunsT = extend_sign true ext_advanced_trfunsT "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1170
val add_tokentrfuns      = extend_sign true ext_tokentrfuns "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1171
val add_trrules          = extend_sign true ext_trrules "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1172
val add_trrules_i        = extend_sign true ext_trrules_i "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1173
val add_path             = extend_sign true ext_path "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1174
val add_space            = extend_sign true ext_add_space "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1175
val hide_space           = curry (extend_sign true ext_hide_space "#");
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1176
val hide_space_i         = curry (extend_sign true ext_hide_space_i "#");
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1177
val init_data            = extend_sign true ext_init_data "#";
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1178
fun put_data k f x       = extend_sign true ext_put_data "#" (k, f, x);
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1179
fun add_name name        = extend_sign true (K K) name ();
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1180
val prep_ext             = extend_sign false (K K) "#" ();
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1181
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1182
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1183
10404
93efbb62667c added typ_instance;
wenzelm
parents: 9504
diff changeset
  1184
(** merge signatures **)        (*exception TERM*)
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1185
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1186
(* merge_stamps *)
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1187
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1188
fun merge_stamps stamps1 stamps2 =
12296
45269a593e1b clarified order of merge_lists';
wenzelm
parents: 12286
diff changeset
  1189
  let val stamps = merge_lists' stamps1 stamps2 in
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1190
    (case duplicates (map ! stamps) of
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1191
      [] => stamps
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1192
    | dups => raise TERM ("Attempt to merge different versions of theories "
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1193
        ^ commas_quote dups, []))
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1194
  end;
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1195
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1196
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1197
(* trivial merge *)
3877
83c5310aaaab make_draft replaced by prep_ext;
wenzelm
parents: 3867
diff changeset
  1198
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1199
fun merge_refs (sgr1 as SgRef (SOME (ref (sg1 as Sg ({stamps = s1, ...}, _)))),
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1200
        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
  1201
      if fast_subsig (sg2, sg1) then sgr1
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1202
      else if fast_subsig (sg1, sg2) then sgr2
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1203
      else if subsig (sg2, sg1) then sgr1
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1204
      else if subsig (sg1, sg2) then sgr2
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1205
      else (merge_stamps s1 s2; (*check for different versions*)
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1206
        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
  1207
  | merge_refs _ = sys_error "Sign.merge_refs";
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1208
4627
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
  1209
val merge = deref o merge_refs o pairself self_ref;
ae95666c71cc Sign.merge vs. Sign.nontriv_merge;
wenzelm
parents: 4619
diff changeset
  1210
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1211
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1212
(* non-trivial merge *)              (*exception TERM/ERROR*)
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1213
6961
4d404c52ca80 err_method: pass exn;
wenzelm
parents: 6845
diff changeset
  1214
fun nontriv_merge (sg1, sg2) =
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1215
  if subsig (sg2, sg1) then sg1
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1216
  else if subsig (sg1, sg2) then sg2
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1217
  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
  1218
    raise TERM ("Attempt to merge draft signatures", [])
10932
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1219
  else if exists_stamp PureN sg1 andalso exists_stamp CPureN sg2 orelse
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1220
      exists_stamp CPureN sg1 andalso exists_stamp PureN sg2 then
ad13abb0a264 added exists_stamp;
wenzelm
parents: 10443
diff changeset
  1221
    raise TERM ("Cannot merge Pure and CPure signatures", [])
251
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1222
  else
c9b984c0a674 major cleanup;
wenzelm
parents: 229
diff changeset
  1223
    let
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1224
      val Sg ({id = _, stamps = stamps1, syn = Syn (syntax1, trfuns1)},
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1225
          {self = _, tsig = tsig1, consts = consts1,
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1226
            path = _, spaces = spaces1, data = data1}) = sg1;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1227
      val Sg ({id = _, stamps = stamps2, syn = Syn (syntax2, trfuns2)},
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1228
          {self = _, tsig = tsig2, consts = consts2,
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1229
            path = _, spaces = spaces2, data = data2}) = sg2;
386
e9ba9f7e2542 added const_type: sg -> typ option;
wenzelm
parents: 277
diff changeset
  1230
4228
22e3f0368c85 merge_refs: check for different versions of theories;
wenzelm
parents: 4227
diff changeset
  1231
      val stamps = merge_stamps stamps1 stamps2;
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1232
      val syntax = Syntax.merge_syntaxes syntax1 syntax2;
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1233
      val trfuns = merge_trfuns trfuns1 trfuns2;
14784
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1234
      val consts = Symtab.merge eq_snd (consts1, consts2)
e65d77313a94 xxx_typ_raw replace xxx_typ_no_norm forms; prevent duplicate consts declarations in merge; misc cleanup;
wenzelm
parents: 14700
diff changeset
  1235
        handle Symtab.DUPS cs => err_dup_consts cs;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1236
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1237
      val path = SOME [];
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1238
      val kinds = distinct (map fst (spaces1 @ spaces2));
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1239
      val spaces =
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1240
        kinds ~~
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1241
          ListPair.map NameSpace.merge
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1242
            (map (space_of spaces1) kinds, map (space_of spaces2) kinds);
3867
3b2587c809f4 added additional generic data;
wenzelm
parents: 3855
diff changeset
  1243
4256
e768c42069bb removed data.ML (made part of sign.ML);
wenzelm
parents: 4249
diff changeset
  1244
      val data = merge_data (data1, data2);
3967
edd5ff9371f8 sg_ref: automatic adjustment of thms of draft theories;
wenzelm
parents: 3956
diff changeset
  1245
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1246
      val pre_sign = make_sign (ref "", SgRef (SOME (ref dummy_sg)),
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1247
        tsig1, consts, Syn (syntax, trfuns), path, spaces, data, ref "#" :: stamps1);
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1248
      val tsig = Type.merge_tsigs (pp pre_sign) (tsig1, tsig2);
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1249
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1250
      val self_ref = ref dummy_sg;
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 14993
diff changeset
  1251
      val self = SgRef (SOME self_ref);
14905
5f3fc2f62071 added is_logtype (replaces logtypes field of syntax); tuned merge;
wenzelm
parents: 14856
diff changeset
  1252
      val sign = make_sign (ref "", self, tsig, consts, Syn (syntax, trfuns),
14645
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1253
        path, spaces, data, stamps);
83776a9f0a9c support for advanced translation functions;
wenzelm
parents: 14383
diff changeset
  1254
    in self_ref := sign; syn_of sign; sign end;
3791
c5db2c87a646 now supports qualified names (intern vs. extern) !!!
wenzelm
parents: 3552
diff changeset
  1255
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
  1256
end;