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

diff --git a/src/compiler/separate_erasure_compiler.nit b/src/compiler/separate_erasure_compiler.nit
index ee014f5..d1c67e5 100644
--- a/src/compiler/separate_erasure_compiler.nit
+++ b/src/compiler/separate_erasure_compiler.nit
@@ -39,6 +39,11 @@ redef class ToolContext
 		if opt_no_check_all.value then
 			opt_no_check_erasure_cast.value = true
 		end
+
+		# Temporary disabled. TODO: implement tagging in the erasure compiler.
+		if opt_erasure.value then
+			opt_no_tag_primitives.value = true
+		end
 	end
 
 	var erasure_compiler_phase = new ErasureCompilerPhase(self, null)
@@ -65,35 +70,8 @@ redef class ModelBuilder
 		self.toolcontext.info("*** GENERATING C ***", 1)
 
 		var compiler = new SeparateErasureCompiler(mainmodule, self, runtime_type_analysis)
-		compiler.compile_header
-
-		var c_name = mainmodule.c_name
-
-		# compile class structures
-		self.toolcontext.info("Property coloring", 2)
-		compiler.new_file("{c_name}.tables")
-		compiler.do_property_coloring
-		for m in mainmodule.in_importation.greaters do
-			for mclass in m.intro_mclasses do
-				compiler.compile_class_to_c(mclass)
-			end
-		end
-		compiler.compile_color_consts(compiler.vt_colors)
-
-		# The main function of the C
-		compiler.new_file("{c_name}.main")
-		compiler.compile_nitni_global_ref_functions
-		compiler.compile_main_function
-
-		# compile methods
-		for m in mainmodule.in_importation.greaters do
-			self.toolcontext.info("Generate C for module {m.full_name}", 2)
-			compiler.new_file("{m.c_name}.sep")
-			compiler.compile_module_to_c(m)
-		end
-
+		compiler.do_compilation
 		compiler.display_stats
-
 		var time1 = get_time
 		self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2)
 		write_and_make(compiler)
@@ -221,8 +199,6 @@ class SeparateErasureCompiler
 		var mtype = mclass.intro.bound_mtype
 		var c_name = mclass.c_name
 
-		var vft = self.method_tables[mclass]
-		var attrs = self.attr_tables[mclass]
 		var class_table = self.class_tables[mclass]
 		var v = self.new_visitor
 
@@ -252,7 +228,8 @@ class SeparateErasureCompiler
 			end
 			v.add_decl("&type_table_{c_name},")
 			v.add_decl("\{")
-			for i in [0 .. vft.length[ do
+			var vft = self.method_tables.get_or_null(mclass)
+			if vft != null then for i in [0 .. vft.length[ do
 				var mpropdef = vft[i]
 				if mpropdef == null then
 					v.add_decl("NULL, /* empty */")
@@ -262,13 +239,9 @@ class SeparateErasureCompiler
 						v.add_decl("NULL, /* DEAD {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
 						continue
 					end
-					if true or mpropdef.mclassdef.bound_mtype.ctype != "val*" then
-						v.require_declaration("VIRTUAL_{mpropdef.c_name}")
-						v.add_decl("(nitmethod_t)VIRTUAL_{mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
-					else
-						v.require_declaration("{mpropdef.c_name}")
-						v.add_decl("(nitmethod_t){mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
-					end
+					var rf = mpropdef.virtual_runtime_function
+					v.require_declaration(rf.c_name)
+					v.add_decl("(nitmethod_t){rf.c_name}, /* pointer to {mpropdef.full_name} */")
 				end
 			end
 			v.add_decl("\}")
@@ -381,11 +354,18 @@ class SeparateErasureCompiler
 
 			var res = v.new_named_var(mtype, "self")
 			res.is_exact = true
-			v.add("{res} = nit_alloc(sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t));")
+			var attrs = self.attr_tables.get_or_null(mclass)
+			if attrs == null then
+				v.add("{res} = nit_alloc(sizeof(struct instance));")
+			else
+				v.add("{res} = nit_alloc(sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t));")
+			end
 			v.require_declaration("class_{c_name}")
 			v.add("{res}->class = &class_{c_name};")
-			self.generate_init_attr(v, res, mtype)
-			v.set_finalizer res
+			if attrs != null then
+				self.generate_init_attr(v, res, mtype)
+				v.set_finalizer res
+			end
 			v.add("return {res};")
 		end
 		v.add("\}")
@@ -435,6 +415,11 @@ class SeparateErasureCompiler
 		end
 	end
 
+	redef fun compile_types
+	do
+		compile_color_consts(vt_colors)
+	end
+
 	redef fun new_visitor do return new SeparateErasureCompilerVisitor(self)
 
 	# Stats
@@ -636,7 +621,7 @@ class SeparateErasureCompilerVisitor
 			var res = self.new_var(mtype)
 			if compiler.runtime_type_analysis != null and not compiler.runtime_type_analysis.live_types.has(value.mtype.as(MClassType)) then
 				self.add("/*no boxing of {value.mtype}: {value.mtype} is not live! */")
-				self.add("PRINT_ERROR(\"Dead code executed!\\n\"); show_backtrace(1);")
+				self.add("PRINT_ERROR(\"Dead code executed!\\n\"); fatal_exit(1);")
 				return res
 			end
 			self.require_declaration("BOX_{valtype.c_name}")