contrib/jwrapper: skip wrapping Java classes with invalid names

[nit.git] / contrib / jwrapper / src / code_generator.nit

diff --git a/contrib/jwrapper/src/code_generator.nit b/contrib/jwrapper/src/code_generator.nit
index dfa5cab..eed951a 100644 (file)
--- a/contrib/jwrapper/src/code_generator.nit
+++ b/contrib/jwrapper/src/code_generator.nit
@@ -66,6 +66,11 @@ class CodeGenerator
                file_out.write "\n"
 
                for key, jclass in model.classes do
+                       # Skip anonymous classes
+                       if jclass.class_type.is_anonymous then continue
+
+                       # Skip classes with an invalid name at the Java language level
+                       if jclass.class_type.extern_equivalent.has("-") then continue
 
                        generate_class_header(jclass.class_type)
 
@@ -80,7 +85,7 @@ class CodeGenerator
                        for constructor in jclass.constructors do
                                var complex = jclass.constructors.length != 1 and constructor.params.not_empty
                                var base_name = if complex then "from" else ""
-                               var name = jclass.nit_name_for(base_name, constructor.params, complex)
+                               var name = jclass.nit_name_for(base_name, constructor.params, complex, false)
 
                                generate_constructor(jclass, constructor, name)
                        end
@@ -174,6 +179,7 @@ class CodeGenerator
                        var nit_type = model.java_to_nit_type(jparam)
 
                        if not nit_type.is_known and comment_unknown_types then c = "#"
+                       if jparam.is_vararg then c = "#"
 
                        java_args.add "{jparam.param_cast}{nit_id}{nit_id_no}"
                        nit_params.add "{nit_id}{nit_id_no}: {nit_type}"
@@ -183,7 +189,7 @@ class CodeGenerator
 
                # Method identifier
                method_id = method_id.to_nit_method_name
-               method_id = java_class.nit_name_for(method_id, java_params, java_class.methods[java_method_id].length > 1)
+               method_id = java_class.nit_name_for(method_id, java_params, java_class.methods[java_method_id].length > 1, is_static == true)
 
                # Build the signature
                var nit_signature = new Array[String]
@@ -196,6 +202,7 @@ class CodeGenerator
                        return_type = model.java_to_nit_type(java_return_type)
 
                        if not return_type.is_known and comment_unknown_types then c = "#"
+                       if java_return_type.is_vararg then c = "#"
 
                        nit_signature.add ": " + return_type.to_s
                end
@@ -233,10 +240,11 @@ class CodeGenerator
                var nit_id = java_id
                if attribute.is_static then nit_id = java_class.class_type.extern_name.to_snake_case + "_" + nit_id
                nit_id = nit_id.to_nit_method_name
-               nit_id = java_class.nit_name_for(nit_id, [java_type], false)
+               nit_id = java_class.nit_name_for(nit_id, [java_type], false, attribute.is_static)
 
                var c = ""
                if not nit_type.is_known and comment_unknown_types then c = "#"
+               if java_type.is_vararg then c = "#"
 
                var recv
                if attribute.is_static then
@@ -282,6 +290,7 @@ class CodeGenerator
                                param_id = param_id.successor(1)
 
                                if not nit_type.is_known and comment_unknown_types then c = "#"
+                               if java_type.is_vararg then c = "#"
                        end
 
                        nit_params_s = "(" + nit_params.join(", ") + ")"
@@ -291,7 +300,7 @@ class CodeGenerator
                file_out.write """
        # Java constructor: {{{java_class}}}
 {{{c}}}        new {{{name}}}{{{nit_params_s}}} in "Java" `{
-{{{c}}}                return new {{{java_class}}}({{{java_params_s}}});
+{{{c}}}                return new {{{java_class.class_type.package_name}}}({{{java_params_s}}});
 {{{c}}}        `}
 
 """
@@ -360,10 +369,16 @@ redef class Sys
                "protected", "public", "return", "self", "super", "then", "true", "type", "var", "while",
 
        # Top-level methods
-               "class_name", "get_time", "hash", "is_same_type", "is_same_instance", "output",
+               "class_name", "get_time", "hash", "inspect", "inspect_head", "is_same_type",
+               "is_same_instance", "object_id", "output", "output_class_name", "sys", "to_s",
 
        # Pointer or JavaObject methods
                "free"])
+
+       # Name of methods used at the top-level
+       #
+       # Used by `JavaClass::nit_name_for` with static properties.
+       private var top_level_used_names = new HashSet[String]
 end
 
 redef class String
@@ -394,13 +409,13 @@ end
 
 redef class JavaClass
        # Property names used in this class
-       private var used_name = new HashSet[String]
+       private var used_names = new HashSet[String]
 
        # Get an available property name for the Java property with `name` and parameters
        #
        # If `use_parameters_name` then expect that there will be conflicts,
        # so use the types of `parameters` to build the name.
-       private fun nit_name_for(name: String, parameters: Array[JavaType], use_parameters_name: Bool): String
+       private fun nit_name_for(name: String, parameters: Array[JavaType], use_parameters_name: Bool, is_static: Bool): String
        do
                # Append the name of each parameter
                if use_parameters_name then
@@ -409,15 +424,21 @@ redef class JavaClass
                        end
                end
 
+               # Set of property names, local or top-level
+               var used_names
+               if is_static then
+                       used_names = sys.top_level_used_names
+               else used_names = self.used_names
+
                # As a last resort, append numbers to the name
                var base_name = name
                var count = 1
-               while used_name.has(name) do
+               while used_names.has(name) do
                        name = base_name + count.to_s
                        count += 1
                end
 
-               used_name.add name
+               used_names.add name
                return name
        end
 end