merged
authorhaftmann
Wed, 25 Feb 2009 07:42:20 +0100
changeset 30084 776de457f214
parent 30082 43c5b7bfc791 (current diff)
parent 30083 41a20af1fb77 (diff)
child 30085 3d6aab74a184
child 30086 2023fb9fbf31
merged
--- a/src/Tools/code/code_wellsorted.ML	Tue Feb 24 11:12:58 2009 -0800
+++ b/src/Tools/code/code_wellsorted.ML	Wed Feb 25 07:42:20 2009 +0100
@@ -166,9 +166,8 @@
   in
     vardeps_data
     |> (apsnd o apsnd) (insert (op =) inst)
-    |> fold_index (fn (k, classes) =>
-         apfst (Vargraph.new_node ((Inst (class, tyco), k), ([] ,[])))
-         ) classess
+    |> fold_index (fn (k, _) =>
+         apfst (Vargraph.new_node ((Inst (class, tyco), k), ([] ,[])))) classess
     |> fold (fn superclass => assert_inst thy arities eqngr (superclass, tyco)) superclasses
     |> fold (assert_fun thy arities eqngr) inst_params
     |> fold_index (fn (k, classes) =>
@@ -203,9 +202,10 @@
   in
     vardeps_data
     |> (apsnd o apfst) (Symtab.update_new (c, (lhs, eqns)))
+    |> fold_index (fn (k, _) =>
+         apfst (Vargraph.new_node ((Fun c, k), ([] ,[])))) lhs
     |> fold_index (fn (k, (_, sort)) =>
-         apfst (Vargraph.new_node ((Fun c, k), ([] ,[])))
-         #> add_classes thy arities eqngr (Fun c, k) (complete_proper_sort thy sort)) lhs
+         add_classes thy arities eqngr (Fun c, k) (complete_proper_sort thy sort)) lhs
     |> fold (assert_rhs thy arities eqngr) rhss'
   end;