github_merge: skip issues (not PR)

[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 e716a2e..4014c75 100644 (file)
--- a/contrib/jwrapper/src/code_generator.nit
+++ b/contrib/jwrapper/src/code_generator.nit
@@ -18,6 +18,8 @@
 # Services to generate extern class `in "Java"`
 module code_generator
 
+import gen_nit
+
 intrude import model
 
 class CodeGenerator
@@ -198,14 +200,14 @@ class CodeGenerator
                end
 
                if effective_supers == 0 then
-                       if java_class.class_type.package_name == "java.lang.Object" or
+                       if java_class.class_type.java_full_name == "java.lang.Object" or
                           not model.knows_the_object_class then
                                supers.add "super JavaObject"
                        else supers.add "super Java_lang_Object"
                end
 
                file_out.write """
-# Java class: {{{java_type}}}
+# Java class: {{{java_type.extern_equivalent}}}
 extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
        {{{supers.join("\n\t")}}}
 
@@ -265,7 +267,7 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
                # Build the call in Java
                var java_call
                if is_static == true then
-                       java_call = java_class.class_type.package_name
+                       java_call = java_class.class_type.java_full_name
                else java_call = "self"
                java_call += ".{java_method_id}({java_args.join(", ")})"
 
@@ -278,7 +280,7 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
 
                # Write
                file_out.write """
-{{{t}}}# Java implementation: {{{java_return_type}}} {{{java_class}}}.{{{java_method_id}}}({{{java_params.join(", ")}}})
+{{{t}}}# Java implementation: {{{java_return_type}}} {{{java_class.class_type.extern_equivalent}}}.{{{java_method_id}}}({{{java_params.join(", ")}}})
 {{{ct}}}{{{nit_signature.join}}} in "Java" `{
 {{{ct}}}       {{{java_call}}};
 {{{ct}}}`}
@@ -303,7 +305,7 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
 
                var recv
                if attribute.is_static then
-                       recv = java_class.class_type.package_name
+                       recv = java_class.class_type.java_full_name
                else recv = "self"
 
                # Tabulation
@@ -312,12 +314,12 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
                var ct = c+t
 
                file_out.write """
-{{{t}}}# Java getter: {{{java_class}}}.{{{java_id}}}
+{{{t}}}# Java getter: {{{java_class.class_type.extern_equivalent}}}.{{{java_id}}}
 {{{ct}}}fun {{{nit_id}}}: {{{nit_type}}} in "Java" `{
 {{{ct}}}       return {{{recv}}}.{{{java_id}}};
 {{{ct}}}`}
 
-{{{t}}}# Java setter: {{{java_class}}}.{{{java_id}}}
+{{{t}}}# Java setter: {{{java_class.class_type.extern_equivalent}}}.{{{java_id}}}
 {{{ct}}}fun {{{nit_id}}}=(value: {{{nit_type}}}) in "Java" `{
 {{{ct}}}       {{{recv}}}.{{{java_id}}} = value;
 {{{ct}}}`}
@@ -353,9 +355,9 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
                end
 
                file_out.write """
-       # Java constructor: {{{java_class}}}
+       # Java constructor: {{{java_class.class_type.extern_equivalent}}}
 {{{c}}}        new {{{name}}}{{{nit_params_s}}} in "Java" `{
-{{{c}}}                return new {{{java_class.class_type.package_name}}}({{{java_params_s}}});
+{{{c}}}                return new {{{java_class.class_type.java_full_name}}}({{{java_params_s}}});
 {{{c}}}        `}
 
 """
@@ -371,7 +373,7 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
                var nit_type = model.java_to_nit_type(java_type)
 
                file_out.write """
-# Java primitive array: {{{java_type}}}
+# Java primitive array: {{{java_type.extern_equivalent}}}
 extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `}
        super AbstractJavaArray[{{{base_nit_type}}}]
 
@@ -417,18 +419,12 @@ redef class Sys
        # List of Nit keywords
        #
        # These may also be keywords in Java, but there they would be used capitalized.
-       private var nit_keywords = new HashSet[String].from(["abort", "abstract", "and", "assert",
-               "break", "class", "continue", "do", "else", "end", "enum", "extern", "false", "implies",
-               "import", "init", "interface", "intrude", "if", "in", "is", "isa", "isset", "for", "label",
-               "loop", "module", "new", "not", "null", "nullable", "or", "package", "private",
-               "protected", "public", "return", "self", "super", "then", "true", "type", "var", "while",
-
-       # Top-level methods
-               "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"])
+       private var nit_keywords: Set[String] is lazy do
+               var set = new HashSet[String]
+               set.add_all keywords
+               set.add_all methods_in_pointer
+               return set
+       end
 
        # Name of methods used at the top-level
        #