contrib/jwrapper: avoid Nit keywords and mangle generated method names

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

diff --git a/contrib/jwrapper/src/model.nit b/contrib/jwrapper/src/model.nit
index 34792c9..4248b42 100644 (file)
--- a/contrib/jwrapper/src/model.nit
+++ b/contrib/jwrapper/src/model.nit
@@ -1,6 +1,7 @@
 # This file is part of NIT (http://www.nitlanguage.org).
 #
 # Copyright 2014 Frédéric Vachon <fredvac@gmail.com>
+# Copyright 2015 Alexis Laferrière <alexis.laf@xymus.net>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,6 +18,8 @@
 # Contains the java and nit type representation used to convert java to nit code
 module model
 
+import more_collections
+
 import jtype_converter
 
 class JavaType
@@ -81,8 +84,6 @@ class JavaType
                return nit_type
        end
 
-       fun is_iterable: Bool do return iterable.has(self.id)
-
        fun is_collection: Bool do return is_primitive_array or collections_list.has(self.id)
 
        fun is_wrapped: Bool do return find_extern_class != null
@@ -94,11 +95,13 @@ class JavaType
                var name
                if is_primitive_array then
                        # Primitive arrays have a special naming convention
-                       name = "Native" + extern_class_name.join("").capitalized + "Array"
+                       name = "Java" + extern_class_name.join.capitalized + "Array"
                else
-                       name = "Native" + extern_class_name.join("")
+                       name = "Java" + extern_class_name.join
                end
 
+               name = name.replace("-", "_")
+
                var nit_type = new NitType(name)
                nit_type.is_complete = false
                return nit_type
@@ -113,22 +116,15 @@ class JavaType
                return converter.cast_as_return(jtype)
        end
 
-       redef fun to_s: String
+       redef fun to_s
        do
                var id = self.full_id
 
                if self.is_primitive_array then
-                       for i in [0..array_dimension[ do
-                               id += "[]"
-                       end
+                       id += "[]" * array_dimension
                else if self.has_generic_params then
-                       var gen_list = new Array[String]
-
-                       for param in generic_params do
-                               gen_list.add(param.to_s)
-                       end
-
-                       id += "<{gen_list.join(", ")}>"
+                       var params = [for param in generic_params do param.to_s]
+                       id += "<{params.join(", ")}>"
                end
 
                return id
@@ -230,9 +226,9 @@ class JavaType
                return id
        end
 
-       fun collections_list: Array[String] is cached do return ["List", "ArrayList", "LinkedList", "Vector", "Set", "SortedSet", "HashSet", "TreeSet", "LinkedHashSet", "Map", "SortedMap", "HashMap", "TreeMap", "Hashtable", "LinkedHashMap"]
-       fun iterable: Array[String] is cached do return ["ArrayList", "Set", "HashSet", "LinkedHashSet", "LinkedList", "Stack", "TreeSet", "Vector"]
-       fun maps: Array[String] is cached do return ["Map", "SortedMap", "HashMap", "TreeMap", "Hashtable", "LinkedHashMap"]
+       var collections_list: Array[String] is lazy do return ["List", "ArrayList", "LinkedList", "Vector", "Set", "SortedSet", "HashSet", "TreeSet", "LinkedHashSet", "Map", "SortedMap", "HashMap", "TreeMap", "Hashtable", "LinkedHashMap"]
+       var iterable: Array[String] is lazy do return ["ArrayList", "Set", "HashSet", "LinkedHashSet", "LinkedList", "Stack", "TreeSet", "Vector"]
+       var maps: Array[String] is lazy do return ["Map", "SortedMap", "HashMap", "TreeMap", "Hashtable", "LinkedHashMap"]
 end
 
 class NitType
@@ -286,22 +282,28 @@ class NitType
        end
 end
 
+# Model of a single Java class
 class JavaClass
+       # Type of this class
        var class_type = new JavaType(new JavaTypeConverter)
+
+       # Attributes of this class
        var attributes = new HashMap[String, JavaType]
 
        # Methods of this class organized by their name
-       var methods = new HashMap[String, Array[JavaMethod]]
+       var methods = new MultiHashMap[String, JavaMethod]
 
-       var unknown_types = new HashSet[JavaType]
+       # Importations from this class
        var imports = new HashSet[NitModule]
+end
 
-       fun add_method(id: String, return_type: JavaType, params: Array[JavaType])
-       do
-               var signatures = methods.get_or_default(id, new Array[JavaMethod])
-               signatures.add(new JavaMethod(return_type, new Array[JavaType].from(params)))
-               methods[id] = signatures
-       end
+# Model of all the Java class analyzed in one run
+class JavaModel
+       # Unknown Java types used in `classes`
+       var unknown_types = new HashSet[JavaType]
+
+       # All analyzed classes
+       var classes = new Array[JavaClass]
 end
 
 # A Java method, with its signature