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

diff --git a/src/compiler/separate_compiler.nit b/src/compiler/separate_compiler.nit
index e67c199..45790b3 100644
--- a/src/compiler/separate_compiler.nit
+++ b/src/compiler/separate_compiler.nit
@@ -252,11 +252,11 @@ class SeparateCompiler
 	do
 		# Collect all bas box class
 		# FIXME: this is not completely fine with a separate compilation scheme
-		for classname in ["Int", "Bool", "Byte", "Char", "Float", "NativeString",
+		for classname in ["Int", "Bool", "Byte", "Char", "Float", "CString",
 		                 "Pointer", "Int8", "Int16", "UInt16", "Int32", "UInt32"] do
 			var classes = self.mainmodule.model.get_mclasses_by_name(classname)
 			if classes == null then continue
-			assert classes.length == 1 else print classes.join(", ")
+			assert classes.length == 1 else print_error classes.join(", ")
 			self.box_kinds[classes.first] = self.box_kinds.length + 1
 		end
 	end
@@ -269,7 +269,7 @@ class SeparateCompiler
 		#if mclass.mclass_type.ctype == "val*" or mclass.mclass_type.is_subtype(self.mainmodule, mclass.mclass_type pointer_type) then
 		if mclass.mclass_type.ctype_extern == "val*" then
 			return 0
-		else if mclass.kind == extern_kind and mclass.name != "NativeString" then
+		else if mclass.kind == extern_kind and mclass.name != "CString" then
 			return self.box_kinds[self.mainmodule.pointer_type.mclass]
 		else
 			return self.box_kinds[mclass]
@@ -877,7 +877,8 @@ class SeparateCompiler
 			self.provide_declaration("BOX_{c_name}", "val* BOX_{c_name}({mtype.ctype_extern});")
 			v.add_decl("/* allocate {mtype} */")
 			v.add_decl("val* BOX_{mtype.c_name}({mtype.ctype_extern} value) \{")
-			v.add("struct instance_{c_name}*res = nit_alloc(sizeof(struct instance_{c_name}));")
+			var alloc = v.nit_alloc("sizeof(struct instance_{c_name})", mclass.full_name)
+			v.add("struct instance_{c_name}*res = {alloc};")
 			v.compiler.undead_types.add(mtype)
 			v.require_declaration("type_{c_name}")
 			v.add("res->type = &type_{c_name};")
@@ -899,7 +900,8 @@ class SeparateCompiler
 			else
 				var res = v.new_named_var(mtype, "self")
 				res.is_exact = true
-				v.add("{res} = nit_alloc(sizeof(struct instance_{mtype.c_name}));")
+				alloc = v.nit_alloc("sizeof(struct instance_{mtype.c_name})", mclass.full_name)
+				v.add("{res} = {alloc};")
 				v.add("{res}->type = type;")
 				hardening_live_type(v, "type")
 				v.require_declaration("class_{c_name}")
@@ -926,7 +928,8 @@ class SeparateCompiler
 			var res = v.get_name("self")
 			v.add_decl("struct instance_{c_name} *{res};")
 			var mtype_elt = mtype.arguments.first
-			v.add("{res} = nit_alloc(sizeof(struct instance_{c_name}) + length*sizeof({mtype_elt.ctype}));")
+			var alloc = v.nit_alloc("sizeof(struct instance_{c_name}) + length*sizeof({mtype_elt.ctype})", mclass.full_name)
+			v.add("{res} = {alloc};")
 			v.add("{res}->type = type;")
 			hardening_live_type(v, "type")
 			v.require_declaration("class_{c_name}")
@@ -935,9 +938,9 @@ class SeparateCompiler
 			v.add("return (val*){res};")
 			v.add("\}")
 			return
-		else if mtype.mclass.kind == extern_kind and mtype.mclass.name != "NativeString" then
-			# Is an extern class (other than Pointer and NativeString)
-			# Pointer is caught in a previous `if`, and NativeString is internal
+		else if mtype.mclass.kind == extern_kind and mtype.mclass.name != "CString" then
+			# Is an extern class (other than Pointer and CString)
+			# Pointer is caught in a previous `if`, and CString is internal
 
 			var pointer_type = mainmodule.pointer_type
 
@@ -949,7 +952,8 @@ class SeparateCompiler
 			else
 				var res = v.new_named_var(mtype, "self")
 				res.is_exact = true
-				v.add("{res} = nit_alloc(sizeof(struct instance_{pointer_type.c_name}));")
+				var alloc = v.nit_alloc("sizeof(struct instance_{pointer_type.c_name})", mclass.full_name)
+				v.add("{res} = {alloc};")
 				v.add("{res}->type = type;")
 				hardening_live_type(v, "type")
 				v.require_declaration("class_{c_name}")
@@ -972,9 +976,11 @@ class SeparateCompiler
 			res.is_exact = true
 			var attrs = self.attr_tables.get_or_null(mclass)
 			if attrs == null then
-				v.add("{res} = nit_alloc(sizeof(struct instance));")
+				var alloc = v.nit_alloc("sizeof(struct instance)", mclass.full_name)
+				v.add("{res} = {alloc};")
 			else
-				v.add("{res} = nit_alloc(sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t));")
+				var alloc = v.nit_alloc("sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t)", mclass.full_name)
+				v.add("{res} = {alloc};")
 			end
 			v.add("{res}->type = type;")
 			hardening_live_type(v, "type")
@@ -1236,7 +1242,7 @@ class SeparateCompilerVisitor
 				return res
 			end
 			var valtype = value.mtype.as(MClassType)
-			if mtype isa MClassType and mtype.mclass.kind == extern_kind and mtype.mclass.name != "NativeString" then
+			if mtype isa MClassType and mtype.mclass.kind == extern_kind and mtype.mclass.name != "CString" then
 				valtype = compiler.mainmodule.pointer_type
 			end
 			var res = self.new_var(mtype)
@@ -1261,7 +1267,7 @@ class SeparateCompilerVisitor
 	redef fun unbox_extern(value, mtype)
 	do
 		if mtype isa MClassType and mtype.mclass.kind == extern_kind and
-		   mtype.mclass.name != "NativeString" then
+		   mtype.mclass.name != "CString" then
 			var pointer_type = compiler.mainmodule.pointer_type
 			var res = self.new_var_extern(mtype)
 			self.add "{res} = ((struct instance_{pointer_type.c_name}*){value})->value; /* unboxing {value.mtype} */"
@@ -1274,7 +1280,7 @@ class SeparateCompilerVisitor
 	redef fun box_extern(value, mtype)
 	do
 		if mtype isa MClassType and mtype.mclass.kind == extern_kind and
-		   mtype.mclass.name != "NativeString" then
+		   mtype.mclass.name != "CString" then
 			var valtype = compiler.mainmodule.pointer_type
 			var res = self.new_var(mtype)
 			compiler.undead_types.add(mtype)
@@ -1399,8 +1405,7 @@ class SeparateCompilerVisitor
 		var res: nullable RuntimeVariable = null
 		var recv = arguments.first
 		var consider_null = not self.compiler.modelbuilder.toolcontext.opt_no_check_null.value or mmethod.name == "==" or mmethod.name == "!="
-		var maybenull = (recv.mcasttype isa MNullableType or recv.mcasttype isa MNullType) and consider_null
-		if maybenull then
+		if maybe_null(recv) and consider_null then
 			self.add("if ({recv} == NULL) \{")
 			if mmethod.name == "==" or mmethod.name == "is_same_instance" then
 				res = self.new_var(bool_type)
@@ -1883,7 +1888,7 @@ class SeparateCompilerVisitor
 		if not value.mtype.is_c_primitive then
 			self.add "{res} = {value} == NULL ? \"null\" : {type_info(value)}->name;"
 		else if value.mtype isa MClassType and value.mtype.as(MClassType).mclass.kind == extern_kind and
-			value.mtype.as(MClassType).name != "NativeString" then
+			value.mtype.as(MClassType).name != "CString" then
 			self.add "{res} = \"{value.mtype.as(MClassType).mclass}\";"
 		else
 			self.require_declaration("type_{value.mtype.c_name}")
@@ -2056,12 +2061,6 @@ class SeparateCompilerVisitor
 		return k == interface_kind or t.is_c_primitive
 	end
 
-	fun maybe_null(value: RuntimeVariable): Bool
-	do
-		var t = value.mcasttype
-		return t isa MNullableType or t isa MNullType
-	end
-
 	redef fun array_instance(array, elttype)
 	do
 		var nclass = mmodule.native_array_class
@@ -2080,7 +2079,7 @@ class SeparateCompilerVisitor
 		return res
 	end
 
-	redef fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable
+	redef fun native_array_instance(elttype, length)
 	do
 		var mtype = mmodule.native_array_type(elttype)
 		self.require_declaration("NEW_{mtype.mclass.c_name}")
@@ -2093,11 +2092,11 @@ class SeparateCompilerVisitor
 			var recv = self.frame.arguments.first
 			var recv_type_info = self.type_info(recv)
 			self.require_declaration(mtype.const_color)
-			return self.new_expr("NEW_{mtype.mclass.c_name}({length}, {recv_type_info}->resolution_table->types[{mtype.const_color}])", mtype)
+			return self.new_expr("NEW_{mtype.mclass.c_name}((int){length}, {recv_type_info}->resolution_table->types[{mtype.const_color}])", mtype)
 		end
 		compiler.undead_types.add(mtype)
 		self.require_declaration("type_{mtype.c_name}")
-		return self.new_expr("NEW_{mtype.mclass.c_name}({length}, &type_{mtype.c_name})", mtype)
+		return self.new_expr("NEW_{mtype.mclass.c_name}((int){length}, &type_{mtype.c_name})", mtype)
 	end
 
 	redef fun native_array_def(pname, ret_type, arguments)
@@ -2121,6 +2120,11 @@ class SeparateCompilerVisitor
 			var recv1 = "((struct instance_{nclass.c_name}*){arguments[1]})->values"
 			self.add("memmove({recv1}, {recv}, {arguments[2]}*sizeof({elttype.ctype}));")
 			return true
+		else if pname == "memmove" then
+			# fun memmove(start: Int, length: Int, dest: NativeArray[E], dest_start: Int) is intern do
+			var recv1 = "((struct instance_{nclass.c_name}*){arguments[3]})->values"
+			self.add("memmove({recv1}+{arguments[4]}, {recv}+{arguments[1]}, {arguments[2]}*sizeof({elttype.ctype}));")
+			return true
 		end
 		return false
 	end