equal
deleted
inserted
replaced
26 val pure_thy : theory |
26 val pure_thy : theory |
27 val cpure_thy : theory |
27 val cpure_thy : theory |
28 val cert_axm : Sign.sg -> string * term -> string * term |
28 val cert_axm : Sign.sg -> string * term -> string * term |
29 val read_axm : Sign.sg -> string * string -> string * term |
29 val read_axm : Sign.sg -> string * string -> string * term |
30 val inferT_axm : Sign.sg -> string * term -> string * term |
30 val inferT_axm : Sign.sg -> string * term -> string * term |
|
31 val merge_theories : string -> theory * theory -> theory |
31 end |
32 end |
32 |
33 |
33 signature THEORY = |
34 signature THEORY = |
34 sig |
35 sig |
35 include BASIC_THEORY |
36 include BASIC_THEORY |
413 handle Symtab.DUPS names => err_dup_oras names) |
414 handle Symtab.DUPS names => err_dup_oras names) |
414 thys) |
415 thys) |
415 end; |
416 end; |
416 |
417 |
417 |
418 |
|
419 fun merge_theories name (thy1, thy2) = |
|
420 merge_list [thy1, thy2] |
|
421 |> add_name name; |
|
422 |
|
423 |
418 end; |
424 end; |
419 |
425 |
420 structure BasicTheory: BASIC_THEORY = Theory; |
426 structure BasicTheory: BASIC_THEORY = Theory; |
421 open BasicTheory; |
427 open BasicTheory; |