equal
deleted
inserted
replaced
118 val Thy {axioms = _, defs = defs1, oracles = oracles1} = thy1; |
118 val Thy {axioms = _, defs = defs1, oracles = oracles1} = thy1; |
119 val Thy {axioms = _, defs = defs2, oracles = oracles2} = thy2; |
119 val Thy {axioms = _, defs = defs2, oracles = oracles2} = thy2; |
120 |
120 |
121 val axioms = NameSpace.empty_table; |
121 val axioms = NameSpace.empty_table; |
122 val defs = Defs.merge pp defs1 defs2; |
122 val defs = Defs.merge pp defs1 defs2; |
123 val oracles = NameSpace.merge_tables eq_snd (oracles1, oracles2) |
123 val oracles = NameSpace.merge_tables (eq_snd (op =)) (oracles1, oracles2) |
124 handle Symtab.DUPS dups => err_dup_oras dups; |
124 handle Symtab.DUPS dups => err_dup_oras dups; |
125 in make_thy (axioms, defs, oracles) end; |
125 in make_thy (axioms, defs, oracles) end; |
126 |
126 |
127 fun print _ _ = (); |
127 fun print _ _ = (); |
128 end); |
128 end); |