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

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index 8fd6ed4..88e2b7e 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
@@ -82,6 +82,10 @@ class RapidTypeAnalysis
 	# Live methods.
 	var live_methods = new HashSet[MMethod]
 
+	# Live mmodules.
+	# Those with a live method definitions (see `live_methoddefs`)
+	var live_mmodules = new HashSet[MModule]
+
 	# Live callsites.
 	var live_callsites = new HashSet[CallSite]
 
@@ -128,7 +132,7 @@ class RapidTypeAnalysis
 		var types = typeset.to_a
 		(new CachedAlphaComparator).sort(types)
 		var res = new CsvDocument
-		res.format = new CsvFormat('"', ';', "\n")
+		res.separator = ';'
 		res.header = ["Type", "Resolution", "Liveness", "Cast-liveness"]
 		for t in types do
 			var reso
@@ -209,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
@@ -246,14 +255,18 @@ class RapidTypeAnalysis
 				add_cast(paramtype)
 			end
 
+			if mmethoddef.is_abstract then continue
+
 			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
@@ -303,7 +316,9 @@ class RapidTypeAnalysis
 				if not check_depth(rt) then continue
 				#print "{ot}/{t} -> {rt}"
 				live_types.add(rt)
-				todo_types.add(rt)
+				# unshift means a deep-first visit.
+				# So that the `check_depth` limit is reached sooner.
+				todo_types.unshift(rt)
 			end
 		end
 		#print "MType {live_types.length}: {live_types.join(", ")}"
@@ -389,6 +404,7 @@ class RapidTypeAnalysis
 	do
 		if live_methoddefs.has(mpropdef) then return
 		live_methoddefs.add(mpropdef)
+		live_mmodules.add(mpropdef.mclassdef.mmodule)
 		todo.add(mpropdef)
 
 		var mproperty = mpropdef.mproperty
@@ -530,14 +546,7 @@ redef class AExpr
 	end
 end
 
-redef class AIntExpr
-	redef fun accept_rapid_type_visitor(v)
-	do
-		allocate_mtype(v)
-	end
-end
-
-redef class AByteExpr
+redef class AIntegerExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
 		allocate_mtype(v)
@@ -578,8 +587,13 @@ 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)
+		v.add_callsite(to_re)
+		v.add_callsite(ignore_case)
+		v.add_callsite(newline)
+		v.add_callsite(extended)
+		v.add_callsite(to_bytes_with_copy)
 	end
 end
 
@@ -603,7 +617,8 @@ end
 redef class ACrangeExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		var mtype = self.mtype.as(MClassType)
+		var mtype = self.mtype
+		if not mtype isa MClassType then return
 		v.add_type(mtype)
 		v.add_callsite(init_callsite)
 	end
@@ -612,7 +627,8 @@ end
 redef class AOrangeExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		var mtype = self.mtype.as(MClassType)
+		var mtype = self.mtype
+		if not mtype isa MClassType then return
 		v.add_type(mtype)
 		v.add_callsite(init_callsite)
 	end
@@ -635,14 +651,18 @@ end
 redef class AIsaExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		v.add_cast_type(self.cast_type.as(not null))
+		var cast_type = self.cast_type
+		if cast_type == null then return
+		v.add_cast_type(cast_type)
 	end
 end
 
 redef class AAsCastExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		v.add_cast_type(self.mtype.as(not null))
+		var mtype = self.mtype
+		if mtype == null then return
+		v.add_cast_type(mtype)
 	end
 end
 
@@ -690,7 +710,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)