1.1 --- a/src/Tools/Code/code_haskell.ML	Sat Sep 04 21:10:39 2010 +0200
     1.2 +++ b/src/Tools/Code/code_haskell.ML	Sat Sep 04 21:10:48 2010 +0200
     1.3 @@ -331,10 +331,8 @@
     1.4        handle Option => error ("Unknown statement name: " ^ labelled_name name);
     1.5    in (deresolver, hs_program) end;
     1.6  
     1.7 -fun serialize_haskell module_prefix string_classes { labelled_name,
     1.8 -    reserved_syms, includes, module_alias,
     1.9 -    class_syntax, tyco_syntax, const_syntax, program,
    1.10 -    names } =
    1.11 +fun serialize_haskell module_prefix string_classes { labelled_name, reserved_syms,
    1.12 +    includes, module_alias, class_syntax, tyco_syntax, const_syntax, program } =
    1.13    let
    1.14      val reserved = fold (insert (op =) o fst) includes reserved_syms;
    1.15      val (deresolver, hs_program) = haskell_program_of_program labelled_name

     2.1 --- a/src/Tools/Code/code_ml.ML	Sat Sep 04 21:10:39 2010 +0200
     2.2 +++ b/src/Tools/Code/code_ml.ML	Sat Sep 04 21:10:48 2010 +0200
     2.3 @@ -785,9 +785,9 @@
     2.4        cyclic_modules = false, empty_data = (), memorize_data = K I, modify_stmts = modify_stmts } program
     2.5    end;
     2.6  
     2.7 -fun serialize_ml target print_module print_stmt with_signatures { labelled_name,
     2.8 -  reserved_syms, includes, module_alias, class_syntax, tyco_syntax,
     2.9 -  const_syntax, program, names } =
    2.10 +fun serialize_ml target print_module print_stmt with_signatures
    2.11 +    { labelled_name, reserved_syms, includes, module_alias,
    2.12 +      class_syntax, tyco_syntax, const_syntax, program } =
    2.13    let
    2.14      val is_cons = Code_Thingol.is_cons program;
    2.15      val { deresolver, hierarchical_program = ml_program } =

     3.1 --- a/src/Tools/Code/code_scala.ML	Sat Sep 04 21:10:39 2010 +0200
     3.2 +++ b/src/Tools/Code/code_scala.ML	Sat Sep 04 21:10:48 2010 +0200
     3.3 @@ -329,8 +329,7 @@
     3.4    end;
     3.5  
     3.6  fun serialize_scala { labelled_name, reserved_syms, includes,
     3.7 -    module_alias, class_syntax, tyco_syntax, const_syntax, program,
     3.8 -    names } =
     3.9 +    module_alias, class_syntax, tyco_syntax, const_syntax, program } =
    3.10    let
    3.11  
    3.12      (* build program *)

     4.1 --- a/src/Tools/Code/code_target.ML	Sat Sep 04 21:10:39 2010 +0200
     4.2 +++ b/src/Tools/Code/code_target.ML	Sat Sep 04 21:10:48 2010 +0200
     4.3 @@ -105,7 +105,8 @@
     4.4         Symtab.join (K snd) (const1, const2))
     4.5    );
     4.6  
     4.7 -type serializer = Token.T list (*arguments*) -> {
     4.8 +type serializer = Token.T list
     4.9 +  -> {
    4.10      labelled_name: string -> string,
    4.11      reserved_syms: string list,
    4.12      includes: (string * Pretty.T) list,
    4.13 @@ -113,8 +114,7 @@
    4.14      class_syntax: string -> string option,
    4.15      tyco_syntax: string -> Code_Printer.tyco_syntax option,
    4.16      const_syntax: string -> Code_Printer.activated_const_syntax option,
    4.17 -    program: Code_Thingol.program,
    4.18 -    names: string list }
    4.19 +    program: Code_Thingol.program }
    4.20    -> serialization;
    4.21  
    4.22  datatype description = Fundamental of { serializer: serializer,
    4.23 @@ -321,8 +321,7 @@
    4.24        class_syntax = Symtab.lookup class_syntax,
    4.25        tyco_syntax = Symtab.lookup tyco_syntax,
    4.26        const_syntax = Symtab.lookup const_syntax,
    4.27 -      program = program,
    4.28 -      names = names }
    4.29 +      program = program }
    4.30    end;
    4.31  
    4.32  fun mount_serializer thy target some_width module_name args naming proto_program names =