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

diff --git a/src/compiler/global_compiler.nit b/src/compiler/global_compiler.nit
index 9130588..b0d5c27 100644
--- a/src/compiler/global_compiler.nit
+++ b/src/compiler/global_compiler.nit
@@ -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}));")
@@ -312,7 +311,7 @@ class GlobalCompilerVisitor
 			var res = self.new_var(mtype)
 			if not compiler.runtime_type_analysis.live_types.has(valtype) then
 				self.add("/*no autobox from {value.mtype} to {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.add("{res} = BOX_{valtype.c_name}({value}); /* autobox from {value.mtype} to {mtype} */")
@@ -323,7 +322,7 @@ class GlobalCompilerVisitor
 			# Bad things will appen!
 			var res = self.new_var(mtype)
 			self.add("/* {res} left unintialized (cannot convert {value.mtype} to {mtype}) */")
-			self.add("PRINT_ERROR(\"Cast error: Cannot cast %s to %s.\\n\", \"{value.mtype}\", \"{mtype}\"); show_backtrace(1);")
+			self.add("PRINT_ERROR(\"Cast error: Cannot cast %s to %s.\\n\", \"{value.mtype}\", \"{mtype}\"); fatal_exit(1);")
 			return res
 		end
 	end
@@ -349,7 +348,7 @@ class GlobalCompilerVisitor
 		var res = self.new_var(mtype)
 		if 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.add("{res} = BOX_{valtype.c_name}({value}); /* boxing {value.mtype} */")
@@ -386,27 +385,47 @@ 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
-		end
+			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
 	do
-		var ret_type = self.get_class("NativeArray").get_mtype([elttype])
+		var ret_type = mmodule.native_array_type(elttype)
 		ret_type = anchor(ret_type).as(MClassType)
+		length = autobox(length, compiler.mainmodule.int_type)
 		return self.new_expr("NEW_{ret_type.c_name}({length})", ret_type)
 	end
 
+	redef fun native_array_get(nat, i)
+	do
+		var recv = "((struct {nat.mcasttype.c_name}*){nat})->values"
+		var ret_type = nat.mcasttype.as(MClassType).arguments.first
+		return self.new_expr("{recv}[{i}]", ret_type)
+	end
+
+	redef fun native_array_set(nat, i, val)
+	do
+		var recv = "((struct {nat.mcasttype.c_name}*){nat})->values"
+		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))
@@ -515,11 +534,6 @@ class GlobalCompilerVisitor
 	private fun get_recvtype(m: MMethodDef, recvtype: MClassType, args: Array[RuntimeVariable]): MClassType
 	do
 		check_valid_reciever(recvtype)
-		#debug("call {m} on {recvtype} on {args.first}:{args.first.mtype}")
-		if m.mproperty.is_toplevel then
-			# Do not customize top-level methods
-			recvtype = m.mclassdef.bound_mtype
-		end
 		return recvtype
 	end
 
@@ -597,8 +611,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)
@@ -610,8 +625,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)
@@ -630,7 +646,7 @@ class GlobalCompilerVisitor
 	do
 		if recv.mtype.is_c_primitive then return
 		self.add("PRINT_ERROR(\"BTD BUG: Dynamic type is %s, static type is %s\\n\", class_names[{recv}->classid], \"{recv.mcasttype}\");")
-		self.add("show_backtrace(1);")
+		self.add("fatal_exit(1);")
 	end
 
 	redef fun isset_attribute(a, recv)
@@ -894,10 +910,10 @@ class GlobalCompilerVisitor
 	redef fun array_instance(array, elttype)
 	do
 		elttype = self.anchor(elttype)
-		var arraytype = self.get_class("Array").get_mtype([elttype])
+		var arraytype = mmodule.array_type(elttype)
 		var res = self.init_instance(arraytype)
 		self.add("\{ /* {res} = array_instance Array[{elttype}] */")
-		var nat = self.new_var(self.get_class("NativeArray").get_mtype([elttype]))
+		var nat = self.new_var(mmodule.native_array_type(elttype))
 		nat.is_exact = true
 		self.add("{nat} = NEW_{nat.mtype.c_name}({array.length});")
 		for i in [0..array.length[ do
@@ -989,9 +1005,10 @@ 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
-				mtype = v.get_class("Array").get_mtype([mtype])
+			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)
 			comment.append(", {mtype}")