Browse Source

[gencommon] minor code duplication removal

Dan Korostelev 9 years ago
parent
commit
bd8c639c89
1 changed files with 3 additions and 5 deletions
  1. 3 5
      src/generators/gencommon.ml

+ 3 - 5
src/generators/gencommon.ml

@@ -3938,8 +3938,6 @@ struct
 
 
 		let priority = priority
 		let priority = priority
 
 
-		let cast_field_name = "cast"
-
 		let rec has_type_params t =
 		let rec has_type_params t =
 			match follow t with
 			match follow t with
 				| TInst( { cl_kind = KTypeParameter _ }, _) -> true
 				| TInst( { cl_kind = KTypeParameter _ }, _) -> true
@@ -4202,6 +4200,8 @@ struct
 						get_fields gen cs (List.map (apply_params cl.cl_params params_cl) tls) (List.map (apply_params cl.cl_params params_cf) tls) (fields @ acc)
 						get_fields gen cs (List.map (apply_params cl.cl_params params_cl) tls) (List.map (apply_params cl.cl_params params_cf) tls) (fields @ acc)
 					| None -> (fields @ acc)
 					| None -> (fields @ acc)
 
 
+			let get_cast_name cl = String.concat "_" ((fst cl.cl_path) @ [snd cl.cl_path; "cast"]) (* explicitly define it *)
+
 			(* overrides all needed cast functions from super classes / interfaces to call the new cast function *)
 			(* overrides all needed cast functions from super classes / interfaces to call the new cast function *)
 			let create_stub_casts gen cl cast_cfield =
 			let create_stub_casts gen cl cast_cfield =
 				(* go through superclasses and interfaces *)
 				(* go through superclasses and interfaces *)
@@ -4211,7 +4211,7 @@ struct
 				let rec loop cls tls level reverse_params =
 				let rec loop cls tls level reverse_params =
 					if (level <> 0 || cls.cl_interface) && tls <> [] && is_hxgeneric (TClassDecl cls) then begin
 					if (level <> 0 || cls.cl_interface) && tls <> [] && is_hxgeneric (TClassDecl cls) then begin
 						let cparams = List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) cls.cl_params in
 						let cparams = List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) cls.cl_params in
-						let name = String.concat "_" ((fst cls.cl_path) @ [snd cls.cl_path; cast_field_name]) in
+						let name = get_cast_name cls in
 						if not (PMap.mem name cl.cl_fields) then begin
 						if not (PMap.mem name cl.cl_fields) then begin
 							let reverse_params = List.map (apply_params cls.cl_params (List.map snd cparams)) reverse_params in
 							let reverse_params = List.map (apply_params cls.cl_params (List.map snd cparams)) reverse_params in
 							let cfield = mk_class_field name (TFun([], t_dynamic)) false cl.cl_pos (Method MethNormal) cparams in
 							let cfield = mk_class_field name (TFun([], t_dynamic)) false cl.cl_pos (Method MethNormal) cparams in
@@ -4501,8 +4501,6 @@ struct
 				in
 				in
 				cfield, delay
 				cfield, delay
 
 
-			let get_cast_name cl = String.concat "_" ((fst cl.cl_path) @ [snd cl.cl_path; cast_field_name]) (* explicitly define it *)
-
 			let default_implementation gen ifaces base_generic =
 			let default_implementation gen ifaces base_generic =
 				let add_iface cl =
 				let add_iface cl =
 					gen.gadd_to_module (TClassDecl cl) (max_dep);
 					gen.gadd_to_module (TClassDecl cl) (max_dep);