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

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index 7cbdaf9..9f97e45 100644
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -237,7 +237,7 @@ class RapidTypeAnalysis
 
 			if not modelbuilder.mpropdef2npropdef.has_key(mmethoddef) then
 				# It is an init for a class?
-				if mmeth.name == "init" then
+				if mmeth.is_root_init then
 					var nclassdef = self.modelbuilder.mclassdef2nclassdef[mmethoddef.mclassdef]
 					assert mmethoddef == nclassdef.mfree_init
 
@@ -267,9 +267,7 @@ class RapidTypeAnalysis
 				end
 			end
 
-			if mmeth.is_new then
-				v.add_type(v.receiver)
-			else if mmethoddef.is_intern or mmethoddef.is_extern then
+			if mmethoddef.is_intern or mmethoddef.is_extern then
 				# UGLY: We force the "instantation" of the concrete return type if any
 				var ret = mmethoddef.msignature.return_mtype
 				if ret != null and ret isa MClassType and ret.mclass.kind != abstract_kind and ret.mclass.kind != interface_kind then
@@ -351,11 +349,12 @@ class RapidTypeAnalysis
 			var nclassdef = self.modelbuilder.mclassdef2nclassdef[cd]
 			for npropdef in nclassdef.n_propdefs do
 				if not npropdef isa AAttrPropdef then continue
-				var nexpr = npropdef.n_expr
-				if nexpr == null then continue
+				if not npropdef.has_value then continue
+
 				var mpropdef = npropdef.mpropdef.as(not null)
 				var v = new RapidTypeVisitor(self, bound_mtype, mpropdef)
-				v.enter_visit(nexpr)
+				v.enter_visit(npropdef.n_expr)
+				v.enter_visit(npropdef.n_block)
 			end
 		end
 
@@ -442,11 +441,8 @@ class RapidTypeVisitor
 	var receiver: MClassType
 	var mpropdef: MPropDef
 
-	init(analysis: RapidTypeAnalysis, receiver: MClassType, mpropdef: MPropDef)
+	init
 	do
-		self.analysis = analysis
-		self.receiver = receiver
-		self.mpropdef = mpropdef
 		assert not receiver.need_anchor
 	end
 
@@ -678,13 +674,15 @@ redef class AForExpr
 			abort
 		end
 		v.add_callsite(self.method_next)
+		var mf = self.method_finish
+		if mf != null then v.add_callsite(mf)
 	end
 end
 
 redef class ANewExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		var mtype = self.mtype.as(MClassType)
+		var mtype = self.recvtype.as(not null)
 		v.add_type(mtype)
 		v.add_callsite(callsite)
 	end