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

diff --git a/src/global_compiler.nit b/src/global_compiler.nit
index e43992a..8c6ac6c 100644
--- a/src/global_compiler.nit
+++ b/src/global_compiler.nit
@@ -26,6 +26,29 @@ module global_compiler
 import abstract_compiler
 import rapid_type_analysis
 
+redef class ToolContext
+	# option --global
+	var opt_global = new OptionBool("Use global compilation", "--global")
+
+	var global_compiler_phase = new GlobalCompilerPhase(self, null)
+
+	redef init do
+		super
+		option_context.add_option(opt_global)
+	end
+end
+
+class GlobalCompilerPhase
+	super Phase
+	redef fun process_mainmodule(mainmodule, given_mmodules) do
+		if not toolcontext.opt_global.value then return
+
+		var modelbuilder = toolcontext.modelbuilder
+		var analysis = modelbuilder.do_rapid_type_analysis(mainmodule)
+		modelbuilder.run_global_compiler(mainmodule, analysis)
+	end
+end
+
 redef class ModelBuilder
 	# Entry point to performs a global compilation on the AST of a complete program.
 	# `mainmodule` is the main module of the program
@@ -165,6 +188,7 @@ class GlobalCompiler
 
 		if mtype.mclass.name == "NativeArray" then
 			# NativeArrays are just a instance header followed by an array of values
+			v.add_decl("int length;")
 			v.add_decl("{mtype.arguments.first.ctype} values[1];")
 		end
 
@@ -212,6 +236,7 @@ class GlobalCompiler
 		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("((struct {mtype.c_name}*){res})->length = length;")
 		else
 			v.add("{res} = nit_alloc(sizeof(struct {mtype.c_name}));")
 		end
@@ -318,6 +343,9 @@ class GlobalCompilerVisitor
 		else if pname == "[]=" then
 			self.add("{recv}[{arguments[1]}]={arguments[2]};")
 			return
+		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
 		else if pname == "copy_to" then
 			var recv1 = "((struct {arguments[1].mcasttype.c_name}*){arguments[1]})->values"
 			self.add("memcpy({recv1},{recv},{arguments[2]}*sizeof({elttype.ctype}));")
@@ -325,6 +353,12 @@ class GlobalCompilerVisitor
 		end
 	end
 
+	redef fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable
+	do
+		var ret_type = self.get_class("NativeArray").get_mtype([elttype])
+		return self.new_expr("NEW_{ret_type.c_name}({length})", ret_type)
+	end
+
 	redef fun calloc_array(ret_type, arguments)
 	do
 		self.ret(self.new_expr("NEW_{ret_type.c_name}({arguments[1]})", ret_type))