# HG changeset patch # User wenzelm # Date 1147777291 -7200 # Node ID 702843484da687c35a32f400af293c13dd7762ef # Parent 043921b0e587ce80d3045c7f196234108b0844c4 tuned; diff -r 043921b0e587 -r 702843484da6 src/Pure/Tools/class_package.ML --- a/src/Pure/Tools/class_package.ML Tue May 16 13:01:30 2006 +0200 +++ b/src/Pure/Tools/class_package.ML Tue May 16 13:01:31 2006 +0200 @@ -70,15 +70,6 @@ }; fun rep_classdata (ClassData c) = c; -fun eq_classdata (ClassData { - name_locale = name_locale1, name_axclass = name_axclass1, intro = intro1, - var = var1, consts = consts1}, ClassData { - name_locale = name_locale2, name_axclass = name_axclass2, intro = intro2, - var = var2, consts = consts2}) = - name_locale1 = name_locale2 andalso name_axclass1 = name_axclass2 - andalso eq_opt eq_thm (intro1, intro2) andalso var1 = var2 - andalso eq_list (eq_pair (op =) (eq_pair (op =) (Type.eq_type Vartab.empty))) - (consts1, consts2); structure ClassData = TheoryDataFun ( struct @@ -91,7 +82,7 @@ val copy = I; val extend = I; fun merge _ (((g1, c1), f1) : T, ((g2, c2), f2)) = - ((Graph.merge eq_classdata (g1, g2), Symtab.join (fn _ => AList.merge (op =) (op =)) (c1, c2)), + ((Graph.merge (K true) (g1, g2), Symtab.join (fn _ => AList.merge (op =) (op =)) (c1, c2)), Symtab.merge (op =) (f1, f2)); fun print thy ((gr, _), _) = let