for key, jclass in model.classes do
- file_out.write gen_class_header(jclass.class_type)
+ generate_class_header(jclass.class_type)
for id, signatures in jclass.methods do
- var c = 0
for signature in signatures do
- var nid = id
- if c > 0 then nid += c.to_s
- c += 1
-
- file_out.write gen_method(jclass, id, nid, signature.return_type, signature.params)
+ generate_method(jclass, id, id, signature.return_type, signature.params)
file_out.write "\n"
end
end
end
if stub_for_unknown_types then
- for jtype in model.unknown_types do
- file_out.write gen_unknown_class_header(jtype)
+ for jtype, nit_type in model.unknown_types do
+ generate_unknown_class_header(jtype)
file_out.write "\n"
end
end
# This code has been generated using `jwrapper`
""" is writable
- fun gen_class_header(jtype: JavaType): String
+ private fun generate_class_header(jtype: JavaType)
do
- var temp = new Array[String]
- var nit_type = jtype.to_nit_type
- temp.add "# Java class: {jtype.to_package_name}\n"
- temp.add "extern class {nit_type} in \"Java\" `\{ {jtype.to_package_name} `\}\n"
- temp.add "\tsuper JavaObject\n\n"
-
- return temp.join
+ var nit_type = model.java_to_nit_type(jtype)
+ file_out.write "# Java class: {jtype.to_package_name}\n"
+ file_out.write "extern class {nit_type} in \"Java\" `\{ {jtype.to_package_name} `\}\n"
+ file_out.write "\tsuper JavaObject\n\n"
end
- fun gen_unknown_class_header(jtype: JavaType): String
+ private fun generate_unknown_class_header(jtype: JavaType)
do
var nit_type = jtype.extern_name
- var temp = new Array[String]
- temp.add("extern class {nit_type} in \"Java\" `\{ {jtype.to_package_name} `\}\n")
- temp.add("\tsuper JavaObject\n\nend\n")
-
- return temp.join
+ file_out.write "extern class {nit_type} in \"Java\" `\{ {jtype.to_package_name} `\}\n"
+ file_out.write "\tsuper JavaObject\n\nend\n"
end
- fun gen_method(java_class: JavaClass, jmethod_id, nmethod_id: String, jreturn_type: JavaType, jparam_list: Array[JavaType]): String
+ private fun generate_method(java_class: JavaClass, jmethod_id, method_id: String,
+ jreturn_type: JavaType, jparam_list: Array[JavaType])
do
var java_params = ""
var nit_params = ""
# Parameters
for i in [0..jparam_list.length[ do
var jparam = jparam_list[i]
- var nit_type = jparam.to_nit_type
-
- if not nit_type.is_complete then
- if jparam.is_wrapped then
- java_class.imports.add nit_type.mod.as(not null)
- else
- model.unknown_types.add jparam
- if comment_unknown_types then
- comment = "#"
- else
- nit_type = jparam.extern_name
- end
- end
- end
+ var nit_type = model.java_to_nit_type(jparam)
- var cast = ""
+ if not nit_type.is_known then comment = "#"
- if not jparam.is_collection then cast = jparam.param_cast
+ var cast = jparam.param_cast
nit_types.add(nit_type)
var doc = "\t# Java implementation: {java_class}.{jmethod_id}\n"
# Method identifier
- var method_id = nmethod_id.to_nit_method_name
+ method_id = method_id.to_nit_method_name
method_id = java_class.nit_name_for(method_id, jparam_list, java_class.methods[jmethod_id].length > 1)
var nit_signature = new Array[String]
end
var return_type = null
-
if not jreturn_type.is_void then
- return_type = jreturn_type.to_nit_type
-
- if not return_type.is_complete then
- if jreturn_type.is_wrapped then
- java_class.imports.add return_type.mod.as(not null)
- else
- model.unknown_types.add jreturn_type
- if comment_unknown_types then
- comment = "#"
- else
- return_type = jreturn_type.extern_name
- end
- end
- end
+ return_type = model.java_to_nit_type(jreturn_type)
+
+ if not return_type.is_known then comment = "#"
nit_signature.add ": {return_type} "
end
- var temp = new Array[String]
-
- temp.add doc
- temp.add(comment + nit_signature.join)
+ file_out.write doc
+ file_out.write comment + nit_signature.join
if comment == "#" then
- temp.add(" in \"Java\" `\{\n{comment}\t\tself.{jmethod_id}({java_params});\n{comment}\t`\}\n")
+ file_out.write " in \"Java\" `\{\n{comment}\t\tself.{jmethod_id}({java_params});\n{comment}\t`\}\n"
# Methods with return type
else if return_type != null then
- temp.add(" in \"Java\" `\{\n{comment}\t\treturn {jreturn_type.return_cast}self.{jmethod_id}({java_params});\n{comment}\t`\}\n")
+ file_out.write " in \"Java\" `\{\n{comment}\t\treturn {jreturn_type.return_cast}self.{jmethod_id}({java_params});\n{comment}\t`\}\n"
# Methods without return type
else if jreturn_type.is_void then
- temp.add(" in \"Java\" `\{\n{comment}\t\tself.{jmethod_id}({java_params});\n{comment}\t`\}\n")
+ file_out.write " in \"Java\" `\{\n{comment}\t\tself.{jmethod_id}({java_params});\n{comment}\t`\}\n"
# No copy
else
- temp.add(" in \"Java\" `\{\n{comment}\t\tself.{jmethod_id}({java_params});\n{comment}\t`\}\n")
+ file_out.write " in \"Java\" `\{\n{comment}\t\tself.{jmethod_id}({java_params});\n{comment}\t`\}\n"
end
-
- return temp.join
end
# Generate getter and setter to access an attribute, of field
# List of Nit keywords
#
# These may also be keywords in Java, but there they would be used capitalized.
- private var nit_keywords: Array[String] = ["abort", "abstract", "and", "assert",
+ 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"]
+ "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",
+
+ # Pointer or JavaObject methods
+ "free"])
end
redef class String
nitlanguage / nit.git / blobdiff