merged

--- a/src/HOL/Tools/BNF/bnf_comp.ML	Tue Apr 11 09:13:28 2017 +0200
+++ b/src/HOL/Tools/BNF/bnf_comp.ML	Tue Apr 11 10:29:25 2017 +0200
@@ -18,7 +18,10 @@
   val DEADID_bnf: BNF_Def.bnf
 
   type comp_cache
-  type unfold_set
+  type unfold_set =
+    {map_unfolds: thm list,
+     set_unfoldss: thm list list,
+     rel_unfolds: thm list}
 
   val empty_comp_cache: comp_cache
   val empty_unfolds: unfold_set