[cs/java] merge generate_modules functions back into gencs/genjava

src/generators/gencommon.ml

@@ -1062,37 +1062,6 @@ let dump_descriptor gen name path_s module_s =
 	output_string f contents;
 	close_out f
 
-(*
-	helper function to create the source structure. Will send each module_def to the function passed.
-	If received true, it means that module_gen has generated this content, so the file must be saved.
-	See that it will write a whole module
-*)
-let generate_modules gen extension source_dir (module_gen : SourceWriter.source_writer->module_def->bool) out_files =
-	List.iter (fun md_def ->
-		let source_dir =
-				gen.gcon.file ^ "/" ^ source_dir ^ "/" ^ (String.concat "/" (fst (path_of_md_def md_def)))
-		in
-		let w = SourceWriter.new_source_writer () in
-		(*let should_write = List.fold_left (fun should md -> module_gen w md or should) false md_def.m_types in*)
-		let should_write = module_gen w md_def in
-		if should_write then begin
-			let path = path_of_md_def md_def in
-			write_file gen w source_dir path extension out_files
-		end
-	) gen.gmodules
-
-let generate_modules_t gen extension source_dir change_path (module_gen : SourceWriter.source_writer->module_type->bool) out_files =
-	let source_dir = gen.gcon.file ^ "/" ^ source_dir in
-	List.iter (fun md ->
-		let w = SourceWriter.new_source_writer () in
-		(*let should_write = List.fold_left (fun should md -> module_gen w md or should) false md_def.m_types in*)
-		let should_write = module_gen w md in
-		if should_write then begin
-			let path = change_path (t_path md) in
-			write_file gen w (source_dir ^ "/" ^ (String.concat "/" (fst path))) path extension out_files;
-		end
-	) gen.gtypes_list
-
 (*
 	various helper functions
 *)

src/generators/gencs.ml

@@ -2660,10 +2660,6 @@ let configure gen =
 				false
 	in
 
-	let module_gen w md_def =
-		List.fold_left (fun should md -> module_type_gen w md || should) false md_def.m_types
-	in
-
 	(* generate source code *)
 	init_ctx gen;
 
@@ -3334,7 +3330,16 @@ let configure gen =
 
 	let parts = Str.split_delim (Str.regexp "[\\/]+") gen.gcon.file in
 	mkdir_recursive "" parts;
-	generate_modules gen "cs" "src" module_gen out_files;
+
+	List.iter (fun md_def ->
+		let source_dir = gen.gcon.file ^ "/src/" ^ (String.concat "/" (fst (path_of_md_def md_def))) in
+		let w = SourceWriter.new_source_writer() in
+		let should_write = List.fold_left (fun should md -> module_type_gen w md || should) false md_def.m_types in
+		if should_write then begin
+			let path = path_of_md_def md_def in
+			write_file gen w source_dir path "cs" out_files
+		end
+	) gen.gmodules;
 
 	if not (Common.defined gen.gcon Define.KeepOldOutput) then
 		clean_files (gen.gcon.file ^ "/src") !out_files gen.gcon.verbose;

src/generators/genjava.ml

@@ -2041,10 +2041,6 @@ let configure gen =
 				false
 	in
 
-	let module_gen w md =
-		module_type_gen w md
-	in
-
 	(* generate source code *)
 	init_ctx gen;
 
@@ -2499,7 +2495,16 @@ let configure gen =
 
 	let parts = Str.split_delim (Str.regexp "[\\/]+") gen.gcon.file in
 	mkdir_recursive "" parts;
-	generate_modules_t gen "java" "src" change_path module_gen out_files;
+
+	let source_dir = gen.gcon.file ^ "/src" in
+	List.iter (fun md ->
+		let w = SourceWriter.new_source_writer () in
+		let should_write = module_type_gen w md in
+		if should_write then begin
+			let path = change_path (t_path md) in
+			write_file gen w (source_dir ^ "/" ^ (String.concat "/" (fst path))) path "java" out_files;
+		end
+	) gen.gtypes_list;
 
 	if not (Common.defined gen.gcon Define.KeepOldOutput) then
 		clean_files (gen.gcon.file ^ "/src") !out_files gen.gcon.verbose;