X-Git-Url: http://nitlanguage.org

diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit
index 76d2e6c..544a23f 100644
--- a/src/abstract_compiler.nit
+++ b/src/abstract_compiler.nit
@@ -29,6 +29,8 @@ redef class ToolContext
 	var opt_output: OptionString = new OptionString("Output file", "-o", "--output")
 	# --no-cc
 	var opt_no_cc: OptionBool = new OptionBool("Do not invoke C compiler", "--no-cc")
+	# --no-main
+	var opt_no_main: OptionBool = new OptionBool("Do not generate main entry point", "--no-main")
 	# --cc-paths
 	var opt_cc_path: OptionArray = new OptionArray("Set include path for C header files (may be used more than once)", "--cc-path")
 	# --make-flags
@@ -59,15 +61,18 @@ redef class ToolContext
 	var opt_stacktrace: OptionString = new OptionString("Control the generation of stack traces", "--stacktrace")
 	# --no-gcc-directives
 	var opt_no_gcc_directive = new OptionArray("Disable a advanced gcc directives for optimization", "--no-gcc-directive")
+	# --release
+	var opt_release = new OptionBool("Compile in release mode and finalize application", "--release")
 
 	redef init
 	do
 		super
-		self.option_context.add_option(self.opt_output, self.opt_no_cc, self.opt_make_flags, self.opt_compile_dir, self.opt_hardening, self.opt_no_shortcut_range)
+		self.option_context.add_option(self.opt_output, self.opt_no_cc, self.opt_no_main, self.opt_make_flags, self.opt_compile_dir, self.opt_hardening, self.opt_no_shortcut_range)
 		self.option_context.add_option(self.opt_no_check_covariance, self.opt_no_check_attr_isset, self.opt_no_check_assert, self.opt_no_check_autocast, self.opt_no_check_other)
 		self.option_context.add_option(self.opt_typing_test_metrics, self.opt_invocation_metrics, self.opt_isset_checks_metrics)
 		self.option_context.add_option(self.opt_stacktrace)
 		self.option_context.add_option(self.opt_no_gcc_directive)
+		self.option_context.add_option(self.opt_release)
 	end
 
 	redef fun process_options(args)
@@ -491,6 +496,12 @@ abstract class AbstractCompiler
 		self.header.add_decl("#include <stdio.h>")
 		self.header.add_decl("#include <string.h>")
 		self.header.add_decl("#include \"gc_chooser.h\"")
+		self.header.add_decl("#ifdef ANDROID")
+		self.header.add_decl("	#include <android/log.h>")
+		self.header.add_decl("	#define PRINT_ERROR(...) (void)__android_log_print(ANDROID_LOG_WARN, \"Nit\", __VA_ARGS__)")
+		self.header.add_decl("#else")
+		self.header.add_decl("	#define PRINT_ERROR(...) fprintf(stderr, __VA_ARGS__)")
+		self.header.add_decl("#endif")
 
 		compile_header_structs
 		compile_nitni_structs
@@ -538,9 +549,9 @@ abstract class AbstractCompiler
 		var v = self.new_visitor
 		v.add_decl("#include <signal.h>")
 		var ost = modelbuilder.toolcontext.opt_stacktrace.value
+		var platform = mainmodule.target_platform
 
 		if ost == null then
-			var platform = mainmodule.target_platform
 			if platform != null and not platform.supports_libunwind then
 				ost = "none"
 			else
@@ -549,6 +560,8 @@ abstract class AbstractCompiler
 			modelbuilder.toolcontext.opt_stacktrace.value = ost
 		end
 
+		if platform != null and platform.no_main then modelbuilder.toolcontext.opt_no_main.value = true
+
 		if ost == "nitstack" or ost == "libunwind" then
 			v.add_decl("#define UNW_LOCAL_ONLY")
 			v.add_decl("#include <libunwind.h>")
@@ -588,7 +601,7 @@ abstract class AbstractCompiler
 		end
 
 		v.add_decl("void sig_handler(int signo)\{")
-		v.add_decl("printf(\"Caught signal : %s\\n\", strsignal(signo));")
+		v.add_decl("PRINT_ERROR(\"Caught signal : %s\\n\", strsignal(signo));")
 		v.add_decl("show_backtrace(signo);")
 		v.add_decl("\}")
 
@@ -602,30 +615,34 @@ abstract class AbstractCompiler
 			v.add_decl("char* procname = malloc(sizeof(char) * 100);")
 			v.add_decl("unw_getcontext(&uc);")
 			v.add_decl("unw_init_local(&cursor, &uc);")
-			v.add_decl("printf(\"-------------------------------------------------\\n\");")
-			v.add_decl("printf(\"--   Stack Trace   ------------------------------\\n\");")
-			v.add_decl("printf(\"-------------------------------------------------\\n\");")
+			v.add_decl("PRINT_ERROR(\"-------------------------------------------------\\n\");")
+			v.add_decl("PRINT_ERROR(\"--   Stack Trace   ------------------------------\\n\");")
+			v.add_decl("PRINT_ERROR(\"-------------------------------------------------\\n\");")
 			v.add_decl("while (unw_step(&cursor) > 0) \{")
 			v.add_decl("	unw_get_proc_name(&cursor, procname, 100, &ip);")
 			if ost == "nitstack" then
 			v.add_decl("	const char* recv = get_nit_name(procname, strlen(procname));")
 			v.add_decl("	if (recv != NULL)\{")
-			v.add_decl("		printf(\"` %s\\n\", recv);")
+			v.add_decl("		PRINT_ERROR(\"` %s\\n\", recv);")
 			v.add_decl("	\}else\{")
-			v.add_decl("		printf(\"` %s\\n\", procname);")
+			v.add_decl("		PRINT_ERROR(\"` %s\\n\", procname);")
 			v.add_decl("	\}")
 			else
-			v.add_decl("	printf(\"` %s \\n\",procname);")
+			v.add_decl("	PRINT_ERROR(\"` %s \\n\",procname);")
 			end
 			v.add_decl("\}")
-			v.add_decl("printf(\"-------------------------------------------------\\n\");")
+			v.add_decl("PRINT_ERROR(\"-------------------------------------------------\\n\");")
 			v.add_decl("free(procname);")
 			v.add_decl("\}")
 		end
 		v.add_decl("exit(signo);")
 		v.add_decl("\}")
 
-		v.add_decl("int main(int argc, char** argv) \{")
+		if modelbuilder.toolcontext.opt_no_main.value then
+			v.add_decl("int nit_main(int argc, char** argv) \{")
+		else
+			v.add_decl("int main(int argc, char** argv) \{")
+		end
 
 		v.add("signal(SIGABRT, sig_handler);")
 		v.add("signal(SIGFPE, sig_handler);")
@@ -1209,16 +1226,16 @@ abstract class AbstractCompilerVisitor
 	# used by aborts, asserts, casts, etc.
 	fun add_abort(message: String)
 	do
-		self.add("fprintf(stderr, \"Runtime error: %s\", \"{message.escape_to_c}\");")
+		self.add("PRINT_ERROR(\"Runtime error: %s\", \"{message.escape_to_c}\");")
 		add_raw_abort
 	end
 
 	fun add_raw_abort
 	do
 		if self.current_node != null and self.current_node.location.file != null then
-			self.add("fprintf(stderr, \" (%s:%d)\\n\", \"{self.current_node.location.file.filename.escape_to_c}\", {current_node.location.line_start});")
+			self.add("PRINT_ERROR(\" (%s:%d)\\n\", \"{self.current_node.location.file.filename.escape_to_c}\", {current_node.location.line_start});")
 		else
-			self.add("fprintf(stderr, \"\\n\");")
+			self.add("PRINT_ERROR(\"\\n\");")
 		end
 		self.add("show_backtrace(1);")
 	end
@@ -1229,7 +1246,7 @@ abstract class AbstractCompilerVisitor
 		var res = self.type_test(value, mtype, tag)
 		self.add("if (unlikely(!{res})) \{")
 		var cn = self.class_name_string(value)
-		self.add("fprintf(stderr, \"Runtime error: Cast failed. Expected `%s`, got `%s`\", \"{mtype.to_s.escape_to_c}\", {cn});")
+		self.add("PRINT_ERROR(\"Runtime error: Cast failed. Expected `%s`, got `%s`\", \"{mtype.to_s.escape_to_c}\", {cn});")
 		self.add_raw_abort
 		self.add("\}")
 	end
@@ -1616,7 +1633,7 @@ end
 redef class APropdef
 	fun compile_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable])
 	do
-		v.add("printf(\"NOT YET IMPLEMENTED {class_name} {mpropdef} at {location.to_s}\\n\");")
+		v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED {class_name} {mpropdef} at {location.to_s}\\n\");")
 		debug("Not yet implemented")
 	end
 
@@ -1904,7 +1921,7 @@ redef class AMethPropdef
 			v.ret(v.new_expr("glob_argv[{arguments[1]}]", ret.as(not null)))
 			return
 		end
-		v.add("printf(\"NOT YET IMPLEMENTED {class_name}:{mpropdef} at {location.to_s}\\n\");")
+		v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED {class_name}:{mpropdef} at {location.to_s}\\n\");")
 		debug("Not implemented {mpropdef}")
 	end
 
@@ -1913,7 +1930,7 @@ redef class AMethPropdef
 		var externname
 		var nextern = self.n_extern
 		if nextern == null then
-			v.add("fprintf(stderr, \"NOT YET IMPLEMENTED nitni for {mpropdef} at {location.to_s}\\n\");")
+			v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED nitni for {mpropdef} at {location.to_s}\\n\");")
 			v.add("show_backtrace(1);")
 			return
 		end
@@ -1943,7 +1960,7 @@ redef class AMethPropdef
 		var externname
 		var nextern = self.n_extern
 		if nextern == null then
-			v.add("printf(\"NOT YET IMPLEMENTED nitni for {mpropdef} at {location.to_s}\\n\");")
+			v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED nitni for {mpropdef} at {location.to_s}\\n\");")
 			v.add("show_backtrace(1);")
 			return
 		end
@@ -2013,11 +2030,11 @@ redef class AClassdef
 		if mpropdef == self.mfree_init then
 			var super_inits = self.super_inits
 			if super_inits != null then
-				assert arguments.length == 1
+				var args_of_super = arguments
+				if arguments.length > 1 then args_of_super = [arguments.first]
 				for su in super_inits do
-					v.send(su, arguments)
+					v.send(su, args_of_super)
 				end
-				return
 			end
 			var recv = arguments.first
 			var i = 1
@@ -2039,7 +2056,7 @@ redef class AExpr
 	# Do not call this method directly, use `v.expr` instead
 	private fun expr(v: AbstractCompilerVisitor): nullable RuntimeVariable
 	do
-		v.add("printf(\"NOT YET IMPLEMENTED {class_name}:{location.to_s}\\n\");")
+		v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED {class_name}:{location.to_s}\\n\");")
 		var mtype = self.mtype
 		if mtype == null then
 			return null