equal
deleted
inserted
replaced
209 fun id_ord ((id1, _), (id2, _)) = int_ord (id1, id2) |
209 fun id_ord ((id1, _), (id2, _)) = int_ord (id1, id2) |
210 |
210 |
211 structure Parsers = Generic_Data |
211 structure Parsers = Generic_Data |
212 ( |
212 ( |
213 type T = (int * type_parser) list * (int * term_parser) list |
213 type T = (int * type_parser) list * (int * term_parser) list |
214 val empty = ([(serial (), core_type_parser)], [(serial (), core_term_parser)]) |
214 val empty : T = ([(serial (), core_type_parser)], [(serial (), core_term_parser)]) |
215 val extend = I |
215 val extend = I |
216 fun merge ((tys1, ts1), (tys2, ts2)) = |
216 fun merge ((tys1, ts1), (tys2, ts2)) = |
217 (Ord_List.merge id_ord (tys1, tys2), Ord_List.merge id_ord (ts1, ts2)) |
217 (Ord_List.merge id_ord (tys1, tys2), Ord_List.merge id_ord (ts1, ts2)) |
218 ) |
218 ) |
219 |
219 |