equal
deleted
inserted
replaced
153 val Sign {naming = _, syn = syn1, tsig = tsig1, consts = consts1} = sign1; |
153 val Sign {naming = _, syn = syn1, tsig = tsig1, consts = consts1} = sign1; |
154 val Sign {naming = _, syn = syn2, tsig = tsig2, consts = consts2} = sign2; |
154 val Sign {naming = _, syn = syn2, tsig = tsig2, consts = consts2} = sign2; |
155 |
155 |
156 val naming = Name_Space.default_naming; |
156 val naming = Name_Space.default_naming; |
157 val syn = Syntax.merge_syntaxes syn1 syn2; |
157 val syn = Syntax.merge_syntaxes syn1 syn2; |
158 val tsig = Type.merge_tsigs pp (tsig1, tsig2); |
158 val tsig = Type.merge_tsig pp (tsig1, tsig2); |
159 val consts = Consts.merge (consts1, consts2); |
159 val consts = Consts.merge (consts1, consts2); |
160 in make_sign (naming, syn, tsig, consts) end; |
160 in make_sign (naming, syn, tsig, consts) end; |
161 ); |
161 ); |
162 |
162 |
163 fun rep_sg thy = Data.get thy |> (fn Sign args => args); |
163 fun rep_sg thy = Data.get thy |> (fn Sign args => args); |