contrib/jwrapper: generate top-level methods for static functions

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/jwrapper/src/code_generator.nit b/contrib/jwrapper/src/code_generator.nit
index 0c8ac74..2ed3020 100644 (file)
--- a/contrib/jwrapper/src/code_generator.nit
+++ b/contrib/jwrapper/src/code_generator.nit
@@ -70,7 +70,7 @@ class CodeGenerator
                        generate_class_header(jclass.class_type)
 
                        for id, signatures in jclass.methods do
-                               for signature in signatures do
+                               for signature in signatures do if not signature.is_static then
                                        generate_method(jclass, id, id, signature.return_type, signature.params)
                                        file_out.write "\n"
                                end
@@ -90,7 +90,18 @@ class CodeGenerator
                                generate_getter_setter(jclass, id, java_type)
                        end
 
+                       # Close the class
                        file_out.write "end\n\n"
+
+                       # Static functions as top-level methods
+                       var static_functions_prefix = jclass.class_type.extern_name.to_snake_case
+                       for id, signatures in jclass.methods do
+                               for signature in signatures do if signature.is_static then
+                                       var nit_id = static_functions_prefix + "_" + id
+                                       generate_method(jclass, id, nit_id, signature.return_type, signature.params, is_static=true)
+                                       file_out.write "\n"
+                               end
+                       end
                end
 
                if stub_for_unknown_types then
@@ -137,7 +148,7 @@ class CodeGenerator
        end
 
        private fun generate_method(java_class: JavaClass, java_method_id, method_id: String,
-               java_return_type: JavaType, java_params: Array[JavaType])
+               java_return_type: JavaType, java_params: Array[JavaType], is_static: nullable Bool)
        do
                var java_args = new Array[String]
                var nit_params = new Array[String]
@@ -179,15 +190,25 @@ class CodeGenerator
                end
 
                # Build the call in Java
-               var java_call = "self.{java_method_id}({java_args.join(", ")})"
+               var java_call
+               if is_static == true then
+                       java_call = java_class.class_type.to_package_name
+               else java_call = "self"
+               java_call += ".{java_method_id}({java_args.join(", ")})"
+
                if return_type != null then java_call = "return {java_return_type.return_cast}" + java_call
 
+               # Tabulation
+               var t = "\t"
+               if is_static == true then t = ""
+               var ct = c+t
+
                # Write
                file_out.write """
-       # Java implementation: {{{java_return_type}}} {{{java_class}}}.{{{java_method_id}}}({{{java_params.join(", ")}}})
-{{{c}}}        {{{nit_signature.join}}} in "Java" `{
-{{{c}}}                {{{java_call}}};
-{{{c}}}        `}
+{{{t}}}# Java implementation: {{{java_return_type}}} {{{java_class}}}.{{{java_method_id}}}({{{java_params.join(", ")}}})
+{{{ct}}}{{{nit_signature.join}}} in "Java" `{
+{{{ct}}}       {{{java_call}}};
+{{{ct}}}`}
 """
        end
 

diff --git a/contrib/jwrapper/src/javap_visitor.nit b/contrib/jwrapper/src/javap_visitor.nit
index c3e5f98..e4a8cfb 100644 (file)
--- a/contrib/jwrapper/src/javap_visitor.nit
+++ b/contrib/jwrapper/src/javap_visitor.nit
@@ -80,6 +80,10 @@ end
 redef class Nproperty_declaration_method
        redef fun accept_visitor(v)
        do
+               var is_static = false
+               var modifiers = n_modifier
+               if modifiers != null then is_static = modifiers.has_static
+
                var id = n_identifier.text
                var return_jtype = n_type.to_java_type
 
@@ -90,7 +94,7 @@ redef class Nproperty_declaration_method
                        params = n_parameters.to_a
                else params = new Array[JavaType]
 
-               var method = new JavaMethod(return_jtype, params)
+               var method = new JavaMethod(is_static, return_jtype, params)
                v.java_class.methods[id].add method
        end
 end
@@ -257,3 +261,14 @@ redef class Nparameter
                return jtype
        end
 end
+
+redef class Nodes
+       private fun has_static: Bool
+       do
+               for modifier in depth do
+                       if modifier isa NToken and modifier.text == "static" then return true
+               end
+
+               return false
+       end
+end

diff --git a/contrib/jwrapper/src/model.nit b/contrib/jwrapper/src/model.nit
index 8d6da40..964e5cc 100644 (file)
--- a/contrib/jwrapper/src/model.nit
+++ b/contrib/jwrapper/src/model.nit
@@ -226,8 +226,17 @@ class JavaModel
        end
 end
 
+# A property to a Java class
+abstract class JavaProperty
+
+       # Is this property marked static?
+       var is_static: Bool
+end
+
 # A Java method, with its signature
 class JavaMethod
+       super JavaProperty
+
        # Type returned by the method
        var return_type: JavaType