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

diff --git a/src/global_compiler.nit b/src/global_compiler.nit
index 4741df6..9c17518 100644
--- a/src/global_compiler.nit
+++ b/src/global_compiler.nit
@@ -33,14 +33,13 @@ redef class ModelBuilder
 	fun run_global_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis)
 	do
 		var time0 = get_time
-		self.toolcontext.info("*** COMPILING TO C ***", 1)
+		self.toolcontext.info("*** GENERATING C ***", 1)
 
 		var compiler = new GlobalCompiler(mainmodule, self, runtime_type_analysis)
 		compiler.compile_header
-		var v = compiler.header
 
 		for t in runtime_type_analysis.live_types do
-			compiler.declare_runtimeclass(v, t)
+			compiler.declare_runtimeclass(t)
 		end
 
 		compiler.compile_class_names
@@ -64,12 +63,12 @@ redef class ModelBuilder
 			self.toolcontext.info("Compile {m} ({compiler.seen.length-compiler.todos.length}/{compiler.seen.length})", 3)
 			m.compile_to_c(compiler)
 		end
-		self.toolcontext.info("Total methods to compile to C: {compiler.visitors.length}", 2)
+		self.toolcontext.info("Total methods to compile to C: {compiler.seen.length}", 2)
 
 		compiler.display_stats
 
 		var time1 = get_time
-		self.toolcontext.info("*** END VISITING: {time1-time0} ***", 2)
+		self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2)
 		write_and_make(compiler)
 	end
 end
@@ -89,7 +88,8 @@ class GlobalCompiler
 	init(mainmodule: MModule, modelbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis)
 	do
 		super(mainmodule, modelbuilder)
-		self.header = new_visitor
+		var file = new_file(mainmodule.name)
+		self.header = new CodeWriter(file)
 		self.runtime_type_analysis = runtime_type_analysis
 		self.live_primitive_types = new Array[MClassType]
 		for t in runtime_type_analysis.live_types do
@@ -101,12 +101,13 @@ class GlobalCompiler
 
 	# Compile class names (for the class_name and output_class_name methods)
 	protected fun compile_class_names do
+		var v = new_visitor
 		self.header.add_decl("extern const char const * class_names[];")
-		self.header.add("const char const * class_names[] = \{")
+		v.add("const char const * class_names[] = \{")
 		for t in self.runtime_type_analysis.live_types do
-			self.header.add("\"{t}\", /* {self.classid(t)} */")
+			v.add("\"{t}\", /* {self.classid(t)} */")
 		end
-		self.header.add("\};")
+		v.add("\};")
 	end
 
 	# Return the C symbol associated to a live type runtime
@@ -124,9 +125,9 @@ class GlobalCompiler
 	protected var classids: HashMap[MClassType, String] = new HashMap[MClassType, String]
 
 	# Declaration of structures the live Nit types
-	# Each live type is generated as an independent C `struct' type.
+	# Each live type is generated as an independent C `struct` type.
 	# They only share a common first field `classid` used to implement the polymorphism.
-	# Usualy, all C variables that refers to a Nit object are typed on the abstract struct `val' that contains only the `classid` field.
+	# Usualy, all C variables that refers to a Nit object are typed on the abstract struct `val` that contains only the `classid` field.
 	redef fun compile_header_structs do
 		self.header.add_decl("typedef struct \{int classid;\} val; /* general C type representing a Nit instance. */")
 	end
@@ -150,8 +151,9 @@ class GlobalCompiler
 	private var seen: HashSet[AbstractRuntimeFunction] = new HashSet[AbstractRuntimeFunction]
 
 	# Declare C structures and identifiers for a runtime class
-	fun declare_runtimeclass(v: VISITOR, mtype: MClassType)
+	fun declare_runtimeclass(mtype: MClassType)
 	do
+		var v = self.header
 		assert self.runtime_type_analysis.live_types.has(mtype)
 		v.add_decl("/* runtime class {mtype} */")
 		var idnum = classids.length
@@ -210,9 +212,9 @@ class GlobalCompiler
 		res.is_exact = true
 		if is_native_array then
 			var mtype_elt = mtype.arguments.first
-			v.add("{res} = GC_MALLOC(sizeof(struct {mtype.c_name}) + length*sizeof({mtype_elt.ctype}));")
+			v.add("{res} = nit_alloc(sizeof(struct {mtype.c_name}) + length*sizeof({mtype_elt.ctype}));")
 		else
-			v.add("{res} = GC_MALLOC(sizeof(struct {mtype.c_name}));")
+			v.add("{res} = nit_alloc(sizeof(struct {mtype.c_name}));")
 		end
 		v.add("{res}->classid = {self.classid(mtype)};")
 
@@ -243,7 +245,7 @@ class GlobalCompiler
 		self.header.add_decl("val* BOX_{mtype.c_name}({mtype.ctype});")
 		v.add_decl("/* allocate {mtype} */")
 		v.add_decl("val* BOX_{mtype.c_name}({mtype.ctype} value) \{")
-		v.add("struct {mtype.c_name}*res = GC_MALLOC(sizeof(struct {mtype.c_name}));")
+		v.add("struct {mtype.c_name}*res = nit_alloc(sizeof(struct {mtype.c_name}));")
 		v.add("res->classid = {self.classid(mtype)};")
 		v.add("res->value = value;")
 		v.add("return (val*)res;")