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

diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit
index a6d6d86..059961f 100644
--- a/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@ -23,6 +23,7 @@ import platform
 import c_tools
 private import annotation
 import mixin
+import counter
 
 # Add compiling options
 redef class ToolContext
@@ -120,25 +121,31 @@ redef class ModelBuilder
 	# Simple indirection to `Toolchain::write_and_make`
 	protected fun write_and_make(compiler: AbstractCompiler)
 	do
-		var platform = compiler.mainmodule.target_platform
-		var toolchain
-		if platform == null then
-			toolchain = new MakefileToolchain(toolcontext)
-		else
-			toolchain = platform.toolchain(toolcontext)
-		end
+		var platform = compiler.target_platform
+		var toolchain = platform.toolchain(toolcontext, compiler)
 		compile_dir = toolchain.compile_dir
-		toolchain.write_and_make compiler
+		toolchain.write_and_make
 	end
 end
 
 redef class Platform
-	fun toolchain(toolcontext: ToolContext): Toolchain is abstract
+	# The specific tool-chain associated to the platform
+	fun toolchain(toolcontext: ToolContext, compiler: AbstractCompiler): Toolchain
+	do
+		return new MakefileToolchain(toolcontext, compiler)
+	end
 end
 
+# Build toolchain for a specific target program, varies per `Platform`
 class Toolchain
+
+	# Toolcontext
 	var toolcontext: ToolContext
 
+	# Compiler of the target program
+	var compiler: AbstractCompiler
+
+	# Directory where to generate all C files
 	fun compile_dir: String
 	do
 		var compile_dir = toolcontext.opt_compile_dir.value
@@ -146,13 +153,15 @@ class Toolchain
 		return compile_dir
 	end
 
-	fun write_and_make(compiler: AbstractCompiler) is abstract
+	# Write all C files and compile them
+	fun write_and_make is abstract
 end
 
+# Default toolchain using a Makefile
 class MakefileToolchain
 	super Toolchain
 
-	redef fun write_and_make(compiler)
+	redef fun write_and_make
 	do
 		var compile_dir = compile_dir
 
@@ -165,11 +174,11 @@ class MakefileToolchain
 		compile_dir.mkdir
 
 		var cfiles = new Array[String]
-		write_files(compiler, compile_dir, cfiles)
+		write_files(compile_dir, cfiles)
 
 		# Generate the Makefile
 
-		write_makefile(compiler, compile_dir, cfiles)
+		write_makefile(compile_dir, cfiles)
 
 		var time1 = get_time
 		self.toolcontext.info("*** END WRITING C: {time1-time0} ***", 2)
@@ -181,18 +190,19 @@ class MakefileToolchain
 		time0 = time1
 		self.toolcontext.info("*** COMPILING C ***", 1)
 
-		compile_c_code(compiler, compile_dir)
+		compile_c_code(compile_dir)
 
 		time1 = get_time
 		self.toolcontext.info("*** END COMPILING C: {time1-time0} ***", 2)
 	end
 
-	fun write_files(compiler: AbstractCompiler, compile_dir: String, cfiles: Array[String])
+	# Write all source files to the `compile_dir`
+	fun write_files(compile_dir: String, cfiles: Array[String])
 	do
-		var platform = compiler.mainmodule.target_platform
-		if self.toolcontext.opt_stacktrace.value == "nitstack" and (platform == null or platform.supports_libunwind) then compiler.build_c_to_nit_bindings
+		var platform = compiler.target_platform
+		if self.toolcontext.opt_stacktrace.value == "nitstack" and platform.supports_libunwind then compiler.build_c_to_nit_bindings
 		var cc_opt_with_libgc = "-DWITH_LIBGC"
-		if platform != null and not platform.supports_libgc then cc_opt_with_libgc = ""
+		if not platform.supports_libgc then cc_opt_with_libgc = ""
 
 		# Add gc_choser.h to aditionnal bodies
 		var gc_chooser = new ExternCFile("gc_chooser.c", cc_opt_with_libgc)
@@ -216,7 +226,7 @@ class MakefileToolchain
 
 		var hfilename = compiler.header.file.name + ".h"
 		var hfilepath = "{compile_dir}/{hfilename}"
-		var h = new OFStream.open(hfilepath)
+		var h = new FileWriter.open(hfilepath)
 		for l in compiler.header.decl_lines do
 			h.write l
 			h.write "\n"
@@ -231,7 +241,7 @@ class MakefileToolchain
 		for f in compiler.files do
 			var i = 0
 			var count = 0
-			var file: nullable OFStream = null
+			var file: nullable FileWriter = null
 			for vis in f.writers do
 				if vis == compiler.header then continue
 				var total_lines = vis.lines.length + vis.decl_lines.length
@@ -244,7 +254,7 @@ class MakefileToolchain
 					var cfilepath = "{compile_dir}/{cfilename}"
 					self.toolcontext.info("new C source files to compile: {cfilepath}", 3)
 					cfiles.add(cfilename)
-					file = new OFStream.open(cfilepath)
+					file = new FileWriter.open(cfilepath)
 					file.write "#include \"{f.name}.0.h\"\n"
 					count = total_lines
 				end
@@ -262,8 +272,8 @@ class MakefileToolchain
 
 			var cfilename = "{f.name}.0.h"
 			var cfilepath = "{compile_dir}/{cfilename}"
-			var hfile: nullable OFStream = null
-			hfile = new OFStream.open(cfilepath)
+			var hfile: nullable FileWriter = null
+			hfile = new FileWriter.open(cfilepath)
 			hfile.write "#include \"{hfilename}\"\n"
 			for key in f.required_declarations do
 				if not compiler.provided_declarations.has_key(key) then
@@ -284,17 +294,14 @@ class MakefileToolchain
 		self.toolcontext.info("Total C source files to compile: {cfiles.length}", 2)
 	end
 
-	fun makefile_name(mainmodule: MModule): String do return "{mainmodule.c_name}.mk"
+	# Get the name of the Makefile to use
+	fun makefile_name: String do return "{compiler.mainmodule.c_name}.mk"
 
-	fun default_outname(mainmodule: MModule): String
+	# Get the default name of the executable to produce
+	fun default_outname: String
 	do
-		# Search a non fictive module
-		var res = mainmodule.name
-		while mainmodule.is_fictive do
-			mainmodule = mainmodule.in_importation.direct_greaters.first
-			res = mainmodule.name
-		end
-		return res
+		var mainmodule = compiler.mainmodule.first_real_mmodule
+		return mainmodule.name
 	end
 
 	# Combine options and platform informations to get the final path of the outfile
@@ -302,16 +309,17 @@ class MakefileToolchain
 	do
 		var res = self.toolcontext.opt_output.value
 		if res != null then return res
-		res = default_outname(mainmodule)
+		res = default_outname
 		var dir = self.toolcontext.opt_dir.value
 		if dir != null then return dir.join_path(res)
 		return res
 	end
 
-	fun write_makefile(compiler: AbstractCompiler, compile_dir: String, cfiles: Array[String])
+	# Write the Makefile
+	fun write_makefile(compile_dir: String, cfiles: Array[String])
 	do
 		var mainmodule = compiler.mainmodule
-		var platform = compiler.mainmodule.target_platform
+		var platform = compiler.target_platform
 
 		var outname = outfile(mainmodule)
 
@@ -323,9 +331,9 @@ class MakefileToolchain
 			# 2. copy the binary at the right place in the `all` goal.
 			outpath = mainmodule.c_name
 		end
-		var makename = makefile_name(mainmodule)
+		var makename = makefile_name
 		var makepath = "{compile_dir}/{makename}"
-		var makefile = new OFStream.open(makepath)
+		var makefile = new FileWriter.open(makepath)
 
 		var linker_options = new HashSet[String]
 		for m in mainmodule.in_importation.greaters do
@@ -333,10 +341,10 @@ class MakefileToolchain
 			if libs != null then linker_options.add_all(libs)
 		end
 
-		makefile.write("CC = ccache cc\nCXX = ccache c++\nCFLAGS = -g -O2 -Wno-unused-value -Wno-switch\nCINCL =\nLDFLAGS ?= \nLDLIBS  ?= -lm {linker_options.join(" ")}\n\n")
+		makefile.write("CC = ccache cc\nCXX = ccache c++\nCFLAGS = -g -O2 -Wno-unused-value -Wno-switch -Wno-attributes\nCINCL =\nLDFLAGS ?= \nLDLIBS  ?= -lm {linker_options.join(" ")}\n\n")
 
 		var ost = toolcontext.opt_stacktrace.value
-		if (ost == "libunwind" or ost == "nitstack") and (platform == null or platform.supports_libunwind) then makefile.write("NEED_LIBUNWIND := YesPlease\n")
+		if (ost == "libunwind" or ost == "nitstack") and platform.supports_libunwind then makefile.write("NEED_LIBUNWIND := YesPlease\n")
 
 		# Dynamic adaptations
 		# While `platform` enable complex toolchains, they are statically applied
@@ -371,6 +379,18 @@ class MakefileToolchain
 			dep_rules.add(o)
 		end
 
+		# Generate linker script, if any
+		if not compiler.linker_script.is_empty then
+			var linker_script_path = "{compile_dir}/linker_script"
+			ofiles.add "linker_script"
+			var f = new FileWriter.open(linker_script_path)
+			for l in compiler.linker_script do
+				f.write l
+				f.write "\n"
+			end
+			f.close
+		end
+
 		var java_files = new Array[ExternFile]
 
 		var pkgconfigs = new Array[String]
@@ -436,9 +456,10 @@ endif
 		makepath.file_copy_to "{compile_dir}/Makefile"
 	end
 
-	fun compile_c_code(compiler: AbstractCompiler, compile_dir: String)
+	# The C code is generated, compile it to an executable
+	fun compile_c_code(compile_dir: String)
 	do
-		var makename = makefile_name(compiler.mainmodule)
+		var makename = makefile_name
 
 		var makeflags = self.toolcontext.opt_make_flags.value
 		if makeflags == null then makeflags = ""
@@ -476,11 +497,19 @@ abstract class AbstractCompiler
 	# Is hardening asked? (see --hardening)
 	fun hardening: Bool do return self.modelbuilder.toolcontext.opt_hardening.value
 
+	# The targeted specific platform
+	var target_platform: Platform is noinit
+
 	init
 	do
 		self.realmainmodule = mainmodule
+		target_platform = mainmodule.target_platform or else new Platform
 	end
 
+	# Do the full code generation of the program `mainmodule`
+	# It is the main method usually called after the instantiation
+	fun do_compilation is abstract
+
 	# Force the creation of a new file
 	# The point is to avoid contamination between must-be-compiled-separately files
 	fun new_file(name: String): CodeFile
@@ -507,6 +536,10 @@ abstract class AbstractCompiler
 	# Where global declaration are stored (the main .h)
 	var header: CodeWriter is writable, noinit
 
+	# Additionnal linker script for `ld`.
+	# Mainly used to do specific link-time symbol resolution
+	var linker_script = new Array[String]
+
 	# Provide a declaration that can be requested (before or latter) by a visitor
 	fun provide_declaration(key: String, s: String)
 	do
@@ -526,7 +559,7 @@ abstract class AbstractCompiler
 	do
 		var compile_dir = modelbuilder.compile_dir
 
-		var stream = new OFStream.open("{compile_dir}/c_functions_hash.c")
+		var stream = new FileWriter.open("{compile_dir}/c_functions_hash.c")
 		stream.write("#include <string.h>\n")
 		stream.write("#include <stdlib.h>\n")
 		stream.write("#include \"c_functions_hash.h\"\n")
@@ -556,7 +589,7 @@ abstract class AbstractCompiler
 		stream.write("\}\n")
 		stream.close
 
-		stream = new OFStream.open("{compile_dir}/c_functions_hash.h")
+		stream = new FileWriter.open("{compile_dir}/c_functions_hash.h")
 		stream.write("const char* get_nit_name(register const char* procname, register unsigned int len);\n")
 		stream.close
 
@@ -569,6 +602,8 @@ abstract class AbstractCompiler
 		self.header.add_decl("#include <stdlib.h>")
 		self.header.add_decl("#include <stdio.h>")
 		self.header.add_decl("#include <string.h>")
+		self.header.add_decl("#include <sys/types.h>\n")
+		self.header.add_decl("#include <unistd.h>\n")
 		self.header.add_decl("#include \"gc_chooser.h\"")
 		self.header.add_decl("#ifdef ANDROID")
 		self.header.add_decl("	#include <android/log.h>")
@@ -583,9 +618,9 @@ abstract class AbstractCompiler
 		var gccd_disable = modelbuilder.toolcontext.opt_no_gcc_directive.value
 		if gccd_disable.has("noreturn") or gccd_disable.has("all") then
 			# Signal handler function prototype
-			self.header.add_decl("void show_backtrace(int);")
+			self.header.add_decl("void fatal_exit(int);")
 		else
-			self.header.add_decl("void show_backtrace(int) __attribute__ ((noreturn));")
+			self.header.add_decl("void fatal_exit(int) __attribute__ ((noreturn));")
 		end
 
 		if gccd_disable.has("likely") or gccd_disable.has("all") then
@@ -677,11 +712,11 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref );
 		var v = self.new_visitor
 		v.add_decl("#include <signal.h>")
 		var ost = modelbuilder.toolcontext.opt_stacktrace.value
-		var platform = mainmodule.target_platform
+		var platform = target_platform
 
-		if platform != null and not platform.supports_libunwind then ost = "none"
+		if not platform.supports_libunwind then ost = "none"
 
-		var no_main = (platform != null and platform.no_main) or modelbuilder.toolcontext.opt_no_main.value
+		var no_main = platform.no_main or modelbuilder.toolcontext.opt_no_main.value
 
 		if ost == "nitstack" or ost == "libunwind" then
 			v.add_decl("#define UNW_LOCAL_ONLY")
@@ -721,12 +756,7 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref );
 			v.compiler.header.add_decl("extern long count_isset_checks;")
 		end
 
-		v.add_decl("void sig_handler(int signo)\{")
-		v.add_decl("PRINT_ERROR(\"Caught signal : %s\\n\", strsignal(signo));")
-		v.add_decl("show_backtrace(signo);")
-		v.add_decl("\}")
-
-		v.add_decl("void show_backtrace (int signo) \{")
+		v.add_decl("static void show_backtrace(void) \{")
 		if ost == "nitstack" or ost == "libunwind" then
 			v.add_decl("char* opt = getenv(\"NIT_NO_STACK\");")
 			v.add_decl("unw_cursor_t cursor;")
@@ -756,7 +786,19 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref );
 			v.add_decl("free(procname);")
 			v.add_decl("\}")
 		end
-		v.add_decl("exit(signo);")
+		v.add_decl("\}")
+
+		v.add_decl("void sig_handler(int signo)\{")
+		v.add_decl("PRINT_ERROR(\"Caught signal : %s\\n\", strsignal(signo));")
+		v.add_decl("show_backtrace();")
+		# rethrows
+		v.add_decl("signal(signo, SIG_DFL);")
+		v.add_decl("kill(getpid(), signo);")
+		v.add_decl("\}")
+
+		v.add_decl("void fatal_exit(int status) \{")
+		v.add_decl("show_backtrace();")
+		v.add_decl("exit(status);")
 		v.add_decl("\}")
 
 		if no_main then
@@ -836,6 +878,12 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref );
 
 		v.add("return 0;")
 		v.add("\}")
+
+		for m in mainmodule.in_importation.greaters do
+			var f = "FILE_"+m.c_name
+			v.add "const char {f}[] = \"{m.location.file.filename.escape_to_c}\";"
+			provide_declaration(f, "extern const char {f}[];")
+		end
 	end
 
 	# Copile all C functions related to the [incr|decr]_ref features of the FFI
@@ -914,12 +962,8 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref ) {
 		var cds = mtype.collect_mclassdefs(self.mainmodule).to_a
 		self.mainmodule.linearize_mclassdefs(cds)
 		for cd in cds do
-			if not self.modelbuilder.mclassdef2nclassdef.has_key(cd) then continue
-			var n = self.modelbuilder.mclassdef2nclassdef[cd]
-			for npropdef in n.n_propdefs do
-				if npropdef isa AAttrPropdef then
-					npropdef.init_expr(v, recv)
-				end
+			for npropdef in modelbuilder.collect_attr_propdef(cd) do
+				npropdef.init_expr(v, recv)
 			end
 		end
 	end
@@ -930,12 +974,8 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref ) {
 		var cds = mtype.collect_mclassdefs(self.mainmodule).to_a
 		self.mainmodule.linearize_mclassdefs(cds)
 		for cd in cds do
-			if not self.modelbuilder.mclassdef2nclassdef.has_key(cd) then continue
-			var n = self.modelbuilder.mclassdef2nclassdef[cd]
-			for npropdef in n.n_propdefs do
-				if npropdef isa AAttrPropdef then
-					npropdef.check_expr(v, recv)
-				end
+			for npropdef in modelbuilder.collect_attr_propdef(cd) do
+				npropdef.check_expr(v, recv)
 			end
 		end
 	end
@@ -996,14 +1036,6 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref ) {
 	end
 
 	fun finalize_ffi_for_module(mmodule: MModule) do mmodule.finalize_ffi(self)
-
-	# Division facility
-	# Avoid division by zero by returning the string "n/a"
-	fun div(a,b:Int):String
-	do
-		if b == 0 then return "n/a"
-		return ((a*10000/b).to_f / 100.0).to_precision(2)
-	end
 end
 
 # A file unit (may be more than one file if
@@ -1044,8 +1076,8 @@ abstract class AbstractCompilerVisitor
 	# The current visited AST node
 	var current_node: nullable ANode = null is writable
 
-	# The current `Frame`
-	var frame: nullable Frame = null is writable
+	# The current `StaticFrame`
+	var frame: nullable StaticFrame = null is writable
 
 	# Alias for self.compiler.mainmodule.object_type
 	fun object_type: MClassType do return self.compiler.mainmodule.object_type
@@ -1060,9 +1092,6 @@ abstract class AbstractCompilerVisitor
 		self.writer = new CodeWriter(compiler.files.last)
 	end
 
-	# Force to get the primitive class named `name` or abort
-	fun get_class(name: String): MClass do return self.compiler.mainmodule.get_primitive_class(name)
-
 	# Force to get the primitive property named `name` in the instance `recv` or abort
 	fun get_property(name: String, recv: MType): MMethod
 	do
@@ -1104,6 +1133,14 @@ abstract class AbstractCompilerVisitor
 
 	fun native_array_def(pname: String, ret_type: nullable MType, arguments: Array[RuntimeVariable]) is abstract
 
+	# Return an element of a native array.
+	# The method is unsafe and is just a direct wrapper for the specific implementation of native arrays
+	fun native_array_get(native_array: RuntimeVariable, index: Int): RuntimeVariable is abstract
+
+	# Store an element in a native array.
+	# The method is unsafe and is just a direct wrapper for the specific implementation of native arrays
+	fun native_array_set(native_array: RuntimeVariable, index: Int, value: RuntimeVariable) is abstract
+
 	# Evaluate `args` as expressions in the call of `mpropdef` on `recv`.
 	# This method is used to manage varargs in signatures and returns the real array
 	# of runtime variables to use in the call.
@@ -1287,11 +1324,11 @@ abstract class AbstractCompilerVisitor
 	fun escapemark_name(e: nullable EscapeMark): String
 	do
 		assert e != null
-		if escapemark_names.has_key(e) then return escapemark_names[e]
+		if frame.escapemark_names.has_key(e) then return frame.escapemark_names[e]
 		var name = e.name
 		if name == null then name = "label"
 		name = get_name(name)
-		escapemark_names[e] = name
+		frame.escapemark_names[e] = name
 		return name
 	end
 
@@ -1303,8 +1340,6 @@ abstract class AbstractCompilerVisitor
 		add("BREAK_{escapemark_name(e)}: (void)0;")
 	end
 
-	private var escapemark_names = new HashMap[EscapeMark, String]
-
 	# Return a "const char*" variable associated to the classname of the dynamic type of an object
 	# NOTE: we do not return a `RuntimeVariable` "NativeString" as the class may not exist in the module/program
 	fun class_name_string(value: RuntimeVariable): String is abstract
@@ -1371,6 +1406,24 @@ abstract class AbstractCompilerVisitor
 	# Generate a alloc-instance + init-attributes
 	fun init_instance(mtype: MClassType): RuntimeVariable is abstract
 
+	# Allocate and init attributes of an instance of a standard or extern class
+	#
+	# Does not support universals and the pseudo-internal `NativeArray` class.
+	fun init_instance_or_extern(mtype: MClassType): RuntimeVariable
+	do
+		var recv
+		var ctype = mtype.ctype
+		assert mtype.mclass.name != "NativeArray"
+		if not mtype.is_c_primitive then
+			recv = init_instance(mtype)
+		else if ctype == "char*" then
+			recv = new_expr("NULL/*special!*/", mtype)
+		else
+			recv = new_expr("({ctype})0/*special!*/", mtype)
+		end
+		return recv
+	end
+
 	# Set a GC finalizer on `recv`, only if `recv` isa Finalizable
 	fun set_finalizer(recv: RuntimeVariable)
 	do
@@ -1382,37 +1435,64 @@ abstract class AbstractCompilerVisitor
 		end
 	end
 
+	# The currently processed module
+	#
+	# alias for `compiler.mainmodule`
+	fun mmodule: MModule do return compiler.mainmodule
+
 	# Generate an integer value
 	fun int_instance(value: Int): RuntimeVariable
 	do
-		var res = self.new_var(self.get_class("Int").mclass_type)
-		self.add("{res} = {value};")
+		var t = mmodule.int_type
+		var res = new RuntimeVariable("{value.to_s}l", t, t)
+		return res
+	end
+
+	# Generate a char value
+	fun char_instance(value: Char): RuntimeVariable
+	do
+		var t = mmodule.char_type
+		var res = new RuntimeVariable("'{value.to_s.escape_to_c}'", t, t)
+		return res
+	end
+
+	# Generate a float value
+	#
+	# FIXME pass a Float, not a string
+	fun float_instance(value: String): RuntimeVariable
+	do
+		var t = mmodule.float_type
+		var res = new RuntimeVariable("{value}", t, t)
 		return res
 	end
 
 	# Generate an integer value
 	fun bool_instance(value: Bool): RuntimeVariable
 	do
-		var res = self.new_var(self.get_class("Bool").mclass_type)
-		if value then
-			self.add("{res} = 1;")
-		else
-			self.add("{res} = 0;")
-		end
+		var s = if value then "1" else "0"
+		var res = new RuntimeVariable(s, bool_type, bool_type)
+		return res
+	end
+
+	# Generate the `null` value
+	fun null_instance: RuntimeVariable
+	do
+		var t = compiler.mainmodule.model.null_type
+		var res = new RuntimeVariable("((val*)NULL)", t, t)
 		return res
 	end
 
 	# Generate a string value
 	fun string_instance(string: String): RuntimeVariable
 	do
-		var mtype = self.get_class("String").mclass_type
+		var mtype = mmodule.string_type
 		var name = self.get_name("varonce")
 		self.add_decl("static {mtype.ctype} {name};")
 		var res = self.new_var(mtype)
-		self.add("if ({name}) \{")
+		self.add("if (likely({name}!=NULL)) \{")
 		self.add("{res} = {name};")
 		self.add("\} else \{")
-		var native_mtype = self.get_class("NativeString").mclass_type
+		var native_mtype = mmodule.native_string_type
 		var nat = self.new_var(native_mtype)
 		self.add("{nat} = \"{string.escape_to_c}\";")
 		var length = self.int_instance(string.length)
@@ -1468,10 +1548,11 @@ abstract class AbstractCompilerVisitor
 		self.require_declaration(s)
 	end
 
-	# look for a needed .h and .c file for a given .nit source-file
-	# FIXME: bad API, parameter should be a `MModule`, not its source-file
-	fun add_extern(file: String)
+	# Look for a needed .h and .c file for a given module
+	# This is used for the legacy FFI
+	fun add_extern(mmodule: MModule)
 	do
+		var file = mmodule.location.file.filename
 		file = file.strip_extension(".nit")
 		var tryfile = file + ".nit.h"
 		if tryfile.file_exists then
@@ -1514,12 +1595,15 @@ abstract class AbstractCompilerVisitor
 
 	fun add_raw_abort
 	do
-		if self.current_node != null and self.current_node.location.file != null then
-			self.add("PRINT_ERROR(\" (%s:%d)\\n\", \"{self.current_node.location.file.filename.escape_to_c}\", {current_node.location.line_start});")
+		if self.current_node != null and self.current_node.location.file != null and
+				self.current_node.location.file.mmodule != null then
+			var f = "FILE_{self.current_node.location.file.mmodule.c_name}"
+			self.require_declaration(f)
+			self.add("PRINT_ERROR(\" (%s:%d)\\n\", {f}, {current_node.location.line_start});")
 		else
 			self.add("PRINT_ERROR(\"\\n\");")
 		end
-		self.add("show_backtrace(1);")
+		self.add("fatal_exit(1);")
 	end
 
 	# Add a dynamic cast
@@ -1544,6 +1628,15 @@ abstract class AbstractCompilerVisitor
 	fun stmt(nexpr: nullable AExpr)
 	do
 		if nexpr == null then return
+
+		var narray = nexpr.comprehension
+		if narray != null then
+			var recv = frame.comprehension.as(not null)
+			var val = expr(nexpr, narray.element_mtype)
+			compile_callsite(narray.push_callsite.as(not null), [recv, val])
+			return
+		end
+
 		var old = self.current_node
 		self.current_node = nexpr
 		nexpr.stmt(self)
@@ -1666,8 +1759,8 @@ class RuntimeVariable
 	end
 end
 
-# A frame correspond to a visited property in a `GlobalCompilerVisitor`
-class Frame
+# The static context of a visited property in a `AbstractCompilerVisitor`
+class StaticFrame
 
 	type VISITOR: AbstractCompilerVisitor
 
@@ -1689,6 +1782,13 @@ class Frame
 
 	# The label at the end of the property
 	var returnlabel: nullable String = null is writable
+
+	# Labels associated to a each escapemarks.
+	# Because of inlinings, escape-marks must be associated to their context (the frame)
+	private var escapemark_names = new HashMap[EscapeMark, String]
+
+	# The array comprehension currently filled, if any
+	private var comprehension: nullable RuntimeVariable = null
 end
 
 redef class MType
@@ -1701,23 +1801,15 @@ redef class MType
 	# Short name of the `ctype` to use in unions
 	fun ctypename: String do return "val"
 
-	# Return the name of the C structure associated to a Nit live type
-	fun c_name: String is abstract
-	protected var c_name_cache: nullable String is protected writable
+	# Is the associated C type a primitive one?
+	#
+	# ENSURE `result == (ctype != "val*")`
+	fun is_c_primitive: Bool do return false
 end
 
 redef class MClassType
-	redef fun c_name
-	do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = "{mclass.intro_mmodule.c_name}__{mclass.name.to_cmangle}"
-		self.c_name_cache = res
-		return res
-	end
 
-	redef fun ctype: String
-	do
+	redef var ctype is lazy do
 		if mclass.name == "Int" then
 			return "long"
 		else if mclass.name == "Bool" then
@@ -1735,6 +1827,8 @@ redef class MClassType
 		end
 	end
 
+	redef var is_c_primitive is lazy do return ctype != "val*"
+
 	redef fun ctype_extern: String
 	do
 		if mclass.kind == extern_kind then
@@ -1765,90 +1859,8 @@ redef class MClassType
 	end
 end
 
-redef class MGenericType
-	redef fun c_name
-	do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = super
-		for t in self.arguments do
-			res = res + t.c_name
-		end
-		self.c_name_cache = res
-		return res
-	end
-end
-
-redef class MParameterType
-	redef fun c_name
-	do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = "{self.mclass.c_name}_FT{self.rank}"
-		self.c_name_cache = res
-		return res
-	end
-end
-
-redef class MVirtualType
-	redef fun c_name
-	do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = "{self.mproperty.intro.mclassdef.mclass.c_name}_VT{self.mproperty.name}"
-		self.c_name_cache = res
-		return res
-	end
-end
-
-redef class MNullableType
-	redef fun c_name
-	do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = "nullable_{self.mtype.c_name}"
-		self.c_name_cache = res
-		return res
-	end
-end
-
-redef class MClass
-	# Return the name of the C structure associated to a Nit class
-	fun c_name: String do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = "{intro_mmodule.c_name}__{name.to_cmangle}"
-		self.c_name_cache = res
-		return res
-	end
-	private var c_name_cache: nullable String
-end
-
-redef class MProperty
-	fun c_name: String do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = "{self.intro.c_name}"
-		self.c_name_cache = res
-		return res
-	end
-	private var c_name_cache: nullable String
-end
-
 redef class MPropDef
 	type VISITOR: AbstractCompilerVisitor
-
-	private var c_name_cache: nullable String
-
-	# The mangled name associated to the property
-	fun c_name: String
-	do
-		var res = self.c_name_cache
-		if res != null then return res
-		res = "{self.mclassdef.mmodule.c_name}__{self.mclassdef.mclass.name.to_cmangle}__{self.mproperty.name.to_cmangle}"
-		self.c_name_cache = res
-		return res
-	end
 end
 
 redef class MMethodDef
@@ -1874,6 +1886,15 @@ redef class MMethodDef
 		var modelbuilder = v.compiler.modelbuilder
 		var val = constant_value
 		var node = modelbuilder.mpropdef2node(self)
+
+		if is_abstract then
+			var cn = v.class_name_string(arguments.first)
+			v.current_node = node
+			v.add("PRINT_ERROR(\"Runtime error: Abstract method `%s` called on `%s`\", \"{mproperty.name.escape_to_c}\", {cn});")
+			v.add_raw_abort
+			return null
+		end
+
 		if node isa APropdef then
 			var oldnode = v.current_node
 			v.current_node = node
@@ -1933,13 +1954,6 @@ end
 redef class AMethPropdef
 	redef fun compile_to_c(v, mpropdef, arguments)
 	do
-		if mpropdef.is_abstract then
-			var cn = v.class_name_string(arguments.first)
-			v.add("PRINT_ERROR(\"Runtime error: Abstract method `%s` called on `%s`\", \"{mpropdef.mproperty.name.escape_to_c}\", {cn});")
-			v.add_raw_abort
-			return
-		end
-
 		# Call the implicit super-init
 		var auto_super_inits = self.auto_super_inits
 		if auto_super_inits != null then
@@ -2183,6 +2197,9 @@ redef class AMethPropdef
 			else if pname == "atoi" then
 				v.ret(v.new_expr("atoi({arguments[0]});", ret.as(not null)))
 				return true
+			else if pname == "fast_cstring" then
+				v.ret(v.new_expr("{arguments[0]} + {arguments[1]}", ret.as(not null)))
+				return true
 			else if pname == "new" then
 				v.ret(v.new_expr("(char*)nit_alloc({arguments[1]})", ret.as(not null)))
 				return true
@@ -2239,16 +2256,13 @@ redef class AMethPropdef
 	do
 		var externname
 		var at = self.get_single_annotation("extern", v.compiler.modelbuilder)
-		if at != null then
+		if at != null and at.n_args.length == 1 then
 			externname = at.arg_as_string(v.compiler.modelbuilder)
 			if externname == null then return false
 		else
 			return false
 		end
-		if location.file != null then
-			var file = location.file.filename
-			v.add_extern(file)
-		end
+		v.add_extern(mpropdef.mclassdef.mmodule)
 		var res: nullable RuntimeVariable = null
 		var ret = mpropdef.msignature.return_mtype
 		if ret != null then
@@ -2280,10 +2294,7 @@ redef class AMethPropdef
 		else
 			return false
 		end
-		if location.file != null then
-			var file = location.file.filename
-			v.add_extern(file)
-		end
+		v.add_extern(mpropdef.mclassdef.mmodule)
 		v.adapt_signature(mpropdef, arguments)
 		v.unbox_signature_extern(mpropdef, arguments)
 		var ret = arguments.first.mtype
@@ -2299,6 +2310,8 @@ redef class AMethPropdef
 end
 
 redef class AAttrPropdef
+	redef fun can_inline: Bool do return not is_lazy
+
 	redef fun compile_to_c(v, mpropdef, arguments)
 	do
 		if mpropdef == mreadpropdef then
@@ -2308,7 +2321,7 @@ redef class AAttrPropdef
 			if is_lazy then
 				var set
 				var ret = self.mpropdef.static_mtype
-				var useiset = ret.ctype == "val*" and not ret isa MNullableType
+				var useiset = not ret.is_c_primitive and not ret isa MNullableType
 				var guard = self.mlazypropdef.mproperty
 				if useiset then
 					set = v.isset_attribute(self.mpropdef.mproperty, recv)
@@ -2323,7 +2336,7 @@ redef class AAttrPropdef
 
 				v.assign(res, value)
 				if not useiset then
-					var true_v = v.new_expr("1", v.bool_type)
+					var true_v = v.bool_instance(true)
 					v.write_attribute(guard, arguments.first, true_v)
 				end
 				v.add("\}")
@@ -2336,9 +2349,9 @@ redef class AAttrPropdef
 			v.write_attribute(self.mpropdef.mproperty, arguments.first, arguments[1])
 			if is_lazy then
 				var ret = self.mpropdef.static_mtype
-				var useiset = ret.ctype == "val*" and not ret isa MNullableType
+				var useiset = not ret.is_c_primitive and not ret isa MNullableType
 				if not useiset then
-					v.write_attribute(self.mlazypropdef.mproperty, arguments.first, v.new_expr("1", v.bool_type))
+					v.write_attribute(self.mlazypropdef.mproperty, arguments.first, v.bool_instance(true))
 				end
 			end
 		else
@@ -2348,7 +2361,7 @@ redef class AAttrPropdef
 
 	fun init_expr(v: AbstractCompilerVisitor, recv: RuntimeVariable)
 	do
-		if has_value and not is_lazy then evaluate_expr(v, recv)
+		if has_value and not is_lazy and not n_expr isa ANullExpr then evaluate_expr(v, recv)
 	end
 
 	# Evaluate, store and return the default value of the attribute
@@ -2357,7 +2370,7 @@ redef class AAttrPropdef
 		var oldnode = v.current_node
 		v.current_node = self
 		var old_frame = v.frame
-		var frame = new Frame(v, self.mpropdef.as(not null), recv.mcasttype.as(MClassType), [recv])
+		var frame = new StaticFrame(v, self.mpropdef.as(not null), recv.mcasttype.undecorate.as(MClassType), [recv])
 		v.frame = frame
 
 		var value
@@ -2396,7 +2409,7 @@ redef class AAttrPropdef
 		var oldnode = v.current_node
 		v.current_node = self
 		var old_frame = v.frame
-		var frame = new Frame(v, self.mpropdef.as(not null), recv.mtype.as(MClassType), [recv])
+		var frame = new StaticFrame(v, self.mpropdef.as(not null), recv.mtype.as(MClassType), [recv])
 		v.frame = frame
 		# Force read to check the initialization
 		v.read_attribute(self.mpropdef.mproperty, recv)
@@ -2508,6 +2521,13 @@ redef class ASelfExpr
 	redef fun expr(v) do return v.frame.arguments.first
 end
 
+redef class AImplicitSelfExpr
+	redef fun expr(v) do
+		if not is_sys then return super
+		return v.new_expr("glob_sys", mtype.as(not null))
+	end
+end
+
 redef class AEscapeExpr
 	redef fun stmt(v) do v.add("goto BREAK_{v.escapemark_name(self.escapemark)};")
 end
@@ -2736,27 +2756,32 @@ redef class AOrElseExpr
 end
 
 redef class AIntExpr
-	redef fun expr(v) do return v.new_expr("{self.value.to_s}", self.mtype.as(not null))
+	redef fun expr(v) do return v.int_instance(self.value.as(not null))
 end
 
 redef class AFloatExpr
-	redef fun expr(v) do return v.new_expr("{self.n_float.text}", self.mtype.as(not null)) # FIXME use value, not n_float
+	redef fun expr(v) do return v.float_instance("{self.n_float.text}") # FIXME use value, not n_float
 end
 
 redef class ACharExpr
-	redef fun expr(v) do return v.new_expr("'{self.value.to_s.escape_to_c}'", self.mtype.as(not null))
+	redef fun expr(v) do return v.char_instance(self.value.as(not null))
 end
 
 redef class AArrayExpr
 	redef fun expr(v)
 	do
-		var mtype = self.mtype.as(MClassType).arguments.first
+		var mtype = self.element_mtype.as(not null)
 		var array = new Array[RuntimeVariable]
-		for nexpr in self.n_exprs.n_exprs do
-			var i = v.expr(nexpr, mtype)
-			array.add(i)
+		var res = v.array_instance(array, mtype)
+
+		var old_comprehension = v.frame.comprehension
+		v.frame.comprehension = res
+		for nexpr in self.n_exprs do
+			v.stmt(nexpr)
 		end
-		return v.array_instance(array, mtype)
+		v.frame.comprehension = old_comprehension
+
+		return res
 	end
 end
 
@@ -2767,14 +2792,64 @@ end
 redef class ASuperstringExpr
 	redef fun expr(v)
 	do
-		var array = new Array[RuntimeVariable]
+		var type_string = mtype.as(not null)
+
+		# Collect elements of the superstring
+		var array = new Array[AExpr]
 		for ne in self.n_exprs do
+			# Drop literal empty string.
+			# They appears in things like "{a}" that is ["", a, ""]
 			if ne isa AStringFormExpr and ne.value == "" then continue # skip empty sub-strings
-			var i = v.expr(ne, null)
-			array.add(i)
+			array.add(ne)
+		end
+
+		# Store the allocated native array in a static variable
+		# For reusing later
+		var varonce = v.get_name("varonce")
+		v.add("if (unlikely({varonce}==NULL)) \{")
+
+		# The native array that will contains the elements to_s-ized.
+		# For fast concatenation.
+		var a = v.native_array_instance(type_string, v.int_instance(array.length))
+
+		v.add_decl("static {a.mtype.ctype} {varonce};")
+
+		# Pre-fill the array with the literal string parts.
+		# So they do not need to be filled again when reused
+		for i in [0..array.length[ do
+			var ne = array[i]
+			if not ne isa AStringFormExpr then continue
+			var e = v.expr(ne, null)
+			v.native_array_set(a, i, e)
+		end
+
+		v.add("\} else \{")
+		# Take the native-array from the store.
+		# The point is to prevent that some recursive execution use (and corrupt) the same native array
+		# WARNING: not thread safe! (FIXME?)
+		v.add("{a} = {varonce};")
+		v.add("{varonce} = NULL;")
+		v.add("\}")
+
+		# Stringify the elements and put them in the native array
+		var to_s_method = v.get_property("to_s", v.object_type)
+		for i in [0..array.length[ do
+			var ne = array[i]
+			if ne isa AStringFormExpr then continue
+			var e = v.expr(ne, null)
+			# Skip the `to_s` if the element is already a String
+			if not e.mcasttype.is_subtype(v.compiler.mainmodule, null, type_string) then
+				e = v.send(to_s_method, [e]).as(not null)
+			end
+			v.native_array_set(a, i, e)
 		end
-		var a = v.array_instance(array, v.object_type)
-		var res = v.send(v.get_property("to_s", a.mtype), [a])
+
+		# Fast join the native string to get the result
+		var res = v.send(v.get_property("native_to_s", a.mtype), [a])
+
+		# We finish to work with the native array,
+		# so store it so that it can be reused
+		v.add("{varonce} = {a};")
 		return res
 	end
 end
@@ -2804,15 +2879,15 @@ redef class AOrangeExpr
 end
 
 redef class ATrueExpr
-	redef fun expr(v) do return v.new_expr("1", self.mtype.as(not null))
+	redef fun expr(v) do return v.bool_instance(true)
 end
 
 redef class AFalseExpr
-	redef fun expr(v) do return v.new_expr("0", self.mtype.as(not null))
+	redef fun expr(v) do return v.bool_instance(false)
 end
 
 redef class ANullExpr
-	redef fun expr(v) do return v.new_expr("NULL", self.mtype.as(not null))
+	redef fun expr(v) do return v.null_instance
 end
 
 redef class AIsaExpr
@@ -2840,7 +2915,7 @@ redef class AAsNotnullExpr
 		var i = v.expr(self.n_expr, null)
 		if v.compiler.modelbuilder.toolcontext.opt_no_check_assert.value then return i
 
-		if i.mtype.ctype != "val*" then return i
+		if i.mtype.is_c_primitive then return i
 
 		v.add("if (unlikely({i} == NULL)) \{")
 		v.add_abort("Cast failed")
@@ -2862,7 +2937,7 @@ redef class AOnceExpr
 		v.add_decl("static {mtype.ctype} {name};")
 		v.add_decl("static int {guard};")
 		var res = v.new_var(mtype)
-		v.add("if ({guard}) \{")
+		v.add("if (likely({guard})) \{")
 		v.add("{res} = {name};")
 		v.add("\} else \{")
 		var i = v.expr(self.n_expr, mtype)
@@ -2940,22 +3015,17 @@ redef class ANewExpr
 	do
 		var mtype = self.recvtype
 		assert mtype != null
-		var recv
-		var ctype = mtype.ctype
+
 		if mtype.mclass.name == "NativeArray" then
 			assert self.n_args.n_exprs.length == 1
 			var l = v.expr(self.n_args.n_exprs.first, null)
 			assert mtype isa MGenericType
 			var elttype = mtype.arguments.first
 			return v.native_array_instance(elttype, l)
-		else if ctype == "val*" then
-			recv = v.init_instance(mtype)
-		else if ctype == "char*" then
-			recv = v.new_expr("NULL/*special!*/", mtype)
-		else
-			recv = v.new_expr("({ctype})0/*special!*/", mtype)
 		end
 
+		var recv = v.init_instance_or_extern(mtype)
+
 		var callsite = self.callsite.as(not null)
 		var args = v.varargize(callsite.mpropdef, recv, self.n_args.n_exprs)
 		var res2 = v.compile_callsite(callsite, args)
@@ -3028,19 +3098,6 @@ redef class Array[E]
 end
 
 redef class MModule
-	# Return the name of the global C identifier associated to `self`.
-	# This name is used to prefix files and other C identifiers associated with `self`.
-	var c_name: String is lazy do
-		var g = mgroup
-		var res
-		if g != null and g.mproject.name != name then
-			res = g.mproject.name.to_cmangle + "__" + name.to_cmangle
-		else
-			res = name.to_cmangle
-		end
-		return res
-	end
-
 	# All `MProperty` associated to all `MClassDef` of `mclass`
 	fun properties(mclass: MClass): Set[MProperty] do
 		if not self.properties_cache.has_key(mclass) then
@@ -3069,13 +3126,13 @@ redef class MModule
 
 	# Give requided addinional system libraries (as given to LD_LIBS)
 	# Note: can return null instead of an empty set
-	fun collect_linker_libs: nullable Set[String] do return null
+	fun collect_linker_libs: nullable Array[String] do return null
 end
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
 
-toolcontext.tooldescription = "Usage: nitg [OPTION]... file.nit...\nCompiles Nit programs."
+toolcontext.tooldescription = "Usage: nitc [OPTION]... file.nit...\nCompiles Nit programs."
 
 # We do not add other options, so process them now!
 toolcontext.process_options(args)