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

diff --git a/src/ffi/java.nit b/src/ffi/java.nit
index 7be54ce..eca32ac 100644
--- a/src/ffi/java.nit
+++ b/src/ffi/java.nit
@@ -96,7 +96,6 @@ class JavaLanguage
 
 		var jni_signature_alt
 		var return_type
-		var c_return_type
 		var params = new Array[String]
 		params.add "nit_ffi_jni_env"
 		params.add "java_class"
@@ -105,19 +104,16 @@ class JavaLanguage
 		if mproperty.is_init then
 			jni_signature_alt = mclass_type.jni_signature_alt
 			return_type = mclass_type
-			c_return_type = mclass_type.cname
 		else
-			params.add "recv"
+			params.add "self"
 			if signature.return_mtype != null then
 				var ret_mtype = signature.return_mtype
 				ret_mtype = ret_mtype.resolve_for(mclass_type, mclass_type, mmodule, true)
 				return_type = signature.return_mtype
-				c_return_type = mclass_type.cname
 				jni_signature_alt = return_type.jni_signature_alt
 			else
 				jni_signature_alt = "Void"
 				return_type = null
-				c_return_type = null
 			end
 		end
 
@@ -159,6 +155,8 @@ class JavaLanguage
 		{{{block.code}}}
 	}
 """
+
+		mmodule.callbacks_used_from_java.join m.foreign_callbacks
 	end
 
 	redef fun compile_extern_class(block, m, ccu, mmodule) do end
@@ -174,7 +172,7 @@ class JavaLanguage
 		mmodule.insert_compiler_options
 
 		# Enable linking C callbacks to java native methods
-		mmodule.ensure_linking_callback_methods(ffi_ccu.as(not null), mmodule.ffi_callbacks[self])
+		mmodule.ensure_linking_callback_methods(ffi_ccu.as(not null))
 
 		# Java implementation code
 		var java_file = mmodule.java_file
@@ -193,6 +191,7 @@ class JavaLanguage
 end
 
 redef class MModule
+	private var callbacks_used_from_java = new ForeignCallbackSet
 
 	# Pure java class source file
 	private var java_file: nullable JavaClassTemplate = null
@@ -207,8 +206,9 @@ redef class MModule
 	end
 
 	# Compile C code to call JNI and link C callbacks implementations to Java extern methods
-	private fun ensure_linking_callback_methods(ccu: CCompilationUnit, callbacks: Set[NitniCallback])
+	private fun ensure_linking_callback_methods(ccu: CCompilationUnit)
 	do
+		var callbacks = callbacks_used_from_java.callbacks
 		if callbacks.is_empty then
 			ccu.body_decl.add "static int nit_ffi_with_java_registered_natives = 1;\n"
 			return
@@ -221,7 +221,7 @@ redef class MModule
 			jni_methods.add_all(cb.jni_methods_declaration(self))
 		end
 
-		var cf = new CFunction("static void nit_ffi_with_java_register_natives(JNIEnv* env, jclass jclazz)")
+		var cf = new CFunction("void nit_ffi_with_java_register_natives(JNIEnv* env, jclass jclazz)")
 		cf.exprs.add """
 	nit_ffi_with_java_registered_natives = 1;
 
@@ -242,8 +242,7 @@ redef class MModule
 	# Tell the C compiler where to find jni.h and how to link with libjvm
 	private fun insert_compiler_options
 	do
-		c_compiler_options = "{c_compiler_options} -I $(JAVA_HOME)/include/"
-		c_linker_options = "{c_linker_options} -L $(JNI_LIB_PATH) -ljvm"
+		cflags.add_one("", "-I $(JAVA_HOME)/include/ -I $(JAVA_HOME)/include/linux/")
 	end
 
 	# Name of the generated Java class where to store all implementation methods of this module
@@ -262,16 +261,15 @@ redef class AMethPropdef
 		end
 	end
 
-	# Insert additionnal explicit calls to get the current `JNIEnv`
+	# Insert additional explicit calls to get the current `JNIEnv`
 	#
 	# This forces declaration of callbacks to Nit. The callbacks will be available in Java
 	# but will be used mainly by the FFI itself.
 	#
-	# The developper can aso customize the JNIEnv used by the FFI by redefing `Sys::jni_env`.
+	# The developer can also customize the JNIEnv used by the FFI by redefining `Sys::jni_env`.
 	private fun insert_artificial_callbacks(toolcontext: ToolContext)
 	do
 		var fcc = foreign_callbacks
-		assert fcc != null
 
 		var modelbuilder = toolcontext.modelbuilder
 		var mmodule = mpropdef.mclassdef.mmodule
@@ -297,7 +295,7 @@ redef class AMethPropdef
 		assert sys_class != null
 		var sys_jni_env_meth = modelbuilder.try_get_mproperty_by_name2(self, mmodule, sys_class.mclass_type, "jni_env")
 		if sys_jni_env_meth == null or not sys_jni_env_meth isa MMethod then
-			toolcontext.error(self.location, "Java FFI error: you must import the `java` module when using the FFI with Java")
+			toolcontext.error(self.location, "Java FFI Error: you must import the `java` module when using the FFI with Java")
 			return
 		end
 
@@ -335,7 +333,6 @@ class JavaClassTemplate
 	super Template
 
 	var java_class_name: String
-	init(name: String) do self.java_class_name = name
 
 	var header = new Template
 	var class_content = new Template
@@ -365,7 +362,7 @@ class JavaFile
 	super ExternFile
 
 	redef fun makefile_rule_name do return "{filename.basename(".java")}.class"
-	redef fun makefile_rule_content do return "javac {filename.basename("")} -d ."
+	redef fun makefile_rule_content do return "javac {filename.basename} -d ."
 	redef fun add_to_jar do return true
 end
 
@@ -399,7 +396,6 @@ class ForeignJavaType
 	super ForeignType
 
 	var java_type: String
-	init (java_type: String) do self.java_type = java_type
 end
 
 redef class NitniCallback
@@ -418,6 +414,8 @@ end
 redef class MExplicitCall
 	redef fun compile_callback_to_java(mmodule, mainmodule, ccu)
 	do
+		if not mmodule.callbacks_used_from_java.callbacks.has(self) then return
+
 		var mproperty = mproperty
 		assert mproperty isa MMethod
 
@@ -425,7 +423,7 @@ redef class MExplicitCall
 		var csignature = mproperty.build_c_implementation_signature(recv_mtype, mmodule, "___indirect", long_signature, from_java_call_context)
 		var cf = new CFunction("JNIEXPORT {csignature}")
 		cf.exprs.add "\t{mproperty.build_ccall(recv_mtype, mainmodule, null, long_signature, from_java_call_context, null)}\n"
-		ccu.add_local_function cf
+		ccu.add_non_static_local_function cf
 
 		# In Java, declare the extern method as a private static local method
 		var java_signature = mproperty.build_csignature(recv_mtype, mainmodule, null, short_signature, java_call_context)
@@ -450,7 +448,7 @@ redef class MType
 	# Type name in Java
 	#
 	# * Primitives common to both languages use their Java primitive type
-	# * Nit extern Java classes are reprensented by their full Java type
+	# * Nit extern Java classes are represented by their full Java type
 	# * Other Nit objects are represented by `int` in Java. It holds the
 	#	pointer to the underlying C structure.
 	#	TODO create static Java types to store and hide the pointer
@@ -459,7 +457,7 @@ redef class MType
 	# JNI type name (in C)
 	#
 	# So this is a C type, usually defined in `jni.h`
-	private fun jni_type: String do return "jint"
+	private fun jni_type: String do return "long"
 
 	# JNI short type name (for signatures)
 	#
@@ -481,9 +479,15 @@ redef class MClassType
 		if ftype isa ForeignJavaType then return ftype.java_type.
 			replace('/', ".").replace('$', ".").replace(' ', "").replace('\n',"")
 		if mclass.name == "Bool" then return "boolean"
-		if mclass.name == "Char" then return "char"
+		if mclass.name == "Char" then return "int"
 		if mclass.name == "Int" then return "long"
 		if mclass.name == "Float" then return "double"
+		if mclass.name == "Byte" then return "byte"
+		if mclass.name == "Int8" then return "byte"
+		if mclass.name == "Int16" then return "short"
+		if mclass.name == "UInt16" then return "short"
+		if mclass.name == "Int32" then return "int"
+		if mclass.name == "UInt32" then return "int"
 		return super
 	end
 
@@ -492,9 +496,15 @@ redef class MClassType
 		var ftype = mclass.ftype
 		if ftype isa ForeignJavaType then return "jobject"
 		if mclass.name == "Bool" then return "jboolean"
-		if mclass.name == "Char" then return "jchar"
+		if mclass.name == "Char" then return "jint"
 		if mclass.name == "Int" then return "jlong"
 		if mclass.name == "Float" then return "jdouble"
+		if mclass.name == "Byte" then return "jbyte"
+		if mclass.name == "Int8" then return "jbyte"
+		if mclass.name == "Int16" then return "jshort"
+		if mclass.name == "UInt16" then return "jshort"
+		if mclass.name == "Int32" then return "jint"
+		if mclass.name == "UInt32" then return "jint"
 		return super
 	end
 
@@ -502,7 +512,6 @@ redef class MClassType
 	do
 		var ftype = mclass.ftype
 		if ftype isa ForeignJavaType then
-			var ori_jni_type = jni_type
 			var jni_type = ftype.java_type.
 				replace('.', "/").replace(' ', "").replace('\n', "")
 
@@ -520,23 +529,65 @@ redef class MClassType
 				else break
 			end
 
+			# Change `float[]` to `[float`
+			if jni_type.has('[') then
+				var depth = jni_type.chars.count('[')
+				var java_type = jni_type.replace("[]", "")
+				var short
+
+				if java_type == "boolean" then
+					short = "Z"
+				else if java_type == "byte" then
+					short = "B"
+				else if java_type == "char" then
+					short = "C"
+				else if java_type == "short" then
+					short = "S"
+				else if java_type == "int" then
+					short = "I"
+				else if java_type == "long" then
+					short = "J"
+				else if java_type == "float" then
+					short = "F"
+				else if java_type == "double" then
+					short = "D"
+				else
+					short = "L{java_type};"
+				end
+
+				return "["*depth + short
+			end
+
 			return "L{jni_type};"
 		end
 		if mclass.name == "Bool" then return "Z"
-		if mclass.name == "Char" then return "C"
+		if mclass.name == "Char" then return "I"
 		if mclass.name == "Int" then return "J"
 		if mclass.name == "Float" then return "D"
+		if mclass.name == "Byte" then return "B"
+		if mclass.name == "Int8" then return "B"
+		if mclass.name == "Int16" then return "S"
+		if mclass.name == "UInt16" then return "S"
+		if mclass.name == "Int32" then return "I"
+		if mclass.name == "UInt32" then return "I"
 		return super
 	end
 
 	redef fun jni_signature_alt
 	do
 		var ftype = mclass.ftype
+
 		if ftype isa ForeignJavaType then return "Object"
 		if mclass.name == "Bool" then return "Boolean"
-		if mclass.name == "Char" then return "Char"
+		if mclass.name == "Char" then return "Int"
 		if mclass.name == "Int" then return "Long"
 		if mclass.name == "Float" then return "Double"
+		if mclass.name == "Byte" then return "Byte"
+		if mclass.name == "Int8" then return "Byte"
+		if mclass.name == "Int16" then return "Short"
+		if mclass.name == "UInt16" then return "Short"
+		if mclass.name == "Int32" then return "Int"
+		if mclass.name == "UInt32" then return "Int"
 		return super
 	end
 end
@@ -575,7 +626,7 @@ redef class MMethod
 			else format.add "V"
 		end
 
-		return format.join("")
+		return format.join
 	end
 
 	# Similar to `build_c_signature` but adapted to create the signature expected by JNI for C functions
@@ -609,7 +660,7 @@ redef class MMethod
 		cparams.add "jclass clazz"
 
 		if not self.is_init then
-			cparams.add "{call_context.name_mtype(recv_mtype)} recv"
+			cparams.add "{call_context.name_mtype(recv_mtype)} self"
 		end
 		for p in signature.mparameters do
 			var param_mtype = p.mtype.resolve_for(recv_mtype, recv_mtype, from_mmodule, true)
@@ -623,3 +674,17 @@ end
 private fun java_call_context: JavaCallContext do return new JavaCallContext
 private fun to_java_call_context: ToJavaCallContext do return new ToJavaCallContext
 private fun from_java_call_context: FromJavaCallContext do return new FromJavaCallContext
+
+redef class CCompilationUnit
+	# Similar to `add_local_function` but not `static`
+	#
+	# Used when the signature contains a visibility attribute.
+	private fun add_non_static_local_function(c_function: CFunction)
+	do
+		body_decl.add c_function.signature
+		body_decl.add ";\n"
+
+		body_impl.add "\n"
+		body_impl.add c_function.to_writer
+	end
+end