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

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index 87e808c..f763a56 100644
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -25,7 +25,7 @@ module rapid_type_analysis
 
 import semantize
 
-private import csv # for live_types_to_csv
+import csv # for live_types_to_csv
 private import ordered_tree # for live_methods_to_tree
 
 private import more_collections
@@ -213,11 +213,16 @@ class RapidTypeAnalysis
 
 		# Force primitive types
 		force_alive("Bool")
-		force_alive("Int")
 		force_alive("Float")
 		force_alive("Char")
 		force_alive("Pointer")
 		force_alive("Byte")
+		force_alive("Int")
+		force_alive("Int8")
+		force_alive("Int16")
+		force_alive("UInt16")
+		force_alive("Int32")
+		force_alive("UInt32")
 
 		while not todo.is_empty do
 			var mmethoddef = todo.shift
@@ -253,11 +258,13 @@ class RapidTypeAnalysis
 			var npropdef = modelbuilder.mpropdef2node(mmethoddef)
 
 			if npropdef isa AClassdef then
-				# It is an init for a class
-				assert mmethoddef == npropdef.mfree_init
-
-				if mmethoddef.mproperty.is_root_init and not mmethoddef.is_intro then
-					self.add_super_send(v.receiver, mmethoddef)
+				if mmethoddef.mproperty.is_root_init then
+					if not mmethoddef.is_intro then
+						self.add_super_send(v.receiver, mmethoddef)
+					end
+				else
+					npropdef.debug "cannot RTA {mmethoddef}"
+					abort
 				end
 				continue
 			else if mmethoddef.constant_value != null then
@@ -576,7 +583,7 @@ redef class AStringFormExpr
 	do
 		var native = v.analysis.mainmodule.native_string_type
 		v.add_type(native)
-		var prop = v.get_method(native, "to_s_with_length")
+		var prop = v.get_method(native, "to_s_full")
 		v.add_monomorphic_send(native, prop)
 	end
 end
@@ -694,7 +701,7 @@ redef class ASuperExpr
 	end
 end
 
-redef class AForExpr
+redef class AForGroup
 	redef fun accept_rapid_type_visitor(v)
 	do
 		v.add_callsite(self.method_iterator)