X-Git-Url: http://nitlanguage.org

diff --git a/contrib/jwrapper/src/code_generator.nit b/contrib/jwrapper/src/code_generator.nit
index 6c52a62..860b98a 100644
--- a/contrib/jwrapper/src/code_generator.nit
+++ b/contrib/jwrapper/src/code_generator.nit
@@ -17,7 +17,7 @@
 # Services to generate extern class `in "Java"`
 module code_generator
 
-intrude import types
+intrude import model
 
 class CodeGenerator
 
@@ -105,7 +105,7 @@ class CodeGenerator
 	do
 		var temp = new Array[String]
 		temp.add("extern class Native{jtype.id} in \"Java\" `\{ {jtype} `\}\n")
-		temp.add("\tsuper JavaObject\n\tredef type SELF: Native{jtype.id}\n\n")
+		temp.add("\tsuper JavaObject\n\n")
 
 		return temp.join("")
 	end
@@ -121,16 +121,16 @@ class CodeGenerator
 
 		var temp = new Array[String]
 		temp.add("extern class {nit_type} in \"Java\" `\{ {jtype.to_package_name} `\}\n")
-		temp.add("\tsuper JavaObject\n\tredef type SELF: {nit_type}\n\nend\n")
+		temp.add("\tsuper JavaObject\n\nend\n")
 
 		return temp.join("")
 	end
 
 	fun gen_attribute(jid: String, jtype: JavaType): String
 	do
-		return "\tvar {jid.to_snake_case}: {jtype.to_nit_type}\n"
+		return "\tvar {jid.to_nit_method_name}: {jtype.to_nit_type}\n"
 	end
-	
+
 	fun gen_method(jmethod_id: String, nmethod_id: String, jreturn_type: JavaType, jparam_list: Array[JavaType]): String
 	do
 		var java_params = ""
@@ -138,7 +138,7 @@ class CodeGenerator
 		var nit_id = "arg"
 		var nit_id_no = 0
 		var nit_types = new Array[NitType]
-		var comment = "" 
+		var comment = ""
 
 		# Parameters
 		for i in [0..jparam_list.length[ do
@@ -177,7 +177,7 @@ class CodeGenerator
 		end
 
 		# Method identifier
-		var method_id = nmethod_id.to_snake_case
+		var method_id = nmethod_id.to_nit_method_name
 		var nit_signature = new Array[String]
 
 		nit_signature.add "\tfun {method_id}"
@@ -207,16 +207,8 @@ class CodeGenerator
 			nit_signature.add ": {return_type} "
 		end
 
-		var param_to_copy = param_to_copy(jparam_list, nit_types)
-
 		var temp = new Array[String]
 
-		if nb_params > 1 then
-			comment = "#"
-			temp.add("\t# NOT SUPPORTED: more than one parameter to copy\n")
-			temp.add("\t# Has to be implemented manually\n")
-		end
-
 		temp.add(comment + nit_signature.join(""))
 
 		# FIXME : This huge `if` block is only necessary to copy primitive arrays as long as there's no better way to do it
@@ -224,31 +216,10 @@ class CodeGenerator
 			temp.add(" in \"Java\" `\{\n{comment}\t\trecv.{jmethod_id}({java_params});\n{comment}\t`\}\n")
 		# Methods with return type
 		else if return_type != null then
-			if jreturn_type.is_primitive_array then
-				# Copy one parameter and the return value
-				if param_to_copy != null then
-					var rtype_couple = new Couple[JavaType, NitType](jreturn_type, return_type)
-					temp.add(code_warehouse.param_return_copy(rtype_couple, param_to_copy, jmethod_id, java_params))
-				# Copy the return type
-				else
-					temp.add(code_warehouse.return_type_copy(jreturn_type, return_type, jmethod_id, java_params))
-				end
-			# Copy the parameter
-			else if param_to_copy != null then
-				temp.add(code_warehouse.param_type_copy(param_to_copy.first, param_to_copy.second, jmethod_id, java_params, true))
-			# No copy
-			else
-				temp.add(" in \"Java\" `\{\n{comment}\t\treturn {jreturn_type.return_cast} recv.{jmethod_id}({java_params});\n{comment}\t`\}\n")
-			end
+			temp.add(" in \"Java\" `\{\n{comment}\t\treturn {jreturn_type.return_cast}recv.{jmethod_id}({java_params});\n{comment}\t`\}\n")
 		# Methods without return type
 		else if jreturn_type.is_void then
-			# Copy one parameter
-			if param_to_copy != null then
-				temp.add(code_warehouse.param_type_copy(param_to_copy.first, param_to_copy.second, jmethod_id, java_params, false))
-			# No copy
-			else
-				temp.add(" in \"Java\" `\{\n{comment}\t\trecv.{jmethod_id}({java_params});\n{comment}\t`\}\n")
-			end
+			temp.add(" in \"Java\" `\{\n{comment}\t\trecv.{jmethod_id}({java_params});\n{comment}\t`\}\n")
 		# No copy
 		else
 			temp.add(" in \"Java\" `\{\n{comment}\t\trecv.{jmethod_id}({java_params});\n{comment}\t`\}\n")
@@ -256,132 +227,11 @@ class CodeGenerator
 
 		return temp.join("")
 	end
-
-	# Only one primitive array parameter can be copied
-	# If there's none or more than one then `null` is returned
-	fun param_to_copy(jtypes: Array[JavaType], ntypes: Array[NitType]): nullable Couple[JavaType, NitType]
-	do
-		var counter = 0
-		var couple = null
-		for i in [0..jtypes.length[ do
-			if jtypes[i].is_primitive_array then
-				counter += 1
-				couple = new Couple[JavaType, NitType](jtypes[i], ntypes[i])
-			end
-		end
-
-		nb_params = counter
-
-		if counter > 1 then return null
-		return couple
-	end
 end
 
 # Contains raw code mostly used to copy collections
 class CodeWarehouse
 
-	# Collection as return value
-	fun return_type_copy(java_type: JavaType, nit_type: NitType, jmethod_id, params_id: String): String
-	do
-		var narray_id = "nit_array"
-		var loop_ = create_loop(java_type, nit_type, false, "java_array", narray_id)
-		var imports = create_imports(nit_type, false)
-
-		return """{{{imports}}} in "Java" `{ 
-		{{{java_type.to_s}}} java_array = recv.{{{jmethod_id}}}({{{params_id}}});
-		int {{{narray_id}}} = new_{{{nit_type.id}}}_of_{{{nit_type.generic_params.join("_")}}}();
-
-		{{{loop_}}}
-
-		return {{{narray_id}}};
-	`}
-"""
-	end
-
-	# Collection as parameter
-	fun param_type_copy(java_type: JavaType, nit_type: NitType, jmethod_id, params_id: String, has_return: Bool): String
-	do
-		var narray_id = "nit_array"
-		var jarray_id = "java_array"
-		var loop_ = create_loop(java_type, nit_type, true, jarray_id, narray_id)
-		var imports = create_imports(nit_type, true)
-		var jinstanciation = create_array_instance(java_type, nit_type, jarray_id)
-		var return_str = ""
-		
-		if has_return then
-			return_str = "return "
-		end
-
-		params_id = params_id.replace(nit_type.arg_id, jarray_id)
-
-		return """{{{imports}}} in "Java" `{ 
-		{{{jinstanciation}}}
-		int {{{narray_id}}} = new_{{{nit_type.id}}}_of_{{{nit_type.generic_params.join("_")}}}();
-
-		{{{loop_}}}
-
-		{{{return_str}}}recv.{{{jmethod_id}}}({{{params_id}}});
-	`}
-"""
-	end
-
-	# One collection parameter and the return type will be copied
-	fun param_return_copy(return_types, param_types: Couple[JavaType, NitType], jmethod_id, params_id: String): String
-	do
-		var narray_id = "nit_array"
-		var narray_id2 = "nit_array2"
-
-		var r_jtype = return_types.first
-		var r_ntype = return_types.second
-
-		var p_jtype = param_types.first
-		var p_ntype = param_types.second
-
-		var r_loop = create_loop(r_jtype, r_ntype, false, "java_array", narray_id)
-		var p_loop = create_loop(p_jtype, p_ntype, true, "java_array2", narray_id2)
-
-		var imports = new Array[String]
-		
-		# Avoid import duplication
-		if p_ntype.to_s != r_ntype.to_s then
-			imports.add create_imports(p_ntype, true)
-		end
-
-		imports.add create_imports(r_ntype, false)
-
-		params_id = params_id.replace(p_ntype.arg_id, narray_id)
-
-		var jinstanciation = create_array_instance(p_jtype, p_ntype, "java_array")
-
-		return """{{{imports.join(", ")}}} in "Java" `{
-		{{{jinstanciation}}}
-
-		{{{p_loop}}}
-
-		{{{r_jtype.to_s}}} java_array2 = recv.{{{jmethod_id}}}({{{params_id}}});
-		int {{{narray_id2}}} = new_{{{r_ntype.id}}}_of_{{{r_ntype.generic_params.join("_")}}}();
-
-		{{{r_loop}}}
-
-		return {{{narray_id2}}};
-	`}
-"""
-	end
-
-	private fun create_array_instance(java_type: JavaType, nit_type: NitType, jarray_id: String): String
-	do
-		var jtype = java_type.to_s
-		var instanciation = ""
-
-		if java_type.is_primitive_array then
-			instanciation = "{jtype} {jarray_id} = new {java_type.full_id}[(int)Array_of_{nit_type.generic_params[0]}_length({nit_type.arg_id})];"
-		else
-			instanciation = "{jtype} {jarray_id} = new {jtype}();"
-		end
-
-		return instanciation
-	end
-
 	private fun create_imports(nit_type: NitType, is_param: Bool): String
 	do
 		var imports = ""
@@ -401,48 +251,26 @@ class CodeWarehouse
 		else
 			imports = """ import {{{ntype}}}.iterator, Iterator[{{{gen_type}}}].is_ok, Iterator[{{{gen_type}}}].next, Iterator[{{{gen_type}}}].item"""
 		end
-		
+
 		return imports
 	end
+end
 
-	private fun create_loop(java_type: JavaType, nit_type: NitType, is_param: Bool, jarray_id, narray_id: String): String
+redef class String
+	# Convert the Java method name `self` to the Nit style
+	#
+	# * Converts to snake case
+	# * Strips `Get` and `Set`
+	# * Add suffix `=` to setters
+	fun to_nit_method_name: String
 	do
-		var loop_header = ""
-		var loop_body = ""
-		var gen_type = nit_type.generic_params.join("_")
-
-		if is_param then
-			if java_type.is_primitive_array then
-				loop_header = "for(int i=0; i < {jarray_id}.length; ++i)"
-				loop_body   = """\t\t\t{{{jarray_id}}}[i] = {{{java_type.param_cast}}}Array_of_{{{gen_type}}}__index({{{nit_type.arg_id}}}, i);"""
-			else if nit_type.id == "Array" then
-				loop_header = """int length = Array_of_{{{gen_type}}}_length((int){{{nit_type.arg_id}}});\n\t\tfor(int i=0; i < length; ++i)"""
-				loop_body   = """\t\t\t{{{jarray_id}}}.add({{{java_type.param_cast}}}Array_of_{{{gen_type}}}__index({{{narray_id}}}, i));"""
-			else
-				loop_header = """int itr = {{{nit_type.id}}}_of_{{{gen_type}}}_iterator({{{nit_type.arg_id}}});\n\t\twhile(Iterator_of_{{{gen_type}}}_is_ok(itr)) {"""
-				if nit_type.is_map then
-					var key_cast = java_type.to_cast(java_type.generic_params[0].id, true)
-					var value_cast = java_type.to_cast(java_type.generic_params[1].id, true)
-					loop_body   = """\t\t\t{{{jarray_id}}}[{{{key_cast}}}iterator_of_{{{nit_type.id}}}_key(itr)] = {{{value_cast}}}iterator_of_{{{nit_type.id}}}_item(itr);\n\t\t\titerator_of_{{{gen_type}}}_next(itr);\n\t\t}"""
-				else
-					loop_body   = """\t\t\t{{{jarray_id}}}.add({{{java_type.param_cast}}}iterator_of_{{{nit_type.id}}}_item(itr));\n\t\t\titerator_of_{{{gen_type}}}_next(itr);\n\t\t}"""
-				end
-			end
-		else
-			if nit_type.is_map then
-				var key_cast = java_type.to_cast(java_type.generic_params[0].id, false)
-				var value_cast = java_type.to_cast(java_type.generic_params[1].id, false)
-				loop_header = """for (java.util.Map.Entry<{{{java_type.generic_params[0]}}}, {{{java_type.generic_params[1]}}}> e: {{{jarray_id}}})"""
-				loop_body   = """\t\t\t{{{nit_type.id}}}_of_{{{gen_type}}}_{{{nit_type.generic_params[1]}}}__index_assign({{{narray_id}}}, {{{key_cast}}}e.getKey(), {{{value_cast}}}e.getValue());"""
-			else if java_type.is_iterable then
-				loop_header = """for ({{{java_type.generic_params[0]}}} e: {{{jarray_id}}})"""
-				loop_body   = """\t\t\t{{{nit_type.id}}}_of_{{{gen_type}}}_add({{{narray_id}}}, {{{java_type.return_cast}}}e);"""
-			else
-				loop_header = "for(int i=0; i < {jarray_id}.length; ++i)"
-				loop_body   = """\t\t\t{{{nit_type.id}}}_of_{{{gen_type}}}_add({{{narray_id}}}, {{{java_type.return_cast}}}{{{jarray_id}}}[i]);"""
-			end
+		var name = self.to_snake_case
+		if name.has_prefix("get_") then
+			name = name.substring_from(4)
+		else if name.has_prefix("set_") then
+			name = name.substring_from(4) + "="
 		end
 
-		return loop_header + "\n" + loop_body
+		return name
 	end
 end