|
|
|
@ -120,9 +120,7 @@ let translate_constructor_name_2 q q_ty =
|
|
|
|
|
{ qual = QualModule classe; name = String.uppercase q.name }
|
|
|
|
|
|
|
|
|
|
let translate_constructor_name q =
|
|
|
|
|
Format.eprintf "lala %a@." Global_printer.print_qualname q;
|
|
|
|
|
let x = Modules.find_constrs q in
|
|
|
|
|
Format.eprintf "ok@.";
|
|
|
|
|
match Modules.unalias_type (Types.Tid x) with
|
|
|
|
|
| Types.Tid q_ty when q_ty = Initial.pbool -> q |> shortname |> local_qn
|
|
|
|
|
| Types.Tid q_ty -> translate_constructor_name_2 q q_ty
|
|
|
|
@ -470,7 +468,8 @@ let class_def_list classes cd_l =
|
|
|
|
|
let size_l = List.rev (List.map (static_exp param_env) size_l) in
|
|
|
|
|
let t = Idents.Env.find od.o_ident obj_env in
|
|
|
|
|
let assgn_elem i_l =
|
|
|
|
|
[ Java.Aassgn (Parray_elem (Pthis od.o_ident, List.map mk_var i_l), Enew (t, params)) ]
|
|
|
|
|
[ Java.Aassgn (Parray_elem (Pthis od.o_ident, List.map mk_var i_l),
|
|
|
|
|
Enew (t, params)) ]
|
|
|
|
|
in
|
|
|
|
|
(Java.Aassgn (Pthis od.o_ident, Enew_array (Tarray (t,size_l), [])))
|
|
|
|
|
:: (fresh_nfor size_l assgn_elem)
|
|
|
|
@ -559,7 +558,8 @@ let type_dec_list classes td_l =
|
|
|
|
|
compare (f1.Signature.f_name.name) (f2.Signature.f_name.name))
|
|
|
|
|
f_l in
|
|
|
|
|
let fields = List.map mk_field_jfield f_l in
|
|
|
|
|
let cons_params = List.map (fun f -> Java.mk_var_dec f.f_ident false f.Java.f_type) fields in
|
|
|
|
|
let cons_params =
|
|
|
|
|
List.map (fun f -> Java.mk_var_dec f.f_ident false f.Java.f_type) fields in
|
|
|
|
|
let cons_body =
|
|
|
|
|
List.map
|
|
|
|
|
(fun f -> Java.Aassgn ((Pthis f.f_ident),(Evar f.f_ident)))
|
|
|
|
|