merged

--- a/src/HOL/Library/Executable_Set.thy	Sat Sep 04 08:32:19 2010 -0700
+++ b/src/HOL/Library/Executable_Set.thy	Sat Sep 04 21:12:42 2010 +0200
@@ -9,6 +9,12 @@
 imports More_Set
 begin
 
+text {*
+  This is just an ad-hoc hack which will rarely give you what you want.
+  For the moment, whenever you need executable sets, consider using
+  type @{text fset} from theory @{text Fset}.
+*}
+
 declare mem_def [code del]
 declare Collect_def [code del]
 declare insert_code [code del]

--- a/src/Tools/Code/code_haskell.ML	Sat Sep 04 08:32:19 2010 -0700
+++ b/src/Tools/Code/code_haskell.ML	Sat Sep 04 21:12:42 2010 +0200
@@ -331,10 +331,8 @@
       handle Option => error ("Unknown statement name: " ^ labelled_name name);
   in (deresolver, hs_program) end;
 
-fun serialize_haskell module_prefix string_classes { labelled_name,
-    reserved_syms, includes, module_alias,
-    class_syntax, tyco_syntax, const_syntax, program,
-    names } =
+fun serialize_haskell module_prefix string_classes { labelled_name, reserved_syms,
+    includes, module_alias, class_syntax, tyco_syntax, const_syntax, program } =
   let
     val reserved = fold (insert (op =) o fst) includes reserved_syms;
     val (deresolver, hs_program) = haskell_program_of_program labelled_name

--- a/src/Tools/Code/code_ml.ML	Sat Sep 04 08:32:19 2010 -0700
+++ b/src/Tools/Code/code_ml.ML	Sat Sep 04 21:12:42 2010 +0200
@@ -785,9 +785,9 @@
       cyclic_modules = false, empty_data = (), memorize_data = K I, modify_stmts = modify_stmts } program
   end;
 
-fun serialize_ml target print_module print_stmt with_signatures { labelled_name,
-  reserved_syms, includes, module_alias, class_syntax, tyco_syntax,
-  const_syntax, program, names } =
+fun serialize_ml target print_module print_stmt with_signatures
+    { labelled_name, reserved_syms, includes, module_alias,
+      class_syntax, tyco_syntax, const_syntax, program } =
   let
     val is_cons = Code_Thingol.is_cons program;
     val { deresolver, hierarchical_program = ml_program } =

--- a/src/Tools/Code/code_scala.ML	Sat Sep 04 08:32:19 2010 -0700
+++ b/src/Tools/Code/code_scala.ML	Sat Sep 04 21:12:42 2010 +0200
@@ -329,8 +329,7 @@
   end;
 
 fun serialize_scala { labelled_name, reserved_syms, includes,
-    module_alias, class_syntax, tyco_syntax, const_syntax, program,
-    names } =
+    module_alias, class_syntax, tyco_syntax, const_syntax, program } =
   let
 
     (* build program *)

--- a/src/Tools/Code/code_target.ML	Sat Sep 04 08:32:19 2010 -0700
+++ b/src/Tools/Code/code_target.ML	Sat Sep 04 21:12:42 2010 +0200
@@ -105,7 +105,8 @@
        Symtab.join (K snd) (const1, const2))
   );
 
-type serializer = Token.T list (*arguments*) -> {
+type serializer = Token.T list
+  -> {
     labelled_name: string -> string,
     reserved_syms: string list,
     includes: (string * Pretty.T) list,
@@ -113,8 +114,7 @@
     class_syntax: string -> string option,
     tyco_syntax: string -> Code_Printer.tyco_syntax option,
     const_syntax: string -> Code_Printer.activated_const_syntax option,
-    program: Code_Thingol.program,
-    names: string list }
+    program: Code_Thingol.program }
   -> serialization;
 
 datatype description = Fundamental of { serializer: serializer,
@@ -321,8 +321,7 @@
       class_syntax = Symtab.lookup class_syntax,
       tyco_syntax = Symtab.lookup tyco_syntax,
       const_syntax = Symtab.lookup const_syntax,
-      program = program,
-      names = names }
+      program = program }
   end;
 
 fun mount_serializer thy target some_width module_name args naming proto_program names =