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

diff --git a/src/compiler/global_compiler.nit b/src/compiler/global_compiler.nit
index b2cf479..7b07847 100644
--- a/src/compiler/global_compiler.nit
+++ b/src/compiler/global_compiler.nit
@@ -151,7 +151,7 @@ class GlobalCompiler
 		if self.classids.has_key(mtype) then
 			return self.classids[mtype]
 		end
-		print "No classid for {mtype}"
+		print_error "No classid for {mtype}"
 		abort
 	end
 
@@ -246,8 +246,7 @@ class GlobalCompiler
 		var res = v.new_var(mtype)
 		res.is_exact = true
 		if is_native_array then
-			var mtype_elt = mtype.arguments.first
-			v.add("{res} = nit_alloc(sizeof(struct {mtype.c_name}) + length*sizeof({mtype_elt.ctype}));")
+			v.add("{res} = nit_alloc(sizeof(struct {mtype.c_name}) + length*sizeof(val*));")
 			v.add("((struct {mtype.c_name}*){res})->length = length;")
 		else
 			v.add("{res} = nit_alloc(sizeof(struct {mtype.c_name}));")
@@ -331,7 +330,7 @@ class GlobalCompilerVisitor
 	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 res = self.new_var_extern(mtype)
 			self.add "{res} = ((struct {mtype.c_name}*){value})->value; /* unboxing {value.mtype} */"
 			return res
@@ -343,7 +342,7 @@ class GlobalCompilerVisitor
 	redef fun box_extern(value, mtype)
 	do
 		if not mtype isa MClassType or mtype.mclass.kind != extern_kind or
-			mtype.mclass.name == "NativeString" then return value
+			mtype.mclass.name == "CString" then return value
 
 		var valtype = value.mtype.as(MClassType)
 		var res = self.new_var(mtype)
@@ -386,18 +385,24 @@ class GlobalCompilerVisitor
 		var recv = "((struct {arguments[0].mcasttype.c_name}*){arguments[0]})->values"
 		if pname == "[]" then
 			self.ret(self.new_expr("{recv}[{arguments[1]}]", ret_type.as(not null)))
-			return
+			return true
 		else if pname == "[]=" then
 			self.add("{recv}[{arguments[1]}]={arguments[2]};")
-			return
+			return true
 		else if pname == "length" then
 			self.ret(self.new_expr("((struct {arguments[0].mcasttype.c_name}*){arguments[0]})->length", ret_type.as(not null)))
-			return
+			return true
 		else if pname == "copy_to" then
 			var recv1 = "((struct {arguments[1].mcasttype.c_name}*){arguments[1]})->values"
 			self.add("memmove({recv1},{recv},{arguments[2]}*sizeof({elttype.ctype}));")
-			return
+			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 {arguments[3].mcasttype.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
 
 	redef fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable
@@ -421,11 +426,6 @@ class GlobalCompilerVisitor
 		self.add("{recv}[{i}]={val};")
 	end
 
-	redef fun calloc_array(ret_type, arguments)
-	do
-		self.ret(self.new_expr("NEW_{ret_type.c_name}({arguments[1]})", ret_type))
-	end
-
 	redef fun send(m, args)
 	do
 		var types = self.collect_types(args.first)
@@ -443,6 +443,10 @@ class GlobalCompilerVisitor
 		if args.first.mtype.is_c_primitive then
 			var mclasstype = args.first.mtype.as(MClassType)
 			if not self.compiler.runtime_type_analysis.live_types.has(mclasstype) then
+				self.add("/* skip, dead class {mclasstype} */")
+				return res
+			end
+			if not mclasstype.has_mproperty(self.compiler.mainmodule, m) then
 				self.add("/* skip, no method {m} */")
 				return res
 			end
@@ -519,7 +523,7 @@ class GlobalCompilerVisitor
 	fun check_valid_reciever(recvtype: MClassType)
 	do
 		if self.compiler.runtime_type_analysis.live_types.has(recvtype) or recvtype.mclass.name == "Object" then return
-		print "{recvtype} is not a live type"
+		print_error "{recvtype} is not a live type"
 		abort
 	end
 
@@ -606,8 +610,9 @@ class GlobalCompilerVisitor
 	do
 		var recv = args.first
 		for i in [0..m.msignature.arity[ do
-			var t = m.msignature.mparameters[i].mtype
-			if i == m.msignature.vararg_rank then
+			var mp = m.msignature.mparameters[i]
+			var t = mp.mtype
+			if mp.is_vararg then
 				t = args[i+1].mtype
 			end
 			t = self.resolve_for(t, recv)
@@ -619,8 +624,9 @@ class GlobalCompilerVisitor
 	do
 		var recv = args.first
 		for i in [0..m.msignature.arity[ do
-			var t = m.msignature.mparameters[i].mtype
-			if i == m.msignature.vararg_rank then
+			var mp = m.msignature.mparameters[i]
+			var t = mp.mtype
+			if mp.is_vararg then
 				t = args[i+1].mtype
 			end
 			t = self.resolve_for(t, recv)
@@ -998,8 +1004,9 @@ private class CustomizedRuntimeFunction
 		comment.append("(self: {recv}")
 		arguments.add(selfvar)
 		for i in [0..mmethoddef.msignature.arity[ do
-			var mtype = mmethoddef.msignature.mparameters[i].mtype
-			if i == mmethoddef.msignature.vararg_rank then
+			var mp = mmethoddef.msignature.mparameters[i]
+			var mtype = mp.mtype
+			if mp.is_vararg then
 				mtype = v.mmodule.array_type(mtype)
 			end
 			mtype = v.resolve_for(mtype, selfvar)