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

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index c3fe70f..e56951b 100644
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -87,11 +87,11 @@ class RapidTypeAnalysis
 		var maintype = mainmodule.sys_type
 		if maintype == null then return # No entry point
 		add_new(maintype, maintype)
-		var initprop = mainmodule.try_get_primitive_method("init", maintype)
+		var initprop = mainmodule.try_get_primitive_method("init", maintype.mclass)
 		if initprop != null then
 			add_send(maintype, initprop)
 		end
-		var mainprop = mainmodule.try_get_primitive_method("main", maintype)
+		var mainprop = mainmodule.try_get_primitive_method("main", maintype.mclass)
 		if mainprop != null then
 			add_send(maintype, mainprop)
 		end
@@ -112,10 +112,9 @@ class RapidTypeAnalysis
 				#elttype = elttype.anchor_to(self.mainmodule, v.receiver)
 				var vararg = self.mainmodule.get_primitive_class("Array").get_mtype([elttype])
 				v.add_type(vararg)
-				vararg = v.cleanup_type(vararg).as(not null)
-				v.add_monomorphic_send(vararg, self.modelbuilder.force_get_primitive_method(node, "with_native", vararg, self.mainmodule))
 				var native = self.mainmodule.get_primitive_class("NativeArray").get_mtype([elttype])
 				v.add_type(native)
+				v.add_monomorphic_send(vararg, self.modelbuilder.force_get_primitive_method(node, "with_native", vararg.mclass, self.mainmodule))
 			end
 
 
@@ -339,7 +338,6 @@ class RapidTypeVisitor
 
 	redef fun visit(n)
 	do
-		if n == null then return
 		n.accept_rapid_type_visitor(self)
 		if n isa AExpr then
 			var implicit_cast_to = n.implicit_cast_to
@@ -371,7 +369,7 @@ class RapidTypeVisitor
 	do
 		var mtype = cleanup_type(recv)
 		assert mtype != null
-		return self.analysis.modelbuilder.force_get_primitive_method(self.current_node.as(not null), name, mtype, self.analysis.mainmodule)
+		return self.analysis.modelbuilder.force_get_primitive_method(self.current_node.as(not null), name, mtype.mclass, self.analysis.mainmodule)
 	end
 
 	fun add_type(mtype: MClassType) do analysis.add_new(receiver, mtype)
@@ -428,12 +426,10 @@ end
 redef class AStringFormExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		var mtype = self.mtype.as(MClassType)
-		v.add_type(mtype)
 		var native = v.get_class("NativeString").mclass_type
 		v.add_type(native)
-		var prop = v.get_method(mtype, "from_cstring")
-		v.add_monomorphic_send(mtype, prop)
+		var prop = v.get_method(native, "to_s_with_length")
+		v.add_monomorphic_send(native, prop)
 	end
 end