src/Pure/Tools/codegen_package.ML

 fun merge_abstypes ((typs1, consts1) : abstypes, (typs2, consts2) : abstypes) =
   (Symtab.merge (Type.eq_type Vartab.empty) (typs1, typs2),
     Consttab.merge CodegenConsts.eq_const (consts1, consts2));
 
 structure CodegenPackageData = TheoryDataFun
-(struct
-  val name = "Pure/codegen_package_setup";
+(
   type T = appgens * abstypes;
   val empty = (Symtab.empty, (Symtab.empty, Consttab.empty));
   val copy = I;
   val extend = I;
   fun merge _ ((appgens1, abstypes1), (appgens2, abstypes2)) =
     (merge_appgens (appgens1, appgens2), merge_abstypes (abstypes1, abstypes2));
-  fun print _ _ = ();
-end);
-
-structure Funcgr = CodegenFuncgrRetrieval (
+);
+
+structure Funcgr = CodegenFuncgrRetrieval
+(
   val name = "Pure/codegen_package_thms";
   fun rewrites thy = [];
 );
 
 fun code_depgr thy [] = Funcgr.make thy []

       end;
     val prgr = CodegenFuncgr.Constgraph.fold ((fn x => fn xs => xs @ [x]) o mk_entry) gr [];
   in Present.display_graph prgr end;
 
 structure Code = CodeDataFun
-(struct
+(
   val name = "Pure/codegen_package_code";
   type T = CodegenThingol.code;
   val empty = CodegenThingol.empty_code;
   fun merge _ = CodegenThingol.merge_code;
   fun purge _ NONE _ = CodegenThingol.empty_code

           val dels = (Graph.all_preds code
               o map (CodegenNames.const thy)
               o filter (member CodegenConsts.eq_const cs_exisiting)
             ) cs;
         in Graph.del_nodes dels code end;
-end);
-
-val _ = Context.add_setup (CodegenPackageData.init #> Funcgr.init #> Code.init);
+);
+
+val _ = Context.add_setup (Funcgr.init #> Code.init);
 
 
 (* preparing defining equations *)
 
 fun prep_eqs thy (thms as thm :: _) =