| author | wenzelm | 
| Mon, 21 Aug 2023 13:01:45 +0200 | |
| changeset 78553 | 66fc98b4557b | 
| parent 77871 | 4f9117e6020d | 
| child 79394 | 2ff5ffd8731b | 
| permissions | -rw-r--r-- | 
| 2956 | 1 | (* Title: Pure/sorts.ML | 
| 2 | Author: Markus Wenzel and Stefan Berghofer, TU Muenchen | |
| 3 | ||
| 19514 | 4 | The order-sorted algebra of type classes. | 
| 19529 | 5 | |
| 6 | Classes denote (possibly empty) collections of types that are | |
| 7 | partially ordered by class inclusion. They are represented | |
| 8 | symbolically by strings. | |
| 9 | ||
| 10 | Sorts are intersections of finitely many classes. They are represented | |
| 11 | by lists of classes. Normal forms of sorts are sorted lists of | |
| 12 | minimal classes (wrt. current class inclusion). | |
| 2956 | 13 | *) | 
| 14 | ||
| 15 | signature SORTS = | |
| 16 | sig | |
| 77869 | 17 | val make: sort list -> sort Ord_List.T | 
| 18 | val subset: sort Ord_List.T * sort Ord_List.T -> bool | |
| 19 | val union: sort Ord_List.T -> sort Ord_List.T -> sort Ord_List.T | |
| 77871 
4f9117e6020d
Thm.shared context: speed-up low-level inferences;
 wenzelm parents: 
77869diff
changeset | 20 | val unions: sort Ord_List.T list -> sort Ord_List.T | 
| 77869 | 21 | val subtract: sort Ord_List.T -> sort Ord_List.T -> sort Ord_List.T | 
| 22 | val remove_sort: sort -> sort Ord_List.T -> sort Ord_List.T | |
| 23 | val insert_sort: sort -> sort Ord_List.T -> sort Ord_List.T | |
| 24 | val insert_typ: typ -> sort Ord_List.T -> sort Ord_List.T | |
| 25 | val insert_typs: typ list -> sort Ord_List.T -> sort Ord_List.T | |
| 26 | val insert_term: term -> sort Ord_List.T -> sort Ord_List.T | |
| 27 | val insert_terms: term list -> sort Ord_List.T -> sort Ord_List.T | |
| 19645 | 28 | type algebra | 
| 36328 
4d9deabf6474
replaced Sorts.rep_algebra by slightly more abstract selectors classes_of/arities_of;
 wenzelm parents: 
36105diff
changeset | 29 | val classes_of: algebra -> serial Graph.T | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 30 | val arities_of: algebra -> (class * sort list) list Symtab.table | 
| 21933 
819ef284720b
classes: more direct way to achieve topological sorting;
 wenzelm parents: 
21926diff
changeset | 31 | val all_classes: algebra -> class list | 
| 19645 | 32 | val super_classes: algebra -> class -> class list | 
| 33 | val class_less: algebra -> class * class -> bool | |
| 34 | val class_le: algebra -> class * class -> bool | |
| 35 | val sort_eq: algebra -> sort * sort -> bool | |
| 36 | val sort_le: algebra -> sort * sort -> bool | |
| 37 | val sorts_le: algebra -> sort list * sort list -> bool | |
| 38 | val inter_sort: algebra -> sort * sort -> sort | |
| 24732 | 39 | val minimize_sort: algebra -> sort -> sort | 
| 40 | val complete_sort: algebra -> sort -> sort | |
| 61262 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 wenzelm parents: 
48272diff
changeset | 41 | val add_class: Context.generic -> class * class list -> algebra -> algebra | 
| 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 wenzelm parents: 
48272diff
changeset | 42 | val add_classrel: Context.generic -> class * class -> algebra -> algebra | 
| 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 wenzelm parents: 
48272diff
changeset | 43 | val add_arities: Context.generic -> string * (class * sort list) list -> algebra -> algebra | 
| 19645 | 44 | val empty_algebra: algebra | 
| 61262 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 wenzelm parents: 
48272diff
changeset | 45 | val merge_algebra: Context.generic -> algebra * algebra -> algebra | 
| 68295 | 46 | val dest_algebra: algebra list -> algebra -> | 
| 47 |     {classrel: (class * class list) list,
 | |
| 48 | arities: (string * sort list * class) list} | |
| 61262 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 wenzelm parents: 
48272diff
changeset | 49 | val subalgebra: Context.generic -> (class -> bool) -> (class * string -> sort list option) | 
| 22181 
39104d1c43ca
added explicit query function for arities to subalgebra projection
 haftmann parents: 
21933diff
changeset | 50 | -> algebra -> (sort -> sort) * algebra | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 51 | type class_error | 
| 61262 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 wenzelm parents: 
48272diff
changeset | 52 | val class_error: Context.generic -> class_error -> string | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 53 | exception CLASS_ERROR of class_error | 
| 48272 | 54 | val has_instance: algebra -> string -> sort -> bool | 
| 19645 | 55 | val mg_domain: algebra -> string -> sort -> sort list (*exception CLASS_ERROR*) | 
| 28665 | 56 | val meet_sort: algebra -> typ * sort | 
| 57 | -> sort Vartab.table -> sort Vartab.table (*exception CLASS_ERROR*) | |
| 58 | val meet_sort_typ: algebra -> typ * sort -> typ -> typ (*exception CLASS_ERROR*) | |
| 19645 | 59 | val of_sort: algebra -> typ * sort -> bool | 
| 32791 | 60 | val of_sort_derivation: algebra -> | 
| 62538 
85ebb645b1a3
provide explicit hint concering uniqueness of derivation
 haftmann parents: 
61264diff
changeset | 61 |     {class_relation: typ -> bool -> 'a * class -> class -> 'a,
 | 
| 36102 
a51d1d154c71
of_sort_derivation: pass-through full type information -- following the version by krauss/schropp;
 wenzelm parents: 
35975diff
changeset | 62 |      type_constructor: string * typ list -> ('a * class) list list -> class -> 'a,
 | 
| 22570 
f166a5416b3f
renamed of_sort_derivation record fields (avoid clash with Alice keywords);
 wenzelm parents: 
22364diff
changeset | 63 |      type_variable: typ -> ('a * class) list} ->
 | 
| 19584 | 64 | typ * sort -> 'a list (*exception CLASS_ERROR*) | 
| 35961 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 65 | val classrel_derivation: algebra -> | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 66 |     ('a * class -> class -> 'a) -> 'a * class -> class -> 'a  (*exception CLASS_ERROR*)
 | 
| 31946 
99ac0321cd47
witness_sorts: proper type witnesses for hyps, not invented "'hyp" variables;
 wenzelm parents: 
30242diff
changeset | 67 | val witness_sorts: algebra -> string list -> (typ * sort) list -> sort list -> (typ * sort) list | 
| 2956 | 68 | end; | 
| 69 | ||
| 20573 | 70 | structure Sorts: SORTS = | 
| 2956 | 71 | struct | 
| 72 | ||
| 77869 | 73 | |
| 74 | (** ordered lists of sorts **) | |
| 75 | ||
| 76 | val make = Ord_List.make Term_Ord.sort_ord; | |
| 77 | val subset = Ord_List.subset Term_Ord.sort_ord; | |
| 78 | val union = Ord_List.union Term_Ord.sort_ord; | |
| 77871 
4f9117e6020d
Thm.shared context: speed-up low-level inferences;
 wenzelm parents: 
77869diff
changeset | 79 | val unions = Ord_List.unions Term_Ord.sort_ord; | 
| 77869 | 80 | val subtract = Ord_List.subtract Term_Ord.sort_ord; | 
| 81 | ||
| 82 | val remove_sort = Ord_List.remove Term_Ord.sort_ord; | |
| 83 | val insert_sort = Ord_List.insert Term_Ord.sort_ord; | |
| 84 | ||
| 85 | fun insert_typ (TFree (_, S)) Ss = insert_sort S Ss | |
| 86 | | insert_typ (TVar (_, S)) Ss = insert_sort S Ss | |
| 87 | | insert_typ (Type (_, Ts)) Ss = insert_typs Ts Ss | |
| 88 | and insert_typs [] Ss = Ss | |
| 89 | | insert_typs (T :: Ts) Ss = insert_typs Ts (insert_typ T Ss); | |
| 90 | ||
| 91 | fun insert_term (Const (_, T)) Ss = insert_typ T Ss | |
| 92 | | insert_term (Free (_, T)) Ss = insert_typ T Ss | |
| 93 | | insert_term (Var (_, T)) Ss = insert_typ T Ss | |
| 94 | | insert_term (Bound _) Ss = Ss | |
| 95 | | insert_term (Abs (_, T, t)) Ss = insert_term t (insert_typ T Ss) | |
| 96 | | insert_term (t $ u) Ss = insert_term t (insert_term u Ss); | |
| 97 | ||
| 98 | fun insert_terms [] Ss = Ss | |
| 99 | | insert_terms (t :: ts) Ss = insert_terms ts (insert_term t Ss); | |
| 100 | ||
| 101 | ||
| 102 | ||
| 19529 | 103 | (** order-sorted algebra **) | 
| 2956 | 104 | |
| 105 | (* | |
| 14782 
d6ce35a1c386
incorporate sort ops from term.ML; use Graph.T; misc cleanup;
 wenzelm parents: 
9281diff
changeset | 106 | classes: graph representing class declarations together with proper | 
| 
d6ce35a1c386
incorporate sort ops from term.ML; use Graph.T; misc cleanup;
 wenzelm parents: 
9281diff
changeset | 107 | subclass relation, which needs to be transitive and acyclic. | 
| 2956 | 108 | |
| 14782 
d6ce35a1c386
incorporate sort ops from term.ML; use Graph.T; misc cleanup;
 wenzelm parents: 
9281diff
changeset | 109 | arities: table of association lists of all type arities; (t, ars) | 
| 19531 | 110 | means that type constructor t has the arities ars; an element | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 111 | (c, Ss) of ars represents the arity t::(Ss)c. "Coregularity" of | 
| 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 112 | the arities structure requires that for any two declarations | 
| 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 113 | t::(Ss1)c1 and t::(Ss2)c2 such that c1 <= c2 holds Ss1 <= Ss2. | 
| 2956 | 114 | *) | 
| 115 | ||
| 19645 | 116 | datatype algebra = Algebra of | 
| 20573 | 117 |  {classes: serial Graph.T,
 | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 118 | arities: (class * sort list) list Symtab.table}; | 
| 19645 | 119 | |
| 36328 
4d9deabf6474
replaced Sorts.rep_algebra by slightly more abstract selectors classes_of/arities_of;
 wenzelm parents: 
36105diff
changeset | 120 | fun classes_of (Algebra {classes, ...}) = classes;
 | 
| 
4d9deabf6474
replaced Sorts.rep_algebra by slightly more abstract selectors classes_of/arities_of;
 wenzelm parents: 
36105diff
changeset | 121 | fun arities_of (Algebra {arities, ...}) = arities;
 | 
| 19645 | 122 | |
| 123 | fun make_algebra (classes, arities) = | |
| 124 |   Algebra {classes = classes, arities = arities};
 | |
| 125 | ||
| 126 | fun map_classes f (Algebra {classes, arities}) = make_algebra (f classes, arities);
 | |
| 127 | fun map_arities f (Algebra {classes, arities}) = make_algebra (classes, f arities);
 | |
| 128 | ||
| 129 | ||
| 130 | (* classes *) | |
| 131 | ||
| 21933 
819ef284720b
classes: more direct way to achieve topological sorting;
 wenzelm parents: 
21926diff
changeset | 132 | fun all_classes (Algebra {classes, ...}) = Graph.all_preds classes (Graph.maximals classes);
 | 
| 
819ef284720b
classes: more direct way to achieve topological sorting;
 wenzelm parents: 
21926diff
changeset | 133 | |
| 44338 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
43792diff
changeset | 134 | val super_classes = Graph.immediate_succs o classes_of; | 
| 2956 | 135 | |
| 136 | ||
| 19529 | 137 | (* class relations *) | 
| 2956 | 138 | |
| 71526 | 139 | val class_less : algebra -> class * class -> bool = Graph.is_edge o classes_of; | 
| 19645 | 140 | fun class_le algebra (c1, c2) = c1 = c2 orelse class_less algebra (c1, c2); | 
| 2956 | 141 | |
| 142 | ||
| 19529 | 143 | (* sort relations *) | 
| 2956 | 144 | |
| 71526 | 145 | fun sort_le algebra (S1: sort, S2: sort) = | 
| 23585 | 146 | S1 = S2 orelse forall (fn c2 => exists (fn c1 => class_le algebra (c1, c2)) S1) S2; | 
| 2956 | 147 | |
| 19645 | 148 | fun sorts_le algebra (Ss1, Ss2) = | 
| 149 | ListPair.all (sort_le algebra) (Ss1, Ss2); | |
| 2956 | 150 | |
| 19645 | 151 | fun sort_eq algebra (S1, S2) = | 
| 152 | sort_le algebra (S1, S2) andalso sort_le algebra (S2, S1); | |
| 2956 | 153 | |
| 154 | ||
| 19529 | 155 | (* intersection *) | 
| 2956 | 156 | |
| 19645 | 157 | fun inter_class algebra c S = | 
| 2956 | 158 | let | 
| 159 | fun intr [] = [c] | |
| 160 | | intr (S' as c' :: c's) = | |
| 19645 | 161 | if class_le algebra (c', c) then S' | 
| 162 | else if class_le algebra (c, c') then intr c's | |
| 2956 | 163 | else c' :: intr c's | 
| 164 | in intr S end; | |
| 165 | ||
| 19645 | 166 | fun inter_sort algebra (S1, S2) = | 
| 167 | sort_strings (fold (inter_class algebra) S1 S2); | |
| 2956 | 168 | |
| 169 | ||
| 24732 | 170 | (* normal forms *) | 
| 2956 | 171 | |
| 24732 | 172 | fun minimize_sort _ [] = [] | 
| 173 | | minimize_sort _ (S as [_]) = S | |
| 174 | | minimize_sort algebra S = | |
| 19645 | 175 | filter (fn c => not (exists (fn c' => class_less algebra (c', c)) S)) S | 
| 19529 | 176 | |> sort_distinct string_ord; | 
| 2990 | 177 | |
| 24732 | 178 | fun complete_sort algebra = | 
| 179 | Graph.all_succs (classes_of algebra) o minimize_sort algebra; | |
| 180 | ||
| 2990 | 181 | |
| 2956 | 182 | |
| 19529 | 183 | (** build algebras **) | 
| 19514 | 184 | |
| 185 | (* classes *) | |
| 186 | ||
| 23655 
d2d1138e0ddc
replaced exception TableFun/GraphFun.DUPS by TableFun/GraphFun.DUP;
 wenzelm parents: 
23585diff
changeset | 187 | fun err_dup_class c = error ("Duplicate declaration of class: " ^ quote c);
 | 
| 19514 | 188 | |
| 61264 | 189 | fun err_cyclic_classes context css = | 
| 19514 | 190 | error (cat_lines (map (fn cs => | 
| 61264 | 191 | "Cycle in class relation: " ^ Syntax.string_of_classrel (Syntax.init_pretty context) cs) css)); | 
| 19514 | 192 | |
| 61264 | 193 | fun add_class context (c, cs) = map_classes (fn classes => | 
| 19514 | 194 | let | 
| 20573 | 195 | val classes' = classes |> Graph.new_node (c, serial ()) | 
| 23655 
d2d1138e0ddc
replaced exception TableFun/GraphFun.DUPS by TableFun/GraphFun.DUP;
 wenzelm parents: 
23585diff
changeset | 196 | handle Graph.DUP dup => err_dup_class dup; | 
| 19514 | 197 | val classes'' = classes' |> fold Graph.add_edge_trans_acyclic (map (pair c) cs) | 
| 61264 | 198 | handle Graph.CYCLES css => err_cyclic_classes context css; | 
| 19645 | 199 | in classes'' end); | 
| 19514 | 200 | |
| 201 | ||
| 202 | (* arities *) | |
| 203 | ||
| 204 | local | |
| 205 | ||
| 206 | fun for_classes _ NONE = "" | |
| 42387 | 207 | | for_classes ctxt (SOME (c1, c2)) = " for classes " ^ Syntax.string_of_classrel ctxt [c1, c2]; | 
| 19514 | 208 | |
| 61264 | 209 | fun err_conflict context t cc (c, Ss) (c', Ss') = | 
| 210 | let val ctxt = Syntax.init_pretty context in | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 211 |     error ("Conflict of type arities" ^ for_classes ctxt cc ^ ":\n  " ^
 | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 212 | Syntax.string_of_arity ctxt (t, Ss, [c]) ^ " and\n " ^ | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 213 | Syntax.string_of_arity ctxt (t, Ss', [c'])) | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 214 | end; | 
| 19514 | 215 | |
| 61264 | 216 | fun coregular context algebra t (c, Ss) ars = | 
| 19514 | 217 | let | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 218 | fun conflict (c', Ss') = | 
| 19645 | 219 | if class_le algebra (c, c') andalso not (sorts_le algebra (Ss, Ss')) then | 
| 19514 | 220 | SOME ((c, c'), (c', Ss')) | 
| 19645 | 221 | else if class_le algebra (c', c) andalso not (sorts_le algebra (Ss', Ss)) then | 
| 19514 | 222 | SOME ((c', c), (c', Ss')) | 
| 223 | else NONE; | |
| 224 | in | |
| 225 | (case get_first conflict ars of | |
| 61264 | 226 | SOME ((c1, c2), (c', Ss')) => err_conflict context t (SOME (c1, c2)) (c, Ss) (c', Ss') | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 227 | | NONE => (c, Ss) :: ars) | 
| 19514 | 228 | end; | 
| 229 | ||
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 230 | fun complete algebra (c, Ss) = map (rpair Ss) (c :: super_classes algebra c); | 
| 19645 | 231 | |
| 61264 | 232 | fun insert context algebra t (c, Ss) ars = | 
| 19514 | 233 | (case AList.lookup (op =) ars c of | 
| 61264 | 234 | NONE => coregular context algebra t (c, Ss) ars | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 235 | | SOME Ss' => | 
| 19645 | 236 | if sorts_le algebra (Ss, Ss') then ars | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 237 | else if sorts_le algebra (Ss', Ss) | 
| 61264 | 238 | then coregular context algebra t (c, Ss) (remove (op =) (c, Ss') ars) | 
| 239 | else err_conflict context t NONE (c, Ss) (c, Ss')); | |
| 19514 | 240 | |
| 35975 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 241 | in | 
| 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 242 | |
| 61264 | 243 | fun insert_ars context algebra t = fold_rev (insert context algebra t); | 
| 35975 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 244 | |
| 61264 | 245 | fun insert_complete_ars context algebra (t, ars) arities = | 
| 19645 | 246 | let val ars' = | 
| 247 | Symtab.lookup_list arities t | |
| 61264 | 248 | |> fold_rev (insert_ars context algebra t) (map (complete algebra) ars); | 
| 19645 | 249 | in Symtab.update (t, ars') arities end; | 
| 19514 | 250 | |
| 61264 | 251 | fun add_arities context arg algebra = | 
| 252 | algebra |> map_arities (insert_complete_ars context algebra arg); | |
| 19514 | 253 | |
| 61264 | 254 | fun add_arities_table context algebra = | 
| 255 | Symtab.fold (fn (t, ars) => insert_complete_ars context algebra (t, ars)); | |
| 19514 | 256 | |
| 257 | end; | |
| 258 | ||
| 19529 | 259 | |
| 19645 | 260 | (* classrel *) | 
| 261 | ||
| 74232 | 262 | fun rebuild_arities context algebra = algebra | 
| 263 | |> map_arities (Symtab.build o add_arities_table context algebra); | |
| 19645 | 264 | |
| 61264 | 265 | fun add_classrel context rel = rebuild_arities context o map_classes (fn classes => | 
| 19645 | 266 | classes |> Graph.add_edge_trans_acyclic rel | 
| 61264 | 267 | handle Graph.CYCLES css => err_cyclic_classes context css); | 
| 19645 | 268 | |
| 269 | ||
| 270 | (* empty and merge *) | |
| 271 | ||
| 272 | val empty_algebra = make_algebra (Graph.empty, Symtab.empty); | |
| 273 | ||
| 61264 | 274 | fun merge_algebra context | 
| 19645 | 275 |    (Algebra {classes = classes1, arities = arities1},
 | 
| 276 |     Algebra {classes = classes2, arities = arities2}) =
 | |
| 277 | let | |
| 278 | val classes' = Graph.merge_trans_acyclic (op =) (classes1, classes2) | |
| 23655 
d2d1138e0ddc
replaced exception TableFun/GraphFun.DUPS by TableFun/GraphFun.DUP;
 wenzelm parents: 
23585diff
changeset | 279 | handle Graph.DUP c => err_dup_class c | 
| 61264 | 280 | | Graph.CYCLES css => err_cyclic_classes context css; | 
| 19645 | 281 | val algebra0 = make_algebra (classes', Symtab.empty); | 
| 35975 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 282 | val arities' = | 
| 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 283 | (case (pointer_eq (classes1, classes2), pointer_eq (arities1, arities2)) of | 
| 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 284 | (true, true) => arities1 | 
| 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 285 | | (true, false) => (*no completion*) | 
| 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 286 | (arities1, arities2) |> Symtab.join (fn t => fn (ars1, ars2) => | 
| 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 287 | if pointer_eq (ars1, ars2) then raise Symtab.SAME | 
| 61264 | 288 | else insert_ars context algebra0 t ars2 ars1) | 
| 35975 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 289 | | (false, true) => (*unary completion*) | 
| 74232 | 290 | Symtab.build (add_arities_table context algebra0 arities1) | 
| 35975 
cef3c78ace0a
more efficient merge_algebra for important special cases -- tricky due to required completion if class algebra changes;
 wenzelm parents: 
35961diff
changeset | 291 | | (false, false) => (*binary completion*) | 
| 74232 | 292 | Symtab.build | 
| 293 | (add_arities_table context algebra0 arities1 #> | |
| 294 | add_arities_table context algebra0 arities2)); | |
| 19645 | 295 | in make_algebra (classes', arities') end; | 
| 296 | ||
| 21933 
819ef284720b
classes: more direct way to achieve topological sorting;
 wenzelm parents: 
21926diff
changeset | 297 | |
| 68295 | 298 | (* destruct *) | 
| 299 | ||
| 300 | fun dest_algebra parents (Algebra {classes, arities}) =
 | |
| 301 | let | |
| 302 | fun new_classrel rel = not (exists (fn algebra => class_less algebra rel) parents); | |
| 303 | val classrel = | |
| 74234 | 304 | build (classes |> Graph.fold (fn (c, (_, (_, ds))) => | 
| 68295 | 305 | (case filter (fn d => new_classrel (c, d)) (Graph.Keys.dest ds) of | 
| 306 | [] => I | |
| 74234 | 307 | | ds' => cons (c, sort_strings ds')))) | 
| 68295 | 308 | |> sort_by #1; | 
| 309 | ||
| 310 | fun is_arity t ar algebra = member (op =) (Symtab.lookup_list (arities_of algebra) t) ar; | |
| 311 | fun add_arity t (c, Ss) = not (exists (is_arity t (c, Ss)) parents) ? cons (t, Ss, c); | |
| 312 | val arities = | |
| 74234 | 313 | build (arities |> Symtab.fold (fn (t, ars) => fold_rev (add_arity t) (sort_by #1 ars))) | 
| 68295 | 314 | |> sort_by #1; | 
| 315 |   in {classrel = classrel, arities = arities} end;
 | |
| 316 | ||
| 317 | ||
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 318 | (* algebra projections *) (* FIXME potentially violates abstract type integrity *) | 
| 28922 | 319 | |
| 61264 | 320 | fun subalgebra context P sargs (algebra as Algebra {classes, arities}) =
 | 
| 19952 | 321 | let | 
| 24732 | 322 | val restrict_sort = minimize_sort algebra o filter P o Graph.all_succs classes; | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 323 | fun restrict_arity t (c, Ss) = | 
| 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 324 | if P c then | 
| 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 325 | (case sargs (c, t) of | 
| 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 326 | SOME sorts => | 
| 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 327 | SOME (c, Ss |> map2 (curry (inter_sort algebra)) sorts |> map restrict_sort) | 
| 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 328 | | NONE => NONE) | 
| 22181 
39104d1c43ca
added explicit query function for arities to subalgebra projection
 haftmann parents: 
21933diff
changeset | 329 | else NONE; | 
| 46614 
165886a4fe64
clarified Graph.restrict (formerly Graph.subgraph) based on public graph operations;
 wenzelm parents: 
45595diff
changeset | 330 | val classes' = classes |> Graph.restrict P; | 
| 39020 | 331 | val arities' = arities |> Symtab.map (map_filter o restrict_arity); | 
| 61264 | 332 | in (restrict_sort, rebuild_arities context (make_algebra (classes', arities'))) end; | 
| 20465 | 333 | |
| 19645 | 334 | |
| 19529 | 335 | |
| 336 | (** sorts of types **) | |
| 337 | ||
| 35961 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 338 | (* errors -- performance tuning via delayed message composition *) | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 339 | |
| 26639 | 340 | datatype class_error = | 
| 36105 | 341 | No_Classrel of class * class | | 
| 342 | No_Arity of string * class | | |
| 343 | No_Subsort of sort * sort; | |
| 19529 | 344 | |
| 61264 | 345 | fun class_error context = | 
| 346 | let val ctxt = Syntax.init_pretty context in | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 347 | fn No_Classrel (c1, c2) => "No class relation " ^ Syntax.string_of_classrel ctxt [c1, c2] | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 348 | | No_Arity (a, c) => "No type arity " ^ Syntax.string_of_arity ctxt (a, [], [c]) | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 349 | | No_Subsort (S1, S2) => | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 350 | "Cannot derive subsort relation " ^ | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 351 | Syntax.string_of_sort ctxt S1 ^ " < " ^ Syntax.string_of_sort ctxt S2 | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
46614diff
changeset | 352 | end; | 
| 19529 | 353 | |
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 354 | exception CLASS_ERROR of class_error; | 
| 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 355 | |
| 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 356 | |
| 48272 | 357 | (* instances *) | 
| 358 | ||
| 359 | fun has_instance algebra a = | |
| 360 | forall (AList.defined (op =) (Symtab.lookup_list (arities_of algebra) a)); | |
| 19529 | 361 | |
| 19645 | 362 | fun mg_domain algebra a S = | 
| 19529 | 363 | let | 
| 48272 | 364 | val ars = Symtab.lookup_list (arities_of algebra) a; | 
| 19529 | 365 | fun dom c = | 
| 48272 | 366 | (case AList.lookup (op =) ars c of | 
| 36105 | 367 | NONE => raise CLASS_ERROR (No_Arity (a, c)) | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 368 | | SOME Ss => Ss); | 
| 19645 | 369 | fun dom_inter c Ss = ListPair.map (inter_sort algebra) (dom c, Ss); | 
| 19529 | 370 | in | 
| 371 | (case S of | |
| 372 | [] => raise Fail "Unknown domain of empty intersection" | |
| 373 | | c :: cs => fold dom_inter cs (dom c)) | |
| 374 | end; | |
| 375 | ||
| 376 | ||
| 26639 | 377 | (* meet_sort *) | 
| 378 | ||
| 379 | fun meet_sort algebra = | |
| 380 | let | |
| 381 | fun inters S S' = inter_sort algebra (S, S'); | |
| 382 | fun meet _ [] = I | |
| 383 | | meet (TFree (_, S)) S' = | |
| 384 | if sort_le algebra (S, S') then I | |
| 36105 | 385 | else raise CLASS_ERROR (No_Subsort (S, S')) | 
| 26639 | 386 | | meet (TVar (v, S)) S' = | 
| 387 | if sort_le algebra (S, S') then I | |
| 388 | else Vartab.map_default (v, S) (inters S') | |
| 389 | | meet (Type (a, Ts)) S = fold2 meet Ts (mg_domain algebra a S); | |
| 390 | in uncurry meet end; | |
| 391 | ||
| 28665 | 392 | fun meet_sort_typ algebra (T, S) = | 
| 74232 | 393 | let val tab = Vartab.build (meet_sort algebra (T, S)); | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 394 | in Term.map_type_tvar (fn (v, _) => TVar (v, (the o Vartab.lookup tab) v)) end; | 
| 28665 | 395 | |
| 26639 | 396 | |
| 19529 | 397 | (* of_sort *) | 
| 398 | ||
| 19645 | 399 | fun of_sort algebra = | 
| 19529 | 400 | let | 
| 401 | fun ofS (_, []) = true | |
| 19645 | 402 | | ofS (TFree (_, S), S') = sort_le algebra (S, S') | 
| 403 | | ofS (TVar (_, S), S') = sort_le algebra (S, S') | |
| 19529 | 404 | | ofS (Type (a, Ts), S) = | 
| 19645 | 405 | let val Ss = mg_domain algebra a S in | 
| 19529 | 406 | ListPair.all ofS (Ts, Ss) | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 407 | end handle CLASS_ERROR _ => false; | 
| 19529 | 408 | in ofS end; | 
| 409 | ||
| 410 | ||
| 27498 | 411 | (* animating derivations *) | 
| 412 | ||
| 32791 | 413 | fun of_sort_derivation algebra {class_relation, type_constructor, type_variable} =
 | 
| 19529 | 414 | let | 
| 27555 | 415 | val arities = arities_of algebra; | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 416 | |
| 36104 
fecb587a1d0e
of_sort_derivation: weaken bypasses derivation for identical sort -- accomodate proof terms by krauss/schropp, for example;
 wenzelm parents: 
36103diff
changeset | 417 | fun weaken T D1 S2 = | 
| 
fecb587a1d0e
of_sort_derivation: weaken bypasses derivation for identical sort -- accomodate proof terms by krauss/schropp, for example;
 wenzelm parents: 
36103diff
changeset | 418 | let val S1 = map snd D1 in | 
| 
fecb587a1d0e
of_sort_derivation: weaken bypasses derivation for identical sort -- accomodate proof terms by krauss/schropp, for example;
 wenzelm parents: 
36103diff
changeset | 419 | if S1 = S2 then map fst D1 | 
| 
fecb587a1d0e
of_sort_derivation: weaken bypasses derivation for identical sort -- accomodate proof terms by krauss/schropp, for example;
 wenzelm parents: 
36103diff
changeset | 420 | else | 
| 
fecb587a1d0e
of_sort_derivation: weaken bypasses derivation for identical sort -- accomodate proof terms by krauss/schropp, for example;
 wenzelm parents: 
36103diff
changeset | 421 | S2 |> map (fn c2 => | 
| 62538 
85ebb645b1a3
provide explicit hint concering uniqueness of derivation
 haftmann parents: 
61264diff
changeset | 422 | (case D1 |> filter (fn (_, c1) => class_le algebra (c1, c2)) of | 
| 
85ebb645b1a3
provide explicit hint concering uniqueness of derivation
 haftmann parents: 
61264diff
changeset | 423 | [d1] => class_relation T true d1 c2 | 
| 
85ebb645b1a3
provide explicit hint concering uniqueness of derivation
 haftmann parents: 
61264diff
changeset | 424 | | (d1 :: _ :: _) => class_relation T false d1 c2 | 
| 
85ebb645b1a3
provide explicit hint concering uniqueness of derivation
 haftmann parents: 
61264diff
changeset | 425 | | [] => raise CLASS_ERROR (No_Subsort (S1, S2)))) | 
| 36104 
fecb587a1d0e
of_sort_derivation: weaken bypasses derivation for identical sort -- accomodate proof terms by krauss/schropp, for example;
 wenzelm parents: 
36103diff
changeset | 426 | end; | 
| 19529 | 427 | |
| 36103 | 428 | fun derive (_, []) = [] | 
| 44338 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
43792diff
changeset | 429 | | derive (Type (a, Us), S) = | 
| 19529 | 430 | let | 
| 19645 | 431 | val Ss = mg_domain algebra a S; | 
| 36103 | 432 | val dom = map2 (fn U => fn S => derive (U, S) ~~ S) Us Ss; | 
| 19529 | 433 | in | 
| 434 | S |> map (fn c => | |
| 435 | let | |
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 436 | val Ss' = the (AList.lookup (op =) (Symtab.lookup_list arities a) c); | 
| 36102 
a51d1d154c71
of_sort_derivation: pass-through full type information -- following the version by krauss/schropp;
 wenzelm parents: 
35975diff
changeset | 437 | val dom' = map (fn ((U, d), S') => weaken U d S' ~~ S') ((Us ~~ dom) ~~ Ss'); | 
| 37248 
8e8e5f9d1441
arities: no need to maintain original codomain (cf. f795c1164708) -- completion happens in axclass.ML;
 wenzelm parents: 
36429diff
changeset | 438 | in type_constructor (a, Us) dom' c end) | 
| 19529 | 439 | end | 
| 36103 | 440 | | derive (T, S) = weaken T (type_variable T) S; | 
| 441 | in derive end; | |
| 19529 | 442 | |
| 35961 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 443 | fun classrel_derivation algebra class_relation = | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 444 | let | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 445 | fun path (x, c1 :: c2 :: cs) = path (class_relation (x, c1) c2, c2 :: cs) | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 446 | | path (x, _) = x; | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 447 | in | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 448 | fn (x, c1) => fn c2 => | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 449 | (case Graph.irreducible_paths (classes_of algebra) (c1, c2) of | 
| 36105 | 450 | [] => raise CLASS_ERROR (No_Classrel (c1, c2)) | 
| 35961 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 451 | | cs :: _ => path (x, cs)) | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 452 | end; | 
| 
00e48e1d9afd
Sorts.of_sort_derivation: do not use slow Graph.irreducible_paths here, which not always needed  (SUBTLE CHANGE IN SEMANTICS);
 wenzelm parents: 
35408diff
changeset | 453 | |
| 19529 | 454 | |
| 455 | (* witness_sorts *) | |
| 456 | ||
| 71526 | 457 | fun witness_sorts algebra ground_types hyps sorts = | 
| 19529 | 458 | let | 
| 19645 | 459 | fun le S1 S2 = sort_le algebra (S1, S2); | 
| 31946 
99ac0321cd47
witness_sorts: proper type witnesses for hyps, not invented "'hyp" variables;
 wenzelm parents: 
30242diff
changeset | 460 | fun get S2 (T, S1) = if le S1 S2 then SOME (T, S2) else NONE; | 
| 19645 | 461 | fun mg_dom t S = SOME (mg_domain algebra t S) handle CLASS_ERROR _ => NONE; | 
| 19529 | 462 | |
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 463 | fun witn_sort _ [] solved_failed = (SOME (propT, []), solved_failed) | 
| 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 464 | | witn_sort path S (solved, failed) = | 
| 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 465 | if exists (le S) failed then (NONE, (solved, failed)) | 
| 19529 | 466 | else | 
| 31946 
99ac0321cd47
witness_sorts: proper type witnesses for hyps, not invented "'hyp" variables;
 wenzelm parents: 
30242diff
changeset | 467 | (case get_first (get S) solved of | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 468 | SOME w => (SOME w, (solved, failed)) | 
| 19529 | 469 | | NONE => | 
| 31946 
99ac0321cd47
witness_sorts: proper type witnesses for hyps, not invented "'hyp" variables;
 wenzelm parents: 
30242diff
changeset | 470 | (case get_first (get S) hyps of | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 471 | SOME w => (SOME w, (w :: solved, failed)) | 
| 71526 | 472 | | NONE => witn_types path ground_types S (solved, failed))) | 
| 19529 | 473 | |
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 474 | and witn_sorts path x = fold_map (witn_sort path) x | 
| 19529 | 475 | |
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 476 | and witn_types _ [] S (solved, failed) = (NONE, (solved, S :: failed)) | 
| 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 477 | | witn_types path (t :: ts) S solved_failed = | 
| 19529 | 478 | (case mg_dom t S of | 
| 479 | SOME SS => | |
| 480 | (*do not descend into stronger args (achieving termination)*) | |
| 481 | if exists (fn D => le D S orelse exists (le D) path) SS then | |
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 482 | witn_types path ts S solved_failed | 
| 19529 | 483 | else | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 484 | let val (ws, (solved', failed')) = witn_sorts (S :: path) SS solved_failed in | 
| 19529 | 485 | if forall is_some ws then | 
| 486 | let val w = (Type (t, map (#1 o the) ws), S) | |
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 487 | in (SOME w, (w :: solved', failed')) end | 
| 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 488 | else witn_types path ts S (solved', failed') | 
| 19529 | 489 | end | 
| 19578 
f93b7637a5e6
added class_error and exception CLASS_ERROR (supercedes DOMAIN);
 wenzelm parents: 
19531diff
changeset | 490 | | NONE => witn_types path ts S solved_failed); | 
| 19529 | 491 | |
| 19584 | 492 | in map_filter I (#1 (witn_sorts [] sorts ([], []))) end; | 
| 19529 | 493 | |
| 19514 | 494 | end; |