X-Git-Url: http://nitlanguage.org diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit index d2121e5..00cb5b7 100644 --- a/src/rapid_type_analysis.nit +++ b/src/rapid_type_analysis.nit @@ -28,6 +28,9 @@ import modelbuilder import typing import auto_super_init +import csv # for live_types_to_csv +import ordered_tree # for live_methods_to_tree + redef class ModelBuilder fun do_rapid_type_analysis(mainmodule: MModule): RapidTypeAnalysis do @@ -75,6 +78,57 @@ class RapidTypeAnalysis # Live call-to-super. var live_super_sends = new HashSet[MMethodDef] + # Return a ready-to-save CSV document objet that agregates informations about live types. + # Each discovered type is listed in a line, with its status: resolution, liveness, cast-liveness. + # Note: types are listed in an alphanumeric order to improve human reading. + fun live_types_to_csv: CSVDocument + do + # Gather all kind of type + var typeset = new HashSet[MType] + typeset.add_all(live_types) + typeset.add_all(live_open_types) + typeset.add_all(live_cast_types) + typeset.add_all(live_open_cast_types) + var types = typeset.to_a + (new CachedAlphaComparator).sort(types) + var res = new CSVDocument + res.header = ["Type", "Resolution", "Liveness", "Cast-liveness"] + for t in types do + var reso + if t.need_anchor then reso = "OPEN " else reso = "CLOSED" + var live + if t isa MClassType and (live_types.has(t) or live_open_types.has(t)) then live = "LIVE" else live = "DEAD" + var cast + if live_cast_types.has(t) or live_open_cast_types.has(t) then cast = "CAST LIVE" else cast = "CAST DEAD" + res.add_line(t, reso, live, cast) + end + return res + end + + # Return a ready-to-save OrderedTree object that agregates infomration about live methods. + # Note: methods are listed in an alphanumeric order to improve human reading. + fun live_methods_to_tree: OrderedTree[Object] + do + var tree = new OrderedTree[Object] + for x in live_methods do + var xn = x.full_name + tree.add(null, xn) + for z in x.mpropdefs do + var zn = z.to_s + if live_methoddefs.has(z) then + tree.add(xn, zn) + if live_super_sends.has(z) then + tree.add(zn, zn + "(super)") + end + else if live_super_sends.has(z) then + tree.add(xn, zn + "(super)") + end + end + end + tree.sort_with(alpha_comparator) + return tree + end + # Methods that are are still candidate to the try_send private var totry_methods = new HashSet[MMethod] @@ -158,7 +212,7 @@ class RapidTypeAnalysis var auto_super_inits = npropdef.auto_super_inits if auto_super_inits != null then for auto_super_init in auto_super_inits do - v.add_monomorphic_send(v.receiver, auto_super_init) + v.add_callsite(auto_super_init) end end else if npropdef isa AInternMethPropdef or