[gencommon] make mk_temp and mk_internal_name simple functions, not tied to gencommon context

src/generators/gencommon.ml

@@ -403,13 +403,6 @@ type generator_ctx =
 
 	gtools : gen_tools;
 
-	(*
-		configurable function that receives a desired name and makes it "internal", doing the best
-		to ensure that it will not be called from outside.
-		To avoid name clashes between internal names, user must specify two strings: a "namespace" and the name itself
-	 *)
-	gmk_internal_name : string->string->string;
-
 	(*
 		module filters run before module filters and they should generate valid haxe syntax as a result.
 		Module filters shouldn't go through the expressions as it adds an unnecessary burden to the GC,
@@ -560,11 +553,17 @@ and gen_tools =
 	mutable r_create_empty : tclass->tparams->pos->texpr;
 }
 
+(**
+	Function that receives a desired name and makes it "internal", doing the best to ensure that it will not be called from outside.
+	To avoid name clashes between internal names, user must specify two strings: a "namespace" and the name itself
+*)
+let mk_internal_name ns name = Printf.sprintf "__%s_%s" ns name
+
 let mk_temp, reset_temps =
 	let tmp_count = ref 0 in
-	(fun gen name t ->
+	(fun name t ->
 		incr tmp_count;
-		let name = gen.gmk_internal_name "temp" (name ^ (string_of_int !tmp_count)) in
+		let name = mk_internal_name "temp" (name ^ (string_of_int !tmp_count)) in
 		alloc_var name t
 	),
 	(fun () -> tmp_count := 0)
@@ -620,7 +619,6 @@ let new_ctx con =
 
 			r_create_empty = (fun _ _ pos -> gen.gcon.error "r_create_empty implementation is not provided" pos; assert false);
 		};
-		gmk_internal_name = (fun ns s -> sprintf "__%s_%s" ns s);
 		gexpr_filters = new rule_map_dispatcher "gexpr_filters";
 		gmodule_filters = new rule_map_dispatcher "gmodule_filters";
 		gsyntax_filters = new rule_map_dispatcher "gsyntax_filters";
@@ -1033,7 +1031,7 @@ let ensure_local gen block name e =
 	match e.eexpr with
 		| TLocal _ -> e
 		| _ ->
-			let var = mk_temp gen name e.etype in
+			let var = mk_temp name e.etype in
 			block := { e with eexpr = TVar(var, Some e); etype = gen.gcon.basic.tvoid; } :: !block;
 			{ e with eexpr = TLocal var }
 

src/generators/gencommon/closuresToClass.ml

@@ -116,7 +116,7 @@ let mk_conversion_fun gen e =
 			v.v_capture <- true;
 			[],e
 		| _ ->
-			let tmp = mk_temp gen "delegate_conv" e.etype in
+			let tmp = mk_temp "delegate_conv" e.etype in
 			tmp.v_capture <- true;
 			[{ eexpr = TVar(tmp,Some e); etype = gen.gcon.basic.tvoid; epos = e.epos }], mk_local tmp e.epos
 	in
@@ -492,7 +492,7 @@ let configure gen ft =
 		let expr, clscapt =
 			match captured, tparams with
 			| [], [] ->
-				let cache_var = gen.gmk_internal_name "hx" "current" in
+				let cache_var = mk_internal_name "hx" "current" in
 				let cache_cf = mk_class_field cache_var (TInst(cls,[])) false func_expr.epos (Var({ v_read = AccNormal; v_write = AccNormal })) [] in
 				cls.cl_ordered_statics <- cache_cf :: cls.cl_ordered_statics;
 				cls.cl_statics <- PMap.add cache_var cache_cf cls.cl_statics;
@@ -604,8 +604,8 @@ struct
 		let func_args_i i =
 			let rec loop i (acc) =
 				if i = 0 then (acc) else begin
-					let vfloat = alloc_var (gen.gmk_internal_name "fn" ("float" ^ string_of_int i)) basic.tfloat in
-					let vdyn = alloc_var (gen.gmk_internal_name "fn" ("dyn" ^ string_of_int i)) t_dynamic in
+					let vfloat = alloc_var (mk_internal_name "fn" ("float" ^ string_of_int i)) basic.tfloat in
+					let vdyn = alloc_var (mk_internal_name "fn" ("dyn" ^ string_of_int i)) t_dynamic in
 
 					loop (i - 1) ((vfloat, None) :: (vdyn, None) :: acc)
 				end
@@ -616,15 +616,15 @@ struct
 		let args_real_to_func args =
 			let arity = List.length args in
 			if arity >= max_arity then
-				[ alloc_var (gen.gmk_internal_name "fn" "dynargs") (basic.tarray t_dynamic), None ]
+				[ alloc_var (mk_internal_name "fn" "dynargs") (basic.tarray t_dynamic), None ]
 			else func_args_i arity
 		in
 
 		let func_sig_i i =
 			let rec loop i acc =
 				if i = 0 then acc else begin
-					let vfloat = gen.gmk_internal_name "fn" ("float" ^ string_of_int i) in
-					let vdyn = gen.gmk_internal_name "fn" ("dyn" ^ string_of_int i) in
+					let vfloat = mk_internal_name "fn" ("float" ^ string_of_int i) in
+					let vdyn = mk_internal_name "fn" ("dyn" ^ string_of_int i) in
 
 					loop (i - 1) ( (vfloat,false,basic.tfloat) :: (vdyn,false,t_dynamic) :: acc )
 				end
@@ -635,7 +635,7 @@ struct
 		let args_real_to_func_sig args =
 			let arity = List.length args in
 			if arity >= max_arity then
-				[gen.gmk_internal_name "fn" "dynargs", false, basic.tarray t_dynamic]
+				[mk_internal_name "fn" "dynargs", false, basic.tarray t_dynamic]
 			else begin
 				func_sig_i arity
 			end
@@ -776,7 +776,7 @@ struct
 			(* set invoke function *)
 			(* todo properly abstract how naming for invoke is made *)
 			let invoke_name = if is_dynamic_func then "invokeDynamic" else ("invoke" ^ (string_of_int arity) ^ (if type_number = 0 then "_o" else "_f")) in
-			let invoke_name = gen.gmk_internal_name "hx" invoke_name in
+			let invoke_name = mk_internal_name "hx" invoke_name in
 			let invoke_field = mk_class_field invoke_name changed_sig false func_expr.epos (Method(MethNormal)) [] in
 			let invoke_fun = {
 				eexpr = TFunction {
@@ -811,7 +811,7 @@ struct
 			let ret_t = if params_len >= max_arity then t_dynamic else ret_t in
 
 			let invoke_fun = if params_len >= max_arity then "invokeDynamic" else "invoke" ^ (string_of_int params_len) ^ postfix in
-			let invoke_fun = gen.gmk_internal_name "hx" invoke_fun in
+			let invoke_fun = mk_internal_name "hx" invoke_fun in
 			let fun_t = match follow tc.etype with
 				| TFun(_sig, _) ->
 					TFun(args_real_to_func_sig _sig, ret_t)
@@ -839,7 +839,7 @@ struct
 
 		let iname i is_float =
 			let postfix = if is_float then "_f" else "_o" in
-			gen.gmk_internal_name "hx" ("invoke" ^ string_of_int i) ^ postfix
+			mk_internal_name "hx" ("invoke" ^ string_of_int i) ^ postfix
 		in
 
 		let map_base_classfields cl map_fn =
@@ -853,8 +853,8 @@ struct
 				cf
 			in
 
-			let type_name = gen.gmk_internal_name "fn" "type" in
-			let dynamic_arg = alloc_var (gen.gmk_internal_name "fn" "dynargs") (basic.tarray t_dynamic) in
+			let type_name = mk_internal_name "fn" "type" in
+			let dynamic_arg = alloc_var (mk_internal_name "fn" "dynargs") (basic.tarray t_dynamic) in
 
 			let mk_invoke_complete_i i is_float =
 
@@ -956,7 +956,7 @@ struct
 
 			let args = [dynamic_arg, None] in
 			let dyn_t = TFun(fun_args args, t_dynamic) in
-			let dyn_cf = mk_class_field (gen.gmk_internal_name "hx" "invokeDynamic") dyn_t false pos (Method MethNormal) [] in
+			let dyn_cf = mk_class_field (mk_internal_name "hx" "invokeDynamic") dyn_t false pos (Method MethNormal) [] in
 
 			dyn_cf.cf_expr <- Some {
 				eexpr = TFunction {
@@ -974,7 +974,7 @@ struct
 				let v_arity, v_type = alloc_var "arity" basic.tint, alloc_var "type" basic.tint in
 				let mk_assign v field = mk (TBinop (OpAssign, mk_this field v.v_type, mk_local v pos)) v.v_type pos in
 
-				let arity_name = gen.gmk_internal_name "hx" "arity" in
+				let arity_name = mk_internal_name "hx" "arity" in
 				new_cf.cf_expr <- Some {
 					eexpr = TFunction({
 						tf_args = [v_arity, None; v_type, None];
@@ -1051,7 +1051,7 @@ struct
 					loop_cases api (arity - 1) (mk_invoke_switch arity api :: acc)
 			in
 
-			let type_name = gen.gmk_internal_name "fn" "type" in
+			let type_name = mk_internal_name "fn" "type" in
 			let mk_expr i is_float vars =
 				let call_expr =
 					let call_t = TFun(List.map (fun v -> (v.v_name, false, v.v_type)) vars, if is_float then t_dynamic else basic.tfloat) in

src/generators/gencommon/defaultArguments.ml

@@ -70,7 +70,7 @@ let add_opt gen block pos (var,opt) =
 		(var, opt)
 	| Some const ->
 		let basic = gen.gcon.basic in
-		let nullable_var = mk_temp gen var.v_name (basic.tnull var.v_type) in
+		let nullable_var = mk_temp var.v_name (basic.tnull var.v_type) in
 		let orig_name = var.v_name in
 		var.v_name <- nullable_var.v_name;
 		nullable_var.v_name <- orig_name;

src/generators/gencommon/dynamicOperators.ml

@@ -84,11 +84,11 @@ let configure gen ?(handle_strings = true) (should_change:texpr->bool) (equals_h
 					| TField _ | TArray _ ->
 						let eleft, rest = match e1.eexpr with
 							| TField(ef, f) ->
-								let v = mk_temp gen "dynop" ef.etype in
+								let v = mk_temp "dynop" ef.etype in
 								{ e1 with eexpr = TField(mk_local v ef.epos, f) }, [ { eexpr = TVar(v,Some (run ef)); etype = basic.tvoid; epos = ef.epos } ]
 							| TArray(e1a, e2a) ->
-								let v = mk_temp gen "dynop" e1a.etype in
-								let v2 = mk_temp gen "dynopi" e2a.etype in
+								let v = mk_temp "dynop" e1a.etype in
+								let v2 = mk_temp "dynopi" e2a.etype in
 								{ e1 with eexpr = TArray(mk_local v e1a.epos, mk_local v2 e2a.epos) }, [
 									{ eexpr = TVar(v,Some (run e1a)); etype = basic.tvoid; epos = e1.epos };
 									{ eexpr = TVar(v2, Some (run e2a)); etype = basic.tvoid; epos = e1.epos }
@@ -145,7 +145,7 @@ let configure gen ?(handle_strings = true) (should_change:texpr->bool) (equals_h
 				let var, getvar =
 					match e1.eexpr with
 						| TField(fexpr, field) ->
-							let tmp = mk_temp gen "getvar" fexpr.etype in
+							let tmp = mk_temp "getvar" fexpr.etype in
 							let var = { eexpr = TVar(tmp, Some(run fexpr)); etype = gen.gcon.basic.tvoid; epos = e.epos } in
 							(Some var, { eexpr = TField( { fexpr with eexpr = TLocal(tmp) }, field); etype = etype; epos = e1.epos })
 						| _ ->
@@ -161,7 +161,7 @@ let configure gen ?(handle_strings = true) (should_change:texpr->bool) (equals_h
 						in
 						{ eexpr = TBlock(block); etype = etype; epos = e.epos }
 					| Postfix ->
-						let ret = mk_temp gen "ret" etype in
+						let ret = mk_temp "ret" etype in
 						let vars = (match var with Some e -> [e] | None -> []) @ [{ eexpr = TVar(ret, Some (mk_cast etype getvar)); etype = gen.gcon.basic.tvoid; epos = e.epos }] in
 						let retlocal = { eexpr = TLocal(ret); etype = etype; epos = e.epos } in
 						let block = vars @

src/generators/gencommon/expressionUnwrap.ml

@@ -354,7 +354,7 @@ let add_assign gen add_statement expr =
 			add_statement expr;
 			null expr.etype expr.epos
 		| _ ->
-			let var = mk_temp gen "stmt" expr.etype in
+			let var = mk_temp "stmt" expr.etype in
 			let tvars = { expr with eexpr = TVar(var,Some(expr)) } in
 			let local = { expr with eexpr = TLocal(var) } in
 			add_statement tvars;
@@ -396,7 +396,7 @@ let short_circuit_op_unwrap gen add_statement expr :texpr =
 	let rec loop acc expr =
 		match expr.eexpr with
 			| TBinop ( (Ast.OpBoolAnd as op), left, right) ->
-				let var = mk_temp gen "boolv" right.etype in
+				let var = mk_temp "boolv" right.etype in
 				let tvars = { right with eexpr = TVar(var, Some( { right with eexpr = TConst(TBool false); etype = gen.gcon.basic.tbool } )); etype = gen.gcon.basic.tvoid } in
 				let local = { right with eexpr = TLocal(var) } in
 
@@ -411,7 +411,7 @@ let short_circuit_op_unwrap gen add_statement expr :texpr =
 					| _ -> add_assign gen add_statement left
 				in
 
-				let var = mk_temp gen "boolv" right.etype in
+				let var = mk_temp "boolv" right.etype in
 				let tvars = { right with eexpr = TVar(var, Some( { right with eexpr = TConst(TBool false); etype = gen.gcon.basic.tbool } )); etype = gen.gcon.basic.tvoid } in
 				let local = { right with eexpr = TLocal(var) } in
 				add_statement tvars;
@@ -419,7 +419,7 @@ let short_circuit_op_unwrap gen add_statement expr :texpr =
 				({ expr with eexpr = TBinop(op, left, local) }, [ do_not left, { right with eexpr = TBinop(Ast.OpAssign, local, right) } ])
 			| _ when acc = [] -> assert false
 			| _ ->
-				let var = mk_temp gen "boolv" expr.etype in
+				let var = mk_temp "boolv" expr.etype in
 				let tvars = { expr with eexpr = TVar(var, Some( { expr with etype = gen.gcon.basic.tbool } )); etype = gen.gcon.basic.tvoid } in
 				let local = { expr with eexpr = TLocal(var) } in
 
@@ -461,7 +461,7 @@ let short_circuit_op_unwrap gen add_statement expr :texpr =
 		match expr.eexpr with
 			| TBinop ( (Ast.OpBoolAnd as op), left, right)
 			| TBinop ( (Ast.OpBoolOr as op), left, right) ->
-				let var = mk_temp gen "boolv" left.etype in
+				let var = mk_temp "boolv" left.etype in
 				let tvars = { left with eexpr = TVar([var, if is_first then Some(left) else Some( { left with eexpr = TConst(TBool false) } )]); etype = gen.gcon.basic.tvoid } in
 				let local = { left with eexpr = TLocal(var) } in
 				if not is_first then begin
@@ -478,7 +478,7 @@ let short_circuit_op_unwrap gen add_statement expr :texpr =
 				{ expr with eexpr = TBinop(op, local, new_right) }
 			| _ when is_first -> assert false
 			| _ ->
-				let var = mk_temp gen "boolv" expr.etype in
+				let var = mk_temp "boolv" expr.etype in
 				let tvars = { expr with eexpr = TVar([var, Some ( { expr with eexpr = TConst(TBool false) } ) ]); etype = gen.gcon.basic.tvoid } in
 				let local = { expr with eexpr = TLocal(var) } in
 				last_block := !last_block @ [ { expr with eexpr = TBinop(Ast.OpAssign, local, expr) } ];

src/generators/gencommon/fixOverrides.ml

@@ -176,7 +176,7 @@ let run ~explicit_fn_name ~get_vmtype gen =
 							let actual_args, _ = get_fun (get_real_fun gen actual_t) in
 							let new_args, vardecl = List.fold_left2 (fun (args,vdecl) (v,_) (_,_,t) ->
 								if not (type_iseq (gen.greal_type v.v_type) (gen.greal_type t)) then begin
-									let new_var = mk_temp gen v.v_name t in
+									let new_var = mk_temp v.v_name t in
 									(new_var,None) :: args, (v, Some(mk_cast v.v_type (mk_local new_var f.cf_pos))) :: vdecl
 								end else
 									(v,None) :: args, vdecl

src/generators/gencommon/hardNullableSynf.ml

@@ -109,7 +109,7 @@ let configure gen unwrap_null wrap_val null_to_dynamic has_value opeq_handler =
 		| TLocal _ ->
 			e, e
 		| _ ->
-			let v = mk_temp gen "nulltmp" e.etype in
+			let v = mk_temp "nulltmp" e.etype in
 			add_tmp v (Some (null e.etype e.epos)) e.epos;
 			let local = { e with eexpr = TLocal(v) } in
 			mk_paren { e with eexpr = TBinop(Ast.OpAssign, local, e) }, local
@@ -185,10 +185,10 @@ let configure gen unwrap_null wrap_val null_to_dynamic has_value opeq_handler =
 											| _ ->
 												let v, e1, evars = match e1.eexpr with
 													| TField(ef, f) ->
-														let v = mk_temp gen "nullbinop" ef.etype in
+														let v = mk_temp "nullbinop" ef.etype in
 														v, { e1 with eexpr = TField(mk_local v ef.epos, f) }, ef
 													| _ ->
-														let v = mk_temp gen "nullbinop" e1.etype in
+														let v = mk_temp "nullbinop" e1.etype in
 														v, mk_local v e1.epos, e1
 												in
 												{ e with eexpr = TBlock([

src/generators/gencommon/initFunction.ml

@@ -52,7 +52,7 @@ let ensure_simple_expr gen e =
 let configure gen =
 	let handle_override_dynfun acc e this field =
 		let add_expr = ref None in
-		let v = mk_temp gen ("super_" ^ field) e.etype in
+		let v = mk_temp ("super_" ^ field) e.etype in
 		v.v_capture <- true;
 
 		let rec loop e =

src/generators/gencommon/overloadingConstructor.ml

@@ -68,7 +68,7 @@ let rec prev_ctor c tl =
 		| Some ctor -> ctor, sup, stl
 
 let make_static_ctor_name gen cl =
-	let name = gen.gmk_internal_name "hx" "ctor" in
+	let name = mk_internal_name "hx" "ctor" in
 	name ^ "_" ^ (String.concat "_" (fst cl.cl_path)) ^ "_" ^ (snd cl.cl_path)
 
 (* replaces super() call with last static constructor call *)

src/generators/gencommon/reflectionCFs.ml

@@ -290,19 +290,19 @@ let enumerate_dynamic_fields ctx cl when_found base_arr =
 	{ eexpr = TVar (vtmp,None); etype = basic.tvoid; epos = pos }
 	::
 	if ctx.rcf_optimize then
-		mk_for (mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tint)) (mk_this (gen.gmk_internal_name "hx" "length") basic.tint)
+		mk_for (mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tint)) (mk_this (mk_internal_name "hx" "length") basic.tint)
 		@
-		mk_for (mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tint)) (mk_this (gen.gmk_internal_name "hx" "length_f") basic.tint)
+		mk_for (mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tint)) (mk_this (mk_internal_name "hx" "length_f") basic.tint)
 		@
 		(
 			let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-			let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
+			let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
 			[conflict_ctx.add_names ehead base_arr]
 		)
 	else
-		mk_for (mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tstring)) (mk_this (gen.gmk_internal_name "hx" "length") basic.tint)
+		mk_for (mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tstring)) (mk_this (mk_internal_name "hx" "length") basic.tint)
 		@
-		mk_for (mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tstring)) (mk_this (gen.gmk_internal_name "hx" "length_f") basic.tint)
+		mk_for (mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tstring)) (mk_this (mk_internal_name "hx" "length_f") basic.tint)
 
 (* *********************
 		Dynamic lookup
@@ -321,12 +321,12 @@ let abstract_dyn_lookup_implementation ctx this field_local hash_local may_value
 	let basic = gen.gcon.basic in
 	let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
 	let a_t = if ctx.rcf_optimize then basic.tint else basic.tstring in
-	let hx_hashes = mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
-	let hx_hashes_f = mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
-	let hx_dynamics = mk_this (gen.gmk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
-	let hx_dynamics_f = mk_this (gen.gmk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
-	let hx_length = mk_this (gen.gmk_internal_name "hx" "length") (basic.tint) in
-	let hx_length_f = mk_this (gen.gmk_internal_name "hx" "length_f") (basic.tint) in
+	let hx_hashes = mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
+	let hx_hashes_f = mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
+	let hx_dynamics = mk_this (mk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
+	let hx_dynamics_f = mk_this (mk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
+	let hx_length = mk_this (mk_internal_name "hx" "length") (basic.tint) in
+	let hx_length_f = mk_this (mk_internal_name "hx" "length_f") (basic.tint) in
 	let res = alloc_var "res" basic.tint in
 	let fst_hash, snd_hash, fst_dynamics, snd_dynamics, fst_length, snd_length =
 		if is_float then
@@ -380,7 +380,7 @@ let abstract_dyn_lookup_implementation ctx this field_local hash_local may_value
 
 			if ctx.rcf_optimize then
 				let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-				let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
+				let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
 				let vconflict = alloc_var "conflict" conflict_ctx.t in
 				let local_conflict = mk_local vconflict pos in
 				[mk (TIf (
@@ -457,7 +457,7 @@ let abstract_dyn_lookup_implementation ctx this field_local hash_local may_value
 			let block =
 				if ctx.rcf_optimize then
 					let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-					let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
+					let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
 					[mk (TIf (
 						mk (TBinop (OpLt, hash_local, ExprBuilder.make_int gen.gcon 0 pos)) basic.tbool pos,
 						conflict_ctx.set ehead hash_local field_local value_local,
@@ -477,16 +477,16 @@ let get_delete_field ctx cl is_dynamic =
 	let tf_args, switch_var = field_type_args ctx pos in
 	let local_switch_var = mk_local switch_var pos in
 	let fun_type = TFun(fun_args tf_args,basic.tbool) in
-	let cf = mk_class_field (gen.gmk_internal_name "hx" "deleteField") fun_type false pos (Method MethNormal) [] in
+	let cf = mk_class_field (mk_internal_name "hx" "deleteField") fun_type false pos (Method MethNormal) [] in
 	let body = if is_dynamic then begin
 		let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
 		let a_t = if ctx.rcf_optimize then basic.tint else basic.tstring in
-		let hx_hashes = mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
-		let hx_hashes_f = mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
-		let hx_dynamics = mk_this (gen.gmk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
-		let hx_dynamics_f = mk_this (gen.gmk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
-		let hx_length = mk_this (gen.gmk_internal_name "hx" "length") (basic.tint) in
-		let hx_length_f = mk_this (gen.gmk_internal_name "hx" "length_f") (basic.tint) in
+		let hx_hashes = mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
+		let hx_hashes_f = mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
+		let hx_dynamics = mk_this (mk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
+		let hx_dynamics_f = mk_this (mk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
+		let hx_length = mk_this (mk_internal_name "hx" "length") (basic.tint) in
+		let hx_length_f = mk_this (mk_internal_name "hx" "length_f") (basic.tint) in
 		let res = alloc_var "res" basic.tint in
 		let res_local = mk_local res pos in
 		let gte = {
@@ -542,7 +542,7 @@ let get_delete_field ctx cl is_dynamic =
 			let v_name = match tf_args with (v,_) :: _ -> v | _ -> assert false in
 			let local_name = mk_local v_name pos in
 			let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-			let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
+			let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
 			(mk (TIf (
 				mk (TBinop (OpLt, local_switch_var, ExprBuilder.make_int gen.gcon 0 pos)) basic.tbool pos,
 				mk (TReturn (Some (conflict_ctx.delete ehead local_switch_var local_name))) basic.tvoid pos,
@@ -614,10 +614,10 @@ let implement_dynamic_object_ctor ctx cl =
 	let basic = gen.gcon.basic in
 	let hasht = if ctx.rcf_optimize then basic.tint else basic.tstring in
 
-	let hashes_field = gen.gmk_internal_name "hx" "hashes", gen.gclasses.nativearray hasht in
-	let hashes_f_field = gen.gmk_internal_name "hx" "hashes_f", gen.gclasses.nativearray hasht in
-	let dynamics_field = gen.gmk_internal_name "hx" "dynamics", gen.gclasses.nativearray t_empty in
-	let dynamics_f_field = gen.gmk_internal_name "hx" "dynamics_f", gen.gclasses.nativearray basic.tfloat in
+	let hashes_field = mk_internal_name "hx" "hashes", gen.gclasses.nativearray hasht in
+	let hashes_f_field = mk_internal_name "hx" "hashes_f", gen.gclasses.nativearray hasht in
+	let dynamics_field = mk_internal_name "hx" "dynamics", gen.gclasses.nativearray t_empty in
+	let dynamics_f_field = mk_internal_name "hx" "dynamics_f", gen.gclasses.nativearray basic.tfloat in
 	let fields =
 	[
 		hashes_field;
@@ -652,8 +652,8 @@ let implement_dynamic_object_ctor ctx cl =
 					) tf_args
 					@
 					[
-						mk (TBinop(OpAssign, mk_this (gen.gmk_internal_name "hx" "length") basic.tint, gen.gclasses.nativearray_len (mk_local hashes_var pos) pos)) basic.tint pos;
-						mk (TBinop(OpAssign, mk_this (gen.gmk_internal_name "hx" "length_f") basic.tint, gen.gclasses.nativearray_len (mk_local hashes_f_var pos) pos)) basic.tint pos;
+						mk (TBinop(OpAssign, mk_this (mk_internal_name "hx" "length") basic.tint, gen.gclasses.nativearray_len (mk_local hashes_var pos) pos)) basic.tint pos;
+						mk (TBinop(OpAssign, mk_this (mk_internal_name "hx" "length_f") basic.tint, gen.gclasses.nativearray_len (mk_local hashes_f_var pos) pos)) basic.tint pos;
 					]
 				);
 				etype = basic.tvoid;
@@ -714,7 +714,7 @@ let implement_dynamic_object_ctor ctx cl =
 				if is_side_effects_free expr then
 					change_exprs tl ((name,expr) :: acc)
 				else begin
-					let var = mk_temp gen "odecl" expr.etype in
+					let var = mk_temp "odecl" expr.etype in
 					exprs_before := { eexpr = TVar(var,Some expr); etype = basic.tvoid; epos = expr.epos } :: !exprs_before;
 					change_exprs tl ((name,mk_local var expr.epos) :: acc)
 				end
@@ -769,10 +769,10 @@ let implement_dynamics ctx cl =
 
 			let new_fields =
 			[
-				mk_class_field (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray hasht) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-				mk_class_field (gen.gmk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-				mk_class_field (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray hasht) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-				mk_class_field (gen.gmk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+				mk_class_field (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray hasht) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+				mk_class_field (mk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+				mk_class_field (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray hasht) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+				mk_class_field (mk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
 			] in
 
 			(if cl.cl_path <> (["haxe"; "lang"], "DynamicObject") then
@@ -781,7 +781,7 @@ let implement_dynamics ctx cl =
 
 			let new_fields =
 				if ctx.rcf_optimize then
-					let f = mk_class_field (gen.gmk_internal_name "hx" "conflicts") (Option.get ctx.rcf_hash_conflict_ctx).t false pos (Var { v_read = AccNormal; v_write = AccNormal }) [] in
+					let f = mk_class_field (mk_internal_name "hx" "conflicts") (Option.get ctx.rcf_hash_conflict_ctx).t false pos (Var { v_read = AccNormal; v_write = AccNormal }) [] in
 					f :: new_fields
 				else
 					new_fields
@@ -790,8 +790,8 @@ let implement_dynamics ctx cl =
 			let delete = get_delete_field ctx cl true in
 
 			let new_fields = new_fields @ [
-				mk_class_field (gen.gmk_internal_name "hx" "length") (basic.tint) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-				mk_class_field (gen.gmk_internal_name "hx" "length_f") (basic.tint) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+				mk_class_field (mk_internal_name "hx" "length") (basic.tint) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+				mk_class_field (mk_internal_name "hx" "length_f") (basic.tint) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
 				delete;
 			] in
 
@@ -852,7 +852,7 @@ let implement_final_lookup ctx cl =
 	*)
 	let create_cfs is_dynamic callback =
 		let create_cf is_float is_set =
-			let name = gen.gmk_internal_name "hx" ( (if is_set then "lookupSetField" else "lookupField") ^ (if is_float then "_f" else "") ) in
+			let name = mk_internal_name "hx" ( (if is_set then "lookupSetField" else "lookupField") ^ (if is_float then "_f" else "") ) in
 			let field_args, switch_var = field_type_args ctx pos in
 			let ret_t = if is_float then basic.tfloat else t_dynamic in
 			let tf_args, throw_errors_opt =
@@ -972,7 +972,7 @@ let implement_get_set ctx cl =
 		in
 
 		let fun_type = ref (TFun([], basic.tvoid)) in
-		let fun_name = ctx.rcf_gen.gmk_internal_name "hx" ( (if is_set then "setField" else "getField") ^ (if is_float then "_f" else "") ) in
+		let fun_name = mk_internal_name "hx" ( (if is_set then "setField" else "getField") ^ (if is_float then "_f" else "") ) in
 		let cfield = mk_class_field fun_name !fun_type false pos (Method MethNormal) [] in
 
 		let maybe_cast e = e in
@@ -1001,7 +1001,7 @@ let implement_get_set ctx cl =
 			let value_var = alloc_var "value" (if is_float then basic.tfloat else t_dynamic) in
 			let value_local = { eexpr = TLocal(value_var); etype = value_var.v_type; epos = pos } in
 			let tf_args = tf_args @ [value_var,None; handle_prop, None; ] in
-			let lookup_name = gen.gmk_internal_name "hx" ("lookupSetField" ^ if is_float then "_f" else "") in
+			let lookup_name = mk_internal_name "hx" ("lookupSetField" ^ if is_float then "_f" else "") in
 
 			let do_default =
 					fun () ->
@@ -1068,7 +1068,7 @@ let implement_get_set ctx cl =
 				let tf_args = tf_args @ [ throw_errors,None; ] in
 
 				(* default: if (isCheck) return __undefined__ else if(throwErrors) throw "Field not found"; else return null; *)
-				let lookup_name = gen.gmk_internal_name "hx" "lookupField" in
+				let lookup_name = mk_internal_name "hx" "lookupField" in
 				let do_default =
 						fun () ->
 							mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [throw_errors,None;is_check,None; ]),t_dynamic)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ throw_errors_local; is_check_local; ] ))
@@ -1078,7 +1078,7 @@ let implement_get_set ctx cl =
 			end else begin
 				let tf_args = tf_args @ [ throw_errors,None; ] in
 
-				let lookup_name = gen.gmk_internal_name "hx" "lookupField_f" in
+				let lookup_name = mk_internal_name "hx" "lookupField_f" in
 				let do_default =
 						fun () ->
 							mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [throw_errors,None; ]),basic.tfloat)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ throw_errors_local; ] ))
@@ -1206,7 +1206,7 @@ let implement_getFields ctx cl =
 			super.__hx_getFields(baseArr);
 		}
 	*)
-	let name = gen.gmk_internal_name "hx" "getFields" in
+	let name = mk_internal_name "hx" "getFields" in
 	let v_base_arr = alloc_var "baseArr" (basic.tarray basic.tstring) in
 	let base_arr = mk_local v_base_arr pos in
 
@@ -1344,7 +1344,7 @@ let implement_invokeField ctx ~slow_invoke cl =
 		}
 	*)
 
-	let dyn_fun = mk_class_field (ctx.rcf_gen.gmk_internal_name "hx" "invokeField") fun_t false cl.cl_pos (Method MethNormal) [] in
+	let dyn_fun = mk_class_field (mk_internal_name "hx" "invokeField") fun_t false cl.cl_pos (Method MethNormal) [] in
 
 	let mk_switch_dyn cfs old =
 		let get_case (names,cf) =
@@ -1381,7 +1381,7 @@ let implement_invokeField ctx ~slow_invoke cl =
 			{ eexpr = TReturn(Some (call_super ctx all_args t_dynamic dyn_fun cl this_t pos) ); etype = basic.tvoid; epos = pos }
 		else (
 			let field = begin
-				let fun_name = ctx.rcf_gen.gmk_internal_name "hx" "getField" in
+				let fun_name = mk_internal_name "hx" "getField" in
 				let tf_args, _ = field_type_args ctx pos in
 				let tf_args, args = fun_args tf_args, field_args_exprs in
 
@@ -1394,7 +1394,7 @@ let implement_invokeField ctx ~slow_invoke cl =
 			let field = mk_cast (TInst(ctx.rcf_ft.func_class,[])) field in
 			mk_return {
 				eexpr = TCall(
-					mk_field_access gen field (gen.gmk_internal_name "hx" "invokeDynamic") pos,
+					mk_field_access gen field (mk_internal_name "hx" "invokeDynamic") pos,
 					[mk_local dynamic_arg pos]);
 				etype = t_dynamic;
 				epos = pos
@@ -1452,8 +1452,8 @@ let implement_varargs_cl ctx cl =
 	let this = { eexpr = TConst(TThis); etype = this_t ; epos = pos } in
 	let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
 
-	let invokedyn = gen.gmk_internal_name "hx" "invokeDynamic" in
-	let idyn_t = TFun([gen.gmk_internal_name "fn" "dynargs", false, basic.tarray t_dynamic], t_dynamic) in
+	let invokedyn = mk_internal_name "hx" "invokeDynamic" in
+	let idyn_t = TFun([mk_internal_name "fn" "dynargs", false, basic.tarray t_dynamic], t_dynamic) in
 	let this_idyn = mk_this invokedyn idyn_t in
 
 	let map_fn arity ret vars api =
@@ -1539,7 +1539,7 @@ let implement_closure_cl ctx cl =
 
 		let expr = {
 			eexpr = TCall(
-				mk_field_access gen this_obj (gen.gmk_internal_name "hx" "invokeField") pos,
+				mk_field_access gen this_obj (mk_internal_name "hx" "invokeField") pos,
 				(List.map (fun (v,_) -> mk_this v.v_name v.v_type) field_args) @ [ call_arg ]
 			);
 			etype = t_dynamic;
@@ -1684,10 +1684,10 @@ let configure ?slow_invoke ctx baseinterface =
 	let run = (fun md -> match md with
 		| TClassDecl cl when is_hxgen md && ( not cl.cl_interface || cl.cl_path = baseinterface.cl_path ) && (match cl.cl_kind with KAbstractImpl _ -> false | _ -> true) ->
 			(implement_dynamics ctx cl);
-			(if not (PMap.mem (gen.gmk_internal_name "hx" "lookupField") cl.cl_fields) then implement_final_lookup ctx cl);
-			(if not (PMap.mem (gen.gmk_internal_name "hx" "getField") cl.cl_fields) then implement_get_set ctx cl);
-			(if not (PMap.mem (gen.gmk_internal_name "hx" "invokeField") cl.cl_fields) then implement_invokeField ctx ~slow_invoke:slow_invoke cl);
-			(if not (PMap.mem (gen.gmk_internal_name "hx" "getFields") cl.cl_fields) then implement_getFields ctx cl);
+			(if not (PMap.mem (mk_internal_name "hx" "lookupField") cl.cl_fields) then implement_final_lookup ctx cl);
+			(if not (PMap.mem (mk_internal_name "hx" "getField") cl.cl_fields) then implement_get_set ctx cl);
+			(if not (PMap.mem (mk_internal_name "hx" "invokeField") cl.cl_fields) then implement_invokeField ctx ~slow_invoke:slow_invoke cl);
+			(if not (PMap.mem (mk_internal_name "hx" "getFields") cl.cl_fields) then implement_getFields ctx cl);
 			None
 		| _ -> None)
 	in

src/generators/gencommon/switchToIf.ml

@@ -56,7 +56,7 @@ let configure gen (should_convert:texpr->bool) =
 					let local, fst_block = match cond.eexpr, should_cache with
 						| TLocal _, false -> cond, []
 						| _ ->
-							let var = mk_temp gen "switch" cond_etype in
+							let var = mk_temp "switch" cond_etype in
 							let cond = run cond in
 							let cond = if should_cache then mk_cast cond_etype cond else cond in
 

src/generators/gencommon/tArrayTransform.ml

@@ -77,8 +77,8 @@ let configure gen (should_change:texpr->Ast.binop option->bool) (get_fun:string)
 						| _ -> basic.tint
 					in
 
-					let val_v = mk_temp gen "arrVal" actual_t in
-					let ret_v = mk_temp gen "arrRet" actual_t in
+					let val_v = mk_temp "arrVal" actual_t in
+					let ret_v = mk_temp "arrRet" actual_t in
 
 					let arr_local = ensure_local gen block "arr" (run e1a) in
 					let idx_local = ensure_local gen block "arrIndex" (run e2a) in

src/generators/gencommon/tryCatchWrapper.ml

@@ -80,10 +80,10 @@ let configure gen (should_wrap:t->bool) (wrap_throw:texpr->texpr->texpr) (unwrap
 						| Some (v,c), _
 						| _, (v, c) :: _ ->
 							let pos = c.epos in
-							let temp_var = mk_temp gen "catchallException" catchall_type in
+							let temp_var = mk_temp "catchallException" catchall_type in
 							let temp_local = { eexpr=TLocal(temp_var); etype = temp_var.v_type; epos = pos } in
 							let catchall_var = (*match catchall with
-								| None -> *) mk_temp gen "catchall" t_dynamic
+								| None -> *) mk_temp "catchall" t_dynamic
 								(*| Some (v,_) -> v*)
 							in
 							let catchall_decl = { eexpr = TVar(catchall_var, Some(temp_local)); etype=gen.gcon.basic.tvoid; epos = pos } in

src/generators/gencs.ml

@@ -203,7 +203,7 @@ struct
 						match obj.eexpr with
 							| TLocal(v) -> f obj
 							| _ ->
-								let var = mk_temp gen "is" obj.etype in
+								let var = mk_temp "is" obj.etype in
 								let added = { obj with eexpr = TVar(var, Some(obj)); etype = basic.tvoid } in
 								let local = mk_local var obj.epos in
 								{
@@ -277,7 +277,7 @@ struct
 					in
 
 					let mk_local obj =
-						let var = mk_temp gen "opUshr" obj.etype in
+						let var = mk_temp "opUshr" obj.etype in
 						let added = { obj with eexpr = TVar(var, Some(obj)); etype = basic.tvoid } in
 						let local = mk_local var obj.epos in
 						local, added
@@ -522,10 +522,10 @@ let add_cast_handler gen =
 		let old_param = get_narr_param e.etype in
 		let new_param = get_narr_param to_t in
 
-		let new_v = mk_temp gen "new_arr" to_t in
-		let i = mk_temp gen "i" basic.tint in
+		let new_v = mk_temp "new_arr" to_t in
+		let i = mk_temp "i" basic.tint in
 		let old_len = mk_field_access gen e "Length" e.epos in
-		let obj_v = mk_temp gen "obj" t_dynamic in
+		let obj_v = mk_temp "obj" t_dynamic in
 		let check_null = {eexpr = TBinop(Ast.OpNotEq, e, null e.etype e.epos); etype = basic.tbool; epos = e.epos} in
 		let block = [
 			{
@@ -1392,7 +1392,7 @@ let configure gen =
 							let rec loop fx acc = match fx with
 								| (v,e,expr) :: tl ->
 									write w "fixed(";
-									let vf = mk_temp gen "fixed" v.v_type in
+									let vf = mk_temp "fixed" v.v_type in
 									expr_s w { expr with eexpr = TVar(vf, Some e) };
 									write w ") ";
 									begin_block w;
@@ -2840,7 +2840,7 @@ let configure gen =
 
 	let closure_cl = get_cl (get_type gen (["haxe";"lang"],"Closure")) in
 	let varargs_cl = get_cl (get_type gen (["haxe";"lang"],"VarArgsFunction")) in
-	let dynamic_name = gen.gmk_internal_name "hx" "invokeDynamic" in
+	let dynamic_name = mk_internal_name "hx" "invokeDynamic" in
 
 	List.iter (fun cl ->
 		List.iter (fun cf ->
@@ -3077,7 +3077,7 @@ let configure gen =
 			| _ -> assert false
 	);
 
-	ExpressionUnwrap.configure gen (fun e -> Some { eexpr = TVar(mk_temp gen "expr" e.etype, Some e); etype = gen.gcon.basic.tvoid; epos = e.epos });
+	ExpressionUnwrap.configure gen (fun e -> Some { eexpr = TVar(mk_temp "expr" e.etype, Some e); etype = gen.gcon.basic.tvoid; epos = e.epos });
 
 	UnnecessaryCastsRemoval.configure gen;
 

src/generators/genjava.ml

@@ -392,13 +392,13 @@ struct
 		let local = match e1.eexpr with
 			| TLocal _ -> e1
 			| _ ->
-				let var = mk_temp gen "svar" e1.etype in
+				let var = mk_temp "svar" e1.etype in
 				let added = { e1 with eexpr = TVar(var, Some(e1)); etype = basic.tvoid } in
 				let local = mk_local var e1.epos in
 				block := added :: !block;
 				local
 		in
-		let execute_def_var = mk_temp gen "executeDef" gen.gcon.basic.tbool in
+		let execute_def_var = mk_temp "executeDef" gen.gcon.basic.tbool in
 		let execute_def = mk_local execute_def_var e1.epos in
 		let execute_def_set = { eexpr = TBinop(Ast.OpAssign, execute_def, { eexpr = TConst(TBool false); etype = basic.tbool; epos = e1.epos }); etype = basic.tbool; epos = e1.epos } in
 
@@ -416,7 +416,7 @@ struct
 			match !hash_cache with
 				| Some c -> c
 				| None ->
-					let var = mk_temp gen "hash" basic.tint in
+					let var = mk_temp "hash" basic.tint in
 					let cond = !local_hashcode in
 					block := { eexpr = TVar(var, Some cond); etype = basic.tvoid; epos = local.epos } :: !block;
 					let local = mk_local var local.epos in
@@ -2376,7 +2376,7 @@ let configure gen =
 			| _ -> assert false
 	);
 
-	ExpressionUnwrap.configure gen (fun e -> Some { eexpr = TVar(mk_temp gen "expr" e.etype, Some e); etype = gen.gcon.basic.tvoid; epos = e.epos });
+	ExpressionUnwrap.configure gen (fun e -> Some { eexpr = TVar(mk_temp "expr" e.etype, Some e); etype = gen.gcon.basic.tvoid; epos = e.epos });
 
 	UnnecessaryCastsRemoval.configure gen;