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

diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit
index 330bfce..ddd7323 100644
--- a/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@ -284,7 +284,7 @@ class MakefileToolchain
 		self.toolcontext.info("Total C source files to compile: {cfiles.length}", 2)
 	end
 
-	fun makefile_name(mainmodule: MModule): String do return "{mainmodule.name}.mk"
+	fun makefile_name(mainmodule: MModule): String do return "{mainmodule.c_name}.mk"
 
 	fun default_outname(mainmodule: MModule): String
 	do
@@ -315,7 +315,14 @@ class MakefileToolchain
 
 		var outname = outfile(mainmodule)
 
-		var outpath = compile_dir.relpath(outname)
+		var real_outpath = compile_dir.relpath(outname)
+		var outpath = real_outpath.escape_to_mk
+		if outpath != real_outpath then
+			# If the name is crazy and need escaping, we will do an indirection
+			# 1. generate the binary in the .nit_compile dir under an escaped name
+			# 2. copy the binary at the right place in the `all` goal.
+			outpath = mainmodule.c_name
+		end
 		var makename = makefile_name(mainmodule)
 		var makepath = "{compile_dir}/{makename}"
 		var makefile = new OFStream.open(makepath)
@@ -326,7 +333,7 @@ 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")
@@ -348,7 +355,11 @@ class MakefileToolchain
 
 		makefile.write("ifdef NEED_LIBUNWIND\n\tLDLIBS += -lunwind\nendif\n")
 
-		makefile.write("all: {outpath}\n\n")
+		makefile.write("all: {outpath}\n")
+		if outpath != real_outpath then
+			makefile.write("\tcp -- {outpath.escape_to_sh} {real_outpath.escape_to_sh.replace("$","$$")}")
+		end
+		makefile.write("\n")
 
 		var ofiles = new Array[String]
 		var dep_rules = new Array[String]
@@ -413,9 +424,12 @@ endif
 		if not pkgconfigs.is_empty then
 			pkg = "`pkg-config --libs {pkgconfigs.join(" ")}`"
 		end
-		makefile.write("{outpath}: {dep_rules.join(" ")}\n\t$(CC) $(LDFLAGS) -o {outpath} {ofiles.join(" ")} $(LDLIBS) {pkg}\n\n")
+		makefile.write("{outpath}: {dep_rules.join(" ")}\n\t$(CC) $(LDFLAGS) -o {outpath.escape_to_sh} {ofiles.join(" ")} $(LDLIBS) {pkg}\n\n")
 		# Clean
-		makefile.write("clean:\n\trm {ofiles.join(" ")} 2>/dev/null\n\n")
+		makefile.write("clean:\n\trm {ofiles.join(" ")} 2>/dev/null\n")
+		if outpath != real_outpath then
+			makefile.write("\trm -- {outpath.escape_to_sh} 2>/dev/null\n")
+		end
 		makefile.close
 		self.toolcontext.info("Generated makefile: {makepath}", 2)
 
@@ -454,7 +468,7 @@ abstract class AbstractCompiler
 	var mainmodule: MModule is writable
 
 	# The real main module of the program
-	var realmainmodule: MModule
+	var realmainmodule: MModule is noinit
 
 	# The modelbuilder used to know the model and the AST
 	var modelbuilder: ModelBuilder is protected writable
@@ -462,11 +476,9 @@ abstract class AbstractCompiler
 	# Is hardening asked? (see --hardening)
 	fun hardening: Bool do return self.modelbuilder.toolcontext.opt_hardening.value
 
-	init(mainmodule: MModule, modelbuilder: ModelBuilder)
+	init
 	do
-		self.mainmodule = mainmodule
 		self.realmainmodule = mainmodule
-		self.modelbuilder = modelbuilder
 	end
 
 	# Force the creation of a new file
@@ -475,7 +487,7 @@ abstract class AbstractCompiler
 	do
 		if modelbuilder.toolcontext.opt_group_c_files.value then
 			if self.files.is_empty then
-				var f = new CodeFile(mainmodule.name)
+				var f = new CodeFile(mainmodule.c_name)
 				self.files.add(f)
 			end
 			return self.files.first
@@ -493,7 +505,7 @@ abstract class AbstractCompiler
 	fun new_visitor: VISITOR is abstract
 
 	# Where global declaration are stored (the main .h)
-	var header: CodeWriter is writable
+	var header: CodeWriter is writable, noinit
 
 	# Provide a declaration that can be requested (before or latter) by a visitor
 	fun provide_declaration(key: String, s: String)
@@ -526,9 +538,9 @@ abstract class AbstractCompiler
 		stream.write("static const C_Nit_Names map[{names.length}] = \{\n")
 		for i in names.keys do
 			stream.write("\{\"")
-			stream.write(i)
+			stream.write(i.escape_to_c)
 			stream.write("\",\"")
-			stream.write(names[i])
+			stream.write(names[i].escape_to_c)
 			stream.write("\"\},\n")
 		end
 		stream.write("\};\n")
@@ -902,12 +914,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
@@ -918,12 +926,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
@@ -1015,9 +1019,8 @@ class CodeWriter
 	# (used for local or global declaration)
 	fun add_decl(s: String) do self.decl_lines.add(s)
 
-	init(file: CodeFile)
+	init
 	do
-		self.file = file
 		file.writers.add(self)
 	end
 end
@@ -1033,8 +1036,8 @@ abstract class AbstractCompilerVisitor
 	# The current visited AST node
 	var current_node: nullable ANode = null is writable
 
-	# The current `Frame`
-	var frame: nullable Frame 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
@@ -1042,11 +1045,10 @@ abstract class AbstractCompilerVisitor
 	# Alias for self.compiler.mainmodule.bool_type
 	fun bool_type: MClassType do return self.compiler.mainmodule.bool_type
 
-	var writer: CodeWriter
+	var writer: CodeWriter is noinit
 
-	init(compiler: COMPILER)
+	init
 	do
-		self.compiler = compiler
 		self.writer = new CodeWriter(compiler.files.last)
 	end
 
@@ -1277,11 +1279,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
 
@@ -1293,8 +1295,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
@@ -1534,6 +1534,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)
@@ -1630,11 +1639,8 @@ class RuntimeVariable
 	# false (usual value) means that the variable is a mcasttype or a subtype.
 	var is_exact: Bool = false is writable
 
-	init(name: String, mtype: MType, mcasttype: MType)
+	init
 	do
-		self.name = name
-		self.mtype = mtype
-		self.mcasttype = mcasttype
 		assert not mtype.need_anchor
 		assert not mcasttype.need_anchor
 	end
@@ -1659,8 +1665,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
 
@@ -1682,6 +1688,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
@@ -1693,21 +1706,9 @@ 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
 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.name.to_cmangle}__{mclass.name.to_cmangle}"
-		self.c_name_cache = res
-		return res
-	end
 
 	redef fun ctype: String
 	do
@@ -1758,90 +1759,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.name.to_cmangle}__{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.name.to_cmangle}__{self.mclassdef.mclass.name.to_cmangle}__{self.mproperty.name.to_cmangle}"
-		self.c_name_cache = res
-		return res
-	end
 end
 
 redef class MMethodDef
@@ -1850,10 +1769,10 @@ redef class MMethodDef
 	do
 		if is_abstract then return true
 		var modelbuilder = v.compiler.modelbuilder
-		if modelbuilder.mpropdef2npropdef.has_key(self) then
-			var npropdef = modelbuilder.mpropdef2npropdef[self]
-			return npropdef.can_inline
-		else if self.mproperty.is_root_init then
+		var node = modelbuilder.mpropdef2node(self)
+		if node isa APropdef then
+			return node.can_inline
+		else if node isa AClassdef then
 			# Automatic free init is always inlined since it is empty or contains only attribtes assigments
 			return true
 		else
@@ -1866,19 +1785,18 @@ redef class MMethodDef
 	do
 		var modelbuilder = v.compiler.modelbuilder
 		var val = constant_value
-		if modelbuilder.mpropdef2npropdef.has_key(self) then
-			var npropdef = modelbuilder.mpropdef2npropdef[self]
+		var node = modelbuilder.mpropdef2node(self)
+		if node isa APropdef then
 			var oldnode = v.current_node
-			v.current_node = npropdef
+			v.current_node = node
 			self.compile_parameter_check(v, arguments)
-			npropdef.compile_to_c(v, self, arguments)
+			node.compile_to_c(v, self, arguments)
 			v.current_node = oldnode
-		else if self.mproperty.is_root_init then
-			var nclassdef = modelbuilder.mclassdef2nclassdef[self.mclassdef]
+		else if node isa AClassdef then
 			var oldnode = v.current_node
-			v.current_node = nclassdef
+			v.current_node = node
 			self.compile_parameter_check(v, arguments)
-			nclassdef.compile_to_c(v, self, arguments)
+			node.compile_to_c(v, self, arguments)
 			v.current_node = oldnode
 		else if val != null then
 			v.ret(v.value_instance(val))
@@ -2293,6 +2211,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
@@ -2351,7 +2271,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.as_notnullable.as(MClassType), [recv])
 		v.frame = frame
 
 		var value
@@ -2390,7 +2310,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)
@@ -2744,13 +2664,18 @@ 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
 
@@ -3056,7 +2981,7 @@ 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)