From b0220f8a147e480292355b477ca13001f98d3144 Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Sat, 27 Dec 2008 00:28:50 -0500
Subject: [PATCH] Customize constructor call. Now that properties are not
 adapted during inheritance:  * compile_constructor_call
 takes the static type of the instantiated class  *
 constructors are customized according to the instantiated
 class

---
 src/compiling/compiling_global.nit  |    6 ++++--
 src/compiling/compiling_methods.nit |   15 +++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/compiling/compiling_global.nit b/src/compiling/compiling_global.nit
index b2c6931..92e3f4a 100644
--- a/src/compiling/compiling_global.nit
+++ b/src/compiling/compiling_global.nit
@@ -881,7 +881,8 @@ redef class MMLocalClass
 
 			for g in global_properties do
 				var p = self[g]
-				if not p.global.is_init or p.global.intro.local_class.global != global then continue
+				# FIXME skip invisible constructors
+				if not p.global.is_init then continue
 				v.clear
 				var params = new Array[String]
 				var args = ["self"]
@@ -890,7 +891,8 @@ redef class MMLocalClass
 					args.add("p{i}")
 				end
 				args.add("init_table")
-				var s = "val_t NEW_{p.global.intro.cname}({params.join(", ")})"
+				var s = "val_t NEW_{self}_{p.global.intro.cname}({params.join(", ")})"
+				v.add_decl(s + ";")
 				v.add_instr(s + " \{")
 				v.indent
 				v.add_instr(init_table_decl)
diff --git a/src/compiling/compiling_methods.nit b/src/compiling/compiling_methods.nit
index f055e0c..3706c57 100644
--- a/src/compiling/compiling_methods.nit
+++ b/src/compiling/compiling_methods.nit
@@ -246,11 +246,10 @@ redef class MMMethod
 	end
 
 	# Compile a call as constructor with given args
-	meth compile_constructor_call(v: CompilerVisitor, cargs: Array[String]): String
+	meth compile_constructor_call(v: CompilerVisitor, recvtype: MMType, cargs: Array[String]): String
 	do
 		var recv = v.get_var
-		var stype = signature.recv
-		v.add_instr("{recv} = NEW_{global.intro.cname}({cargs.join(", ")}); /*new {stype}*/")
+		v.add_instr("{recv} = NEW_{recvtype.local_class}_{global.intro.cname}({cargs.join(", ")}); /*new {recvtype}*/")
 		return recv
 	end
 
@@ -1045,7 +1044,7 @@ redef class AStringFormExpr
 	do
 		var prop = stype.local_class.select_method(once "with_native".to_symbol)
 		compute_string_info
-		return prop.compile_constructor_call(v, ["BOX_NativeString(\"{_cstring}\")", "TAG_Int({_cstring_length})"])
+		return prop.compile_constructor_call(v, stype , ["BOX_NativeString(\"{_cstring}\")", "TAG_Int({_cstring_length})"])
 	end
 
 	# The raw string value
@@ -1100,7 +1099,7 @@ redef class ASuperstringExpr
 	redef meth compile_expr(v)
 	do
 		var prop = stype.local_class.select_method(once "init".to_symbol)
-		var recv = prop.compile_constructor_call(v, new Array[String]) 
+		var recv = prop.compile_constructor_call(v, stype, new Array[String]) 
 
 		var prop2 = stype.local_class.select_method(once "append".to_symbol)
 
@@ -1128,7 +1127,7 @@ redef class AArrayExpr
 	redef meth compile_expr(v)
 	do
 		var prop = stype.local_class.select_method(once "with_capacity".to_symbol)
-		var recv = prop.compile_constructor_call(v,["TAG_Int({n_exprs.length})"])
+		var recv = prop.compile_constructor_call(v, stype, ["TAG_Int({n_exprs.length})"])
 
 		var prop2 = stype.local_class.select_method(once "add".to_symbol)
 		for ne in n_exprs do
@@ -1145,7 +1144,7 @@ redef class ARangeExpr
 		var prop = stype.local_class.select_method(propname)
 		var e = v.compile_expr(n_expr)
 		var e2 = v.compile_expr(n_expr2)
-		return prop.compile_constructor_call(v, [e, e2])
+		return prop.compile_constructor_call(v, stype, [e, e2])
 	end
 	# The constructor that must be used for the range
 	protected meth propname: Symbol is abstract
@@ -1270,7 +1269,7 @@ redef class ANewExpr
 		for a in arguments do
 			cargs.add(v.compile_expr(a))
 		end
-		return prop.compile_constructor_call(v, cargs) 
+		return prop.compile_constructor_call(v, stype, cargs) 
 	end
 end
 
-- 
1.7.9.5