1.1 --- a/src/Tools/Code/code_scala.ML	Thu Aug 26 13:50:58 2010 +0200
     1.2 +++ b/src/Tools/Code/code_scala.ML	Thu Aug 26 13:54:33 2010 +0200
     1.3 @@ -25,7 +25,7 @@
     1.4  (** Scala serializer **)
     1.5  
     1.6  fun print_scala_stmt labelled_name syntax_tyco syntax_const reserved
     1.7 -    args_num is_singleton_constr deresolve =
     1.8 +    args_num is_singleton_constr (deresolve, deresolve_full) =
     1.9    let
    1.10      val deresolve_base = Long_Name.base_name o deresolve;
    1.11      fun lookup_tyvar tyvars = lookup_var tyvars o first_upper;
    1.12 @@ -195,7 +195,7 @@
    1.13                (map print_clause eqs)
    1.14            end;
    1.15      val print_method = str o Library.enclose "`" "`" o space_implode "+"
    1.16 -      o fst o split_last o Long_Name.explode;
    1.17 +      o Long_Name.explode o deresolve_full;
    1.18      fun print_stmt (name, Code_Thingol.Fun (_, (((vs, ty), raw_eqs), _))) =
    1.19            print_def name (vs, ty) (filter (snd o snd) raw_eqs)
    1.20        | print_stmt (name, Code_Thingol.Datatype (_, (vs, cos))) =
    1.21 @@ -430,7 +430,8 @@
    1.22       of Code_Thingol.Datatypecons (_, tyco) => null (lookup_constr tyco c)
    1.23        | _ => false;
    1.24      val print_stmt = print_scala_stmt labelled_name syntax_tyco syntax_const
    1.25 -      (make_vars reserved) args_num is_singleton_constr deresolve;
    1.26 +      (make_vars reserved) args_num is_singleton_constr
    1.27 +      (deresolve, Long_Name.implode o fst o split_last o Long_Name.explode (*FIXME full*));
    1.28  
    1.29      (* print nodes *)
    1.30      fun print_implicits [] = NONE