var opt_inline_coloring_numbers: OptionBool = new OptionBool("Inline colors and ids", "--inline-coloring-numbers")
# --use-naive-coloring
- var opt_use_naive_coloring: OptionBool = new OptionBool("Colorize items incrementaly, used to simulate binary matrix typing", "--use-naive-coloring")
+ var opt_bm_typing: OptionBool = new OptionBool("Colorize items incrementaly, used to simulate binary matrix typing", "--bm-typing")
+
+ # --use-mod-perfect-hashing
+ var opt_phmod_typing: OptionBool = new OptionBool("Replace coloration by perfect hashing (with mod operator)", "--phmod-typing")
+
+ # --use-and-perfect-hashing
+ var opt_phand_typing: OptionBool = new OptionBool("Replace coloration by perfect hashing (with and operator)", "--phand-typing")
+
+ # --generic-resolution-tree
+ var opt_generic_tree: OptionBool = new OptionBool("Use tree representation for live generic types instead of flattened representation", "--generic-resolution-tree")
redef init
do
self.option_context.add_option(self.opt_separate)
self.option_context.add_option(self.opt_no_inline_intern)
self.option_context.add_option(self.opt_inline_coloring_numbers)
- self.option_context.add_option(self.opt_use_naive_coloring)
+ self.option_context.add_option(self.opt_bm_typing)
+ self.option_context.add_option(self.opt_phmod_typing)
+ self.option_context.add_option(self.opt_phand_typing)
+ self.option_context.add_option(self.opt_generic_tree)
end
end
end
end
+ # The main function of the C
+ compiler.compile_main_function
+
# compile methods
for m in mainmodule.in_importation.greaters do
compiler.compile_module_to_c(m)
compiler.compile_type_to_c(t)
end
- # compile live generic types selection structures
- for mclass in model.mclasses do
- compiler.compile_live_gentype_to_c(mclass)
+ if self.toolcontext.opt_generic_tree.value then
+ # compile live generic types selection structures
+ for mclass in model.mclasses do
+ compiler.compile_live_gentype_to_c(mclass)
+ end
end
write_and_make(compiler)
super GlobalCompiler # TODO better separation of concerns
private var undead_types: Set[MType] = new HashSet[MType]
+ private var partial_types: Set[MType] = new HashSet[MType]
protected var typeids: HashMap[MType, Int] protected writable = new HashMap[MType, Int]
private var type_colors: Map[MType, Int] = typeids
private var livetypes_colors: nullable Map[MType, Int]
private var livetypes_tables: nullable Map[MClass, Array[nullable Object]]
private var livetypes_tables_sizes: nullable Map[MClass, Array[Int]]
+ private var live_unanchored_types: Map[MClassDef, Set[MType]] = new HashMap[MClassDef, HashSet[MType]]
+
+ private var unanchored_types_colors: nullable Map[MClassType, Int]
+ private var unanchored_types_tables: nullable Map[MClassType, Array[nullable MClassType]]
+ private var unanchored_types_masks: nullable Map[MClassType, Int]
protected var class_coloring: ClassColoring
- protected var class_colors: Map[MClass, Int]
protected var method_colors: Map[MMethod, Int]
protected var method_tables: Map[MClass, Array[nullable MMethodDef]]
protected var vt_colors: Map[MVirtualTypeProp, Int]
protected var vt_tables: Map[MClass, Array[nullable MVirtualTypeDef]]
+ protected var vt_masks: nullable Map[MClass, Int]
- protected var ft_colors: nullable Map[MParameterType, Int]
- protected var ft_tables: nullable Map[MClass, Array[nullable MParameterType]]
+ private var ft_colors: nullable Map[MParameterType, Int]
+ private var ft_tables: nullable Map[MClass, Array[nullable MParameterType]]
+ private var ft_masks: nullable Map[MClass, Int]
init(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis, mmbuilder: ModelBuilder) do
self.do_property_coloring
self.header.add_decl("typedef void(*nitmethod_t)(void); /* general C type representing a Nit method. */")
self.header.add_decl("typedef void* nitattribute_t; /* general C type representing a Nit attribute. */")
self.header.add_decl("struct class \{ int box_kind; nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
- self.header.add_decl("struct type \{ int id; int color; int livecolor; short int is_nullable; struct vts_table *vts_table; struct fts_table *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
- self.header.add_decl("struct fts_table \{ struct type *fts[1]; \}; /* fts list of a C type representation. */")
- self.header.add_decl("struct vts_table \{ struct type *vts[1]; \}; /* vts list of a C type representation. */")
- self.header.add_decl("typedef struct \{ struct type *type; struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
- end
- redef fun compile_class_names do
- # Build type names table
- var type_array = new Array[nullable MType]
- for t, i in typeids do
- if i >= type_array.length then
- type_array[i] = null
- end
- type_array[i] = t
+ if modelbuilder.toolcontext.opt_generic_tree.value then
+ self.header.add_decl("struct type \{ int id; const char *name; int color; short int is_nullable; int livecolor; struct types *vts_table; struct types *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
+ else
+ self.header.add_decl("struct type \{ int id; const char *name; int color; short int is_nullable; struct types *unanchored_table; struct types *vts_table; struct types *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
end
- var v = self.new_visitor
- self.header.add_decl("extern const char const * class_names[];")
- v.add("const char const * class_names[] = \{")
- for t in type_array do
- if t == null then
- v.add("NULL,")
- else
- v.add("\"{t}\",")
- end
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ self.header.add_decl("struct types \{ int mask; struct type *types[1]; \}; /* a list types (used for vts, fts and unanchored lists). */")
+ else
+ self.header.add_decl("struct types \{ struct type *types[1]; \}; /* a list types (used for vts, fts and unanchored lists). */")
end
- v.add("\};")
+
+
+ self.header.add_decl("typedef struct \{ struct type *type; struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
+ end
+
+ redef fun compile_class_names do
+ abort # There is no class name compilation since the name is stored in the type structure
end
fun compile_box_kinds
fun do_property_coloring do
# classes coloration
- if modelbuilder.toolcontext.opt_use_naive_coloring.value then
- self.class_coloring = new NaiveClassColoring(mainmodule)
- else
- self.class_coloring = new ClassColoring(mainmodule)
- end
- self.class_colors = class_coloring.colorize(modelbuilder.model.mclasses)
+ self.class_coloring = new ClassColoring(mainmodule)
+ class_coloring.colorize(modelbuilder.model.mclasses)
# methods coloration
var method_coloring = new MethodColoring(self.class_coloring)
self.compile_color_consts(self.method_colors)
# attributes coloration
- var attribute_coloring = new AttributeColoring(class_coloring)
+ var attribute_coloring = new AttributeColoring(self.class_coloring)
self.attr_colors = attribute_coloring.colorize
self.attr_tables = attribute_coloring.build_property_tables
self.compile_color_consts(self.attr_colors)
+ if modelbuilder.toolcontext.opt_bm_typing.value then
+ self.class_coloring = new NaiveClassColoring(mainmodule)
+ self.class_coloring.colorize(modelbuilder.model.mclasses)
+ end
+
# vt coloration
- var vt_coloring = new VTColoring(class_coloring)
- self.vt_colors = vt_coloring.colorize
- self.vt_tables = vt_coloring.build_property_tables
+ if modelbuilder.toolcontext.opt_bm_typing.value then
+ var vt_coloring = new NaiveVTColoring(self.class_coloring)
+ self.vt_colors = vt_coloring.colorize
+ self.vt_tables = vt_coloring.build_property_tables
+ else if modelbuilder.toolcontext.opt_phmod_typing.value then
+ var vt_coloring = new VTModPerfectHashing(self.class_coloring)
+ self.vt_colors = vt_coloring.colorize
+ self.vt_masks = vt_coloring.compute_masks
+ self.vt_tables = vt_coloring.build_property_tables
+ else if modelbuilder.toolcontext.opt_phand_typing.value then
+ var vt_coloring = new VTAndPerfectHashing(self.class_coloring)
+ self.vt_colors = vt_coloring.colorize
+ self.vt_masks = vt_coloring.compute_masks
+ self.vt_tables = vt_coloring.build_property_tables
+ else
+ var vt_coloring = new VTColoring(self.class_coloring)
+ self.vt_colors = vt_coloring.colorize
+ self.vt_tables = vt_coloring.build_property_tables
+ end
self.compile_color_consts(self.vt_colors)
end
mtypes.add_all(self.runtime_type_analysis.live_cast_types)
mtypes.add_all(self.undead_types)
- self.undead_types.clear
for mtype in mtypes do
- # add formal types arguments to mtypes
- if mtype isa MGenericType then
- for ft in mtype.arguments do
- if ft.need_anchor then
- print("Why do we need anchor here ?")
- abort
- end
- self.undead_types.add(ft)
- end
- end
- var mclass_type: MClassType
- if mtype isa MNullableType then
- mclass_type = mtype.mtype.as(MClassType)
- else
- mclass_type = mtype.as(MClassType)
- end
- # add virtual types to mtypes
- for vt in self.vt_tables[mclass_type.mclass] do
- if vt != null then
- var anchored = vt.bound.anchor_to(self.mainmodule, mclass_type)
- self.undead_types.add(anchored)
- end
- end
+ retieve_live_partial_types(mtype)
end
- mtypes.add_all(self.undead_types)
+ mtypes.add_all(self.partial_types)
# set type unique id
- for mtype in mtypes do
- self.typeids[mtype] = self.typeids.length
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ var sorted_mtypes = new OrderedSet[MType].from(mtypes)
+ sorted_mtypes.linearize(new ReverseTypeSorter(self.mainmodule))
+ for mtype in sorted_mtypes do
+ self.typeids[mtype] = self.typeids.length + 1
+ end
+ else
+ for mtype in mtypes do
+ self.typeids[mtype] = self.typeids.length
+ end
end
# fts coloration for non-erased compilation
- var ft_coloring = new FTColoring(class_coloring)
- self.ft_colors = ft_coloring.colorize
- self.ft_tables = ft_coloring.build_ft_tables
+ if modelbuilder.toolcontext.opt_bm_typing.value then
+ var ft_coloring = new NaiveFTColoring(self.class_coloring)
+ self.ft_colors = ft_coloring.colorize
+ self.ft_tables = ft_coloring.build_ft_tables
+ else if modelbuilder.toolcontext.opt_phmod_typing.value then
+ var ft_coloring = new FTModPerfectHashing(self.class_coloring)
+ self.ft_colors = ft_coloring.colorize
+ self.ft_masks = ft_coloring.compute_masks
+ self.ft_tables = ft_coloring.build_ft_tables
+ else if modelbuilder.toolcontext.opt_phand_typing.value then
+ var ft_coloring = new FTAndPerfectHashing(self.class_coloring)
+ self.ft_colors = ft_coloring.colorize
+ self.ft_masks = ft_coloring.compute_masks
+ self.ft_tables = ft_coloring.build_ft_tables
+ else
+ var ft_coloring = new FTColoring(self.class_coloring)
+ self.ft_colors = ft_coloring.colorize
+ self.ft_tables = ft_coloring.build_ft_tables
+ end
self.compile_color_consts(self.ft_colors.as(not null))
- # colorize live entries
- var entries_coloring = new LiveEntryColoring
- self.livetypes_colors = entries_coloring.colorize(mtypes)
- self.livetypes_tables = entries_coloring.build_livetype_tables(mtypes)
- self.livetypes_tables_sizes = entries_coloring.livetypes_tables_sizes
+ if modelbuilder.toolcontext.opt_generic_tree.value then
+ # colorize live entries
+ var entries_coloring
+ if modelbuilder.toolcontext.opt_bm_typing.value then
+ entries_coloring = new NaiveLiveEntryColoring
+ else
+ entries_coloring = new LiveEntryColoring
+ end
+ self.livetypes_colors = entries_coloring.colorize(mtypes)
+ self.livetypes_tables = entries_coloring.build_livetype_tables(mtypes)
+ self.livetypes_tables_sizes = entries_coloring.livetypes_tables_sizes
+ else
+ self.compile_unanchored_tables(mtypes)
+ end
# colorize types
- var type_coloring
- if modelbuilder.toolcontext.opt_use_naive_coloring.value then
- type_coloring = new NaiveTypeColoring(self.mainmodule, mtypes)
+ if modelbuilder.toolcontext.opt_bm_typing.value then
+ var type_coloring = new NaiveTypeColoring(self.mainmodule, mtypes)
+ self.type_colors = type_coloring.colorize(mtypes)
+ self.type_tables = type_coloring.build_type_tables(mtypes, type_colors)
+ else if modelbuilder.toolcontext.opt_phmod_typing.value then
+ var type_coloring = new TypeModPerfectHashing(self.mainmodule, mtypes)
+ self.type_colors = type_coloring.compute_masks(mtypes, typeids)
+ self.type_tables = type_coloring.hash_type_tables(mtypes, typeids, type_colors)
+ self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
+ else if modelbuilder.toolcontext.opt_phand_typing.value then
+ var type_coloring = new TypeAndPerfectHashing(self.mainmodule, mtypes)
+ self.type_colors = type_coloring.compute_masks(mtypes, typeids)
+ self.type_tables = type_coloring.hash_type_tables(mtypes, typeids, type_colors)
+ self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
else
- type_coloring = new TypeColoring(self.mainmodule, mtypes)
+ var type_coloring = new TypeColoring(self.mainmodule, mtypes)
+ self.type_colors = type_coloring.colorize(mtypes)
+ self.type_tables = type_coloring.build_type_tables(mtypes, type_colors)
end
- self.type_colors = type_coloring.colorize(mtypes)
- self.type_tables = type_coloring.build_type_tables(mtypes, type_colors)
- # for the class_name and output_class_name methods
- self.compile_class_names
return mtypes
end
+ protected fun compile_unanchored_tables(mtypes: Set[MType]) do
+ var mtype2anchored = new HashMap[MClassType, Set[MClassType]]
+
+ for mtype in self.runtime_type_analysis.live_types do
+ for cd in mtype.collect_mclassdefs(self.mainmodule) do
+ if self.live_unanchored_types.has_key(cd) then
+ if not mtype2anchored.has_key(mtype) then
+ mtype2anchored[mtype] = new HashSet[MClassType]
+ end
+ for unanchored in self.live_unanchored_types[cd] do
+ var anchored = unanchored.anchor_to(self.mainmodule, mtype)
+ if anchored isa MClassType then
+ mtype2anchored[mtype].add(anchored)
+ else if anchored isa MNullableType then
+ mtype2anchored[mtype].add(anchored.mtype.as(MClassType))
+ else
+ print "NOT YET IMPLEMENTED: try compile_unanchored_tables with {unanchored}"
+ end
+ end
+ end
+ end
+ end
+
+ if modelbuilder.toolcontext.opt_bm_typing.value then
+ var unanchored_type_coloring = new NaiveUnanchoredTypeColoring
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ else if modelbuilder.toolcontext.opt_phmod_typing.value then
+ var unanchored_type_coloring = new UnanchoredTypeModPerfectHashing
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
+ self.unanchored_types_masks = unanchored_type_coloring.compute_masks(mtype2anchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ else if modelbuilder.toolcontext.opt_phand_typing.value then
+ var unanchored_type_coloring = new UnanchoredTypeAndPerfectHashing
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
+ self.unanchored_types_masks = unanchored_type_coloring.compute_masks(mtype2anchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ else
+ var unanchored_type_coloring = new UnanchoredTypeColoring
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ end
+
+ var unanchored_mtypes = new HashMap[MType, Int]
+ for mclass in modelbuilder.model.mclasses do
+ var mtype = mclass.mclass_type
+ if unanchored_types_colors.has_key(mtype) then
+ unanchored_mtypes[mtype] = unanchored_types_colors[mtype]
+ else
+ unanchored_mtypes[mtype] = -1
+ end
+ end
+ for mtype, color in unanchored_types_colors.as(not null) do
+ unanchored_mtypes[mtype] = color
+ end
+ self.compile_color_consts(unanchored_mtypes)
+
+ #print "tables"
+ #for k, v in unanchored_types_tables.as(not null) do
+ # print "{k}: {v.join(", ")}"
+ #end
+ #print ""
+ end
+
+ fun retieve_live_partial_types(mtype: MType) do
+ # add formal types arguments to mtypes
+ if mtype isa MGenericType then
+ for ft in mtype.arguments do
+ if ft.need_anchor then
+ print("Why do we need anchor here ?")
+ abort
+ end
+ self.partial_types.add(ft)
+ retieve_live_partial_types(ft)
+ end
+ end
+ var mclass_type: MClassType
+ if mtype isa MNullableType then
+ mclass_type = mtype.mtype.as(MClassType)
+ else
+ mclass_type = mtype.as(MClassType)
+ end
+
+ # add virtual types to mtypes
+ for vt in self.vt_tables[mclass_type.mclass] do
+ if vt != null then
+ var anchored = vt.bound.anchor_to(self.mainmodule, mclass_type)
+ self.partial_types.add(anchored)
+ end
+ end
+ end
+
# declare live generic types tables selection
private fun compile_live_gentype_to_c(mclass: MClass) do
if mclass.arity > 0 then
# Separately compile all the method definitions of the module
fun compile_module_to_c(mmodule: MModule)
do
+ var old_module = self.mainmodule
+ self.mainmodule = mmodule
for cd in mmodule.mclassdefs do
for pd in cd.mpropdefs do
if not pd isa MMethodDef then continue
end
end
end
+ self.mainmodule = old_module
end
# Globaly compile the type structure of a live type
self.header.add_decl("extern const struct type_{c_name} type_{c_name};")
self.header.add_decl("struct type_{c_name} \{")
self.header.add_decl("int id;")
+ self.header.add_decl("const char *name;")
self.header.add_decl("int color;")
- self.header.add_decl("int livecolor;")
self.header.add_decl("short int is_nullable;")
+ if modelbuilder.toolcontext.opt_generic_tree.value then
+ self.header.add_decl("int livecolor;")
+ else
+ self.header.add_decl("const struct unanchored_table_{c_name} *types;")
+ end
self.header.add_decl("const struct vts_table_{c_name} *vts_table;")
self.header.add_decl("const struct fts_table_{c_name} *fts_table;")
self.header.add_decl("int table_size;")
# const struct type_X
v.add_decl("const struct type_{c_name} type_{c_name} = \{")
v.add_decl("{self.typeids[mtype]},")
+ v.add_decl("\"{mtype}\", /* class_name_string */")
v.add_decl("{self.type_colors[mtype]},")
- v.add_decl("{self.livetypes_colors[mtype]},")
if mtype isa MNullableType then
v.add_decl("1,")
else
v.add_decl("0,")
end
- v.add_decl("&vts_table_{c_name},")
- v.add_decl("&fts_table_{c_name},")
+ if modelbuilder.toolcontext.opt_generic_tree.value then
+ v.add_decl("{self.livetypes_colors[mtype]},")
+ else
+ if compile_type_unanchored_table(mtype) then
+ v.add_decl("&unanchored_table_{c_name},")
+ else
+ v.add_decl("NULL,")
+ end
+ end
+ if compile_type_vts_table(mtype) then
+ v.add_decl("&vts_table_{c_name},")
+ else
+ v.add_decl("NULL,")
+ end
+ if compile_type_fts_table(mtype) then
+ v.add_decl("&fts_table_{c_name},")
+ else
+ v.add_decl("NULL,")
+ end
v.add_decl("{self.type_tables[mtype].length},")
v.add_decl("\{")
for stype in self.type_tables[mtype] do
end
v.add_decl("\},")
v.add_decl("\};")
-
- compile_type_fts_table(mtype)
- compile_type_vts_table(mtype)
end
- protected fun compile_type_fts_table(mtype: MType) do
+ protected fun compile_type_fts_table(mtype: MType): Bool do
var mclass_type: MClassType
if mtype isa MNullableType then
else
mclass_type = mtype.as(MClassType)
end
+ if self.ft_tables[mclass_type.mclass].is_empty then return false
# extern const struct fst_table_X fst_table_X
self.header.add_decl("extern const struct fts_table_{mtype.c_name} fts_table_{mtype.c_name};")
self.header.add_decl("struct fts_table_{mtype.c_name} \{")
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ self.header.add_decl("int mask;")
+ end
self.header.add_decl("struct type *fts[{self.ft_tables[mclass_type.mclass].length}];")
self.header.add_decl("\};")
# const struct fts_table_X fts_table_X
var v = new_visitor
v.add_decl("const struct fts_table_{mtype.c_name} fts_table_{mtype.c_name} = \{")
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ v.add_decl("{self.ft_masks[mclass_type.mclass]},")
+ end
v.add_decl("\{")
for ft in self.ft_tables[mclass_type.mclass] do
if ft == null then
end
v.add_decl("\},")
v.add_decl("\};")
+ return true
end
- protected fun compile_type_vts_table(mtype: MType) do
+ protected fun compile_type_vts_table(mtype: MType): Bool do
var mclass_type: MClassType
if mtype isa MNullableType then
else
mclass_type = mtype.as(MClassType)
end
+ if self.vt_tables[mclass_type.mclass].is_empty then return false
# extern const struct vts_table_X vts_table_X
self.header.add_decl("extern const struct vts_table_{mtype.c_name} vts_table_{mtype.c_name};")
self.header.add_decl("struct vts_table_{mtype.c_name} \{")
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ self.header.add_decl("int mask;")
+ end
self.header.add_decl("struct type *vts[{self.vt_tables[mclass_type.mclass].length}];")
self.header.add_decl("\};")
# const struct vts_table_X vts_table_X
var v = new_visitor
v.add_decl("const struct vts_table_{mtype.c_name} vts_table_{mtype.c_name} = \{")
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ v.add_decl("{vt_masks[mclass_type.mclass]},")
+ end
v.add_decl("\{")
for vt in self.vt_tables[mclass_type.mclass] do
end
v.add_decl("\},")
v.add_decl("\};")
+ return true
+ end
+
+ fun compile_type_unanchored_table(mtype: MType): Bool do
+
+ var mclass_type: MClassType
+ if mtype isa MNullableType then
+ mclass_type = mtype.mtype.as(MClassType)
+ else
+ mclass_type = mtype.as(MClassType)
+ end
+ if not self.unanchored_types_tables.has_key(mclass_type) then return false
+
+ # extern const struct unanchored_table_X unanchored_table_X
+ self.header.add_decl("extern const struct unanchored_table_{mtype.c_name} unanchored_table_{mtype.c_name};")
+
+ self.header.add_decl("struct unanchored_table_{mtype.c_name} \{")
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ self.header.add_decl("int mask;")
+ end
+ self.header.add_decl("struct type *types[{self.unanchored_types_tables[mclass_type].length}];")
+ self.header.add_decl("\};")
+
+ # const struct fts_table_X fts_table_X
+ var v = new_visitor
+ v.add_decl("const struct unanchored_table_{mtype.c_name} unanchored_table_{mtype.c_name} = \{")
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ v.add_decl("{self.unanchored_types_masks[mclass_type]},")
+ end
+ v.add_decl("\{")
+ for t in self.unanchored_types_tables[mclass_type] do
+ if t == null then
+ v.add_decl("NULL, /* empty */")
+ else
+ if self.typeids.has_key(t) then
+ v.add_decl("(struct type*)&type_{t.c_name}, /* {t} */")
+ else
+ v.add_decl("NULL, /* empty ({t} not a live type) */")
+ end
+ end
+ end
+ v.add_decl("\},")
+ v.add_decl("\};")
+ return true
end
# Globally compile the table of the class mclass
end
if ntype isa MParameterType then
- buffer.append("[self->type->fts_table->fts[{ntype.const_color}]->livecolor]")
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ buffer.append("[self->type->fts_table->types[HASH(self->type->fts_table->mask, {ntype.const_color})]->livecolor]")
+ else
+ buffer.append("[self->type->fts_table->types[{ntype.const_color}]->livecolor]")
+ end
else if ntype isa MVirtualType then
- buffer.append("[self->type->vts_table->vts[{ntype.mproperty.const_color}]->livecolor]")
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ buffer.append("[self->type->vts_table->types[HASH(self->type->vts_table->mask, {ntype.mproperty.const_color})]->livecolor]")
+ else
+ buffer.append("[self->type->vts_table->types[{ntype.mproperty.const_color}]->livecolor]")
+ end
else if ntype isa MGenericType and ntype.need_anchor then
var bbuff = new Buffer
retrieve_anchored_livetype(ntype, bbuff)
do
var compiler = self.compiler.as(SeparateCompiler)
if mtype isa MGenericType and mtype.need_anchor then
- var buff = new Buffer
- retrieve_anchored_livetype(mtype, buff)
- mtype = self.anchor(mtype).as(MClassType)
- return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) livetypes_{mtype.mclass.c_name}{buff.to_s})", mtype)
+ if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
+ var buff = new Buffer
+ retrieve_anchored_livetype(mtype, buff)
+ mtype = self.anchor(mtype).as(MClassType)
+ return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) livetypes_{mtype.mclass.c_name}{buff.to_s})", mtype)
+ else
+ link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
+ var recv = self.frame.arguments.first
+ var recv_boxed = self.autobox(recv, self.object_type)
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) {recv_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {mtype.mclass.mclass_type.const_color})])", mtype)
+ else
+ return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) {recv_boxed}->type->unanchored_table->types[{mtype.mclass.mclass_type.const_color}])", mtype)
+ end
+ end
end
compiler.undead_types.add(mtype)
return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) &type_{mtype.c_name})", mtype)
redef fun type_test(value, mtype)
do
+ self.add("/* {value.inspect} isa {mtype} */")
var compiler = self.compiler.as(SeparateCompiler)
var recv = self.frame.arguments.first
var res = self.new_var(bool_type)
+ var type_struct = self.get_name("type_struct")
+ self.add_decl("struct type* {type_struct};")
var cltype = self.get_name("cltype")
self.add_decl("int {cltype};")
var idtype = self.get_name("idtype")
self.add_decl("int {idtype};")
-
var is_nullable = self.get_name("is_nullable")
self.add_decl("short int {is_nullable};")
var boxed = self.autobox(value, self.object_type)
+ if not compiler.modelbuilder.toolcontext.opt_generic_tree.value and mtype.need_anchor then
+ link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
+ end
+
var ntype = mtype
if ntype isa MNullableType then
ntype = ntype.mtype
end
if ntype isa MParameterType then
- self.add("{cltype} = {recv_boxed}->type->fts_table->fts[{ntype.const_color}]->color;")
- self.add("{idtype} = {recv_boxed}->type->fts_table->fts[{ntype.const_color}]->id;")
- self.add("{is_nullable} = {recv_boxed}->type->fts_table->fts[{ntype.const_color}]->is_nullable;")
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ self.add("{type_struct} = {recv_boxed}->type->fts_table->types[HASH({recv_boxed}->type->fts_table->mask, {ntype.const_color})];")
+ else
+ self.add("{type_struct} = {recv_boxed}->type->fts_table->types[{ntype.const_color}];")
+ end
+ self.add("{cltype} = {type_struct}->color;")
+ self.add("{idtype} = {type_struct}->id;")
+ self.add("{is_nullable} = {type_struct}->is_nullable;")
else if ntype isa MGenericType and ntype.need_anchor then
- var buff = new Buffer
- retrieve_anchored_livetype(ntype, buff)
- self.add("{cltype} = livetypes_{ntype.mclass.c_name}{buff.to_s}->color;")
- self.add("{idtype} = livetypes_{ntype.mclass.c_name}{buff.to_s}->id;")
- self.add("{is_nullable} = livetypes_{ntype.mclass.c_name}{buff.to_s}->is_nullable;")
+ if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
+ var buff = new Buffer
+ retrieve_anchored_livetype(ntype, buff)
+ self.add("{type_struct} = (struct type*)livetypes_{ntype.mclass.c_name}{buff.to_s};")
+ self.add("{cltype} = {type_struct}->color;")
+ self.add("{idtype} = {type_struct}->id;")
+ self.add("{is_nullable} = {type_struct}->is_nullable;")
+ else
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ self.add("{type_struct} = {recv_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {ntype.mclass.mclass_type.const_color})];")
+ else
+ self.add("{type_struct} = {recv_boxed}->type->unanchored_table->types[{ntype.mclass.mclass_type.const_color}];")
+ end
+ self.add("{cltype} = {type_struct}->color;")
+ self.add("{idtype} = {type_struct}->id;")
+ self.add("{is_nullable} = {type_struct}->is_nullable;")
+ end
else if ntype isa MClassType then
compiler.undead_types.add(mtype)
self.add("{cltype} = type_{mtype.c_name}.color;")
self.add("{is_nullable} = type_{mtype.c_name}.is_nullable;")
else if ntype isa MVirtualType then
var vtcolor = ntype.mproperty.const_color
- self.add("{cltype} = {recv_boxed}->type->vts_table->vts[{vtcolor}]->color;")
- self.add("{idtype} = {recv_boxed}->type->vts_table->vts[{vtcolor}]->id;")
- self.add("{is_nullable} = {recv_boxed}->type->vts_table->vts[{vtcolor}]->is_nullable;")
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ self.add("{type_struct} = {recv_boxed}->type->vts_table->types[HASH({recv_boxed}->type->vts_table->mask, {vtcolor})];")
+ else
+ self.add("{type_struct} = {recv_boxed}->type->vts_table->types[{vtcolor}];")
+ end
+ self.add("{cltype} = {type_struct}->color;")
+ self.add("{idtype} = {type_struct}->id;")
+ self.add("{is_nullable} = {type_struct}->is_nullable;")
else
self.add("printf(\"NOT YET IMPLEMENTED: type_test(%s, {mtype}).\\n\", \"{boxed.inspect}\"); exit(1);")
end
self.add("if({boxed} == NULL) \{")
self.add("{res} = {is_nullable};")
self.add("\} else \{")
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ self.add("{cltype} = HASH({boxed}->type->color, {idtype});")
+ end
self.add("if({cltype} >= {boxed}->type->table_size) \{")
self.add("{res} = 0;")
self.add("\} else \{")
redef fun class_name_string(value)
do
var res = self.get_name("var_class_name")
- self.add_decl("const char *{res};")
- self.add("{res} = class_names[{value}->type->id];")
+ self.add_decl("const char* {res};")
+ if value.mtype.ctype == "val*" then
+ self.add "{res} = {value} == NULL ? \"null\" : {value}->type->name;"
+ else
+ self.add "{res} = type_{value.mtype.c_name}.name;"
+ end
return res
end
redef fun array_instance(array, elttype)
do
- var compiler = self.compiler.as(SeparateCompiler)
var nclass = self.get_class("NativeArray")
- elttype = self.anchor(elttype)
- var arraytype = self.get_class("Array").get_mtype([elttype])
+ var arrayclass = self.get_class("Array")
+ var arraytype = arrayclass.get_mtype([elttype])
var res = self.init_instance(arraytype)
self.add("\{ /* {res} = array_instance Array[{elttype}] */")
- var nat = self.new_var(self.get_class("NativeArray").get_mtype([elttype]))
- nat.is_exact = true
- compiler.undead_types.add(nat.mtype.as(MClassType))
- self.add("{nat} = NEW_{nclass.c_name}({array.length}, (struct type *) &type_{nat.mtype.c_name});")
+ var length = self.int_instance(array.length)
+ var nat = native_array_instance(elttype, length)
for i in [0..array.length[ do
var r = self.autobox(array[i], self.object_type)
self.add("((struct instance_{nclass.c_name}*){nat})->values[{i}] = (val*) {r};")
end
- var length = self.int_instance(array.length)
- self.send(self.get_property("with_native", arraytype), [res, nat, length])
+ self.send(self.get_property("with_native", arrayclass.intro.bound_mtype), [res, nat, length])
self.check_init_instance(res, arraytype)
self.add("\}")
return res
end
+ fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable
+ do
+ var mtype = self.get_class("NativeArray").get_mtype([elttype])
+ assert mtype isa MGenericType
+ var compiler = self.compiler.as(SeparateCompiler)
+ if mtype.need_anchor then
+ if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
+ var buff = new Buffer
+ retrieve_anchored_livetype(mtype, buff)
+ mtype = self.anchor(mtype).as(MClassType)
+ return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) livetypes_{mtype.mclass.c_name}{buff.to_s})", mtype)
+ else
+ link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
+ var recv = self.frame.arguments.first
+ var recv_boxed = self.autobox(recv, self.object_type)
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) {recv_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {mtype.mclass.mclass_type.const_color})])", mtype)
+ else
+ return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) {recv_boxed}->type->unanchored_table->types[{mtype.mclass.mclass_type.const_color}])", mtype)
+ end
+ end
+ end
+ compiler.undead_types.add(mtype)
+ return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) &type_{mtype.c_name})", mtype)
+ end
+
redef fun native_array_def(pname, ret_type, arguments)
do
var elttype = arguments.first.mtype
var compiler = self.compiler.as(SeparateCompiler)
compiler.undead_types.add(ret)
var mclass = self.get_class("ArrayCapable")
- var ft = mclass.mclass_type.arguments.first.as(MParameterType)
- self.ret(self.new_expr("NEW_{ret.mclass.c_name}({arguments[1]}, (struct type*) livetypes_array__NativeArray[self->type->fts_table->fts[{ft.const_color}]->livecolor])", ret_type))
+ var nclass = self.get_class("NativeArray")
+
+ if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
+ var ft = mclass.mclass_type.arguments.first.as(MParameterType)
+ self.ret(self.new_expr("NEW_{nclass.c_name}({arguments[1]}, (struct type*) livetypes_array__NativeArray[self->type->fts_table->types[{ft.const_color}]->livecolor])", ret_type))
+ else
+ var res = nclass.get_mtype(mclass.mclass_type.arguments)
+ link_unanchored_type(self.frame.mpropdef.mclassdef, res)
+ var recv = self.frame.arguments.first
+ var recv_boxed = self.autobox(recv, self.object_type)
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ self.ret(self.new_expr("NEW_{nclass.c_name}({arguments[1]}, (struct type *) {recv_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {nclass.mclass_type.const_color})])", ret_type))
+ else
+ self.ret(self.new_expr("NEW_{nclass.c_name}({arguments[1]}, (struct type *) {recv_boxed}->type->unanchored_table->types[{nclass.mclass_type.const_color}])", ret_type))
+ end
+ end
+ end
+
+ fun link_unanchored_type(mclassdef: MClassDef, mtype: MType) do
+ assert mtype.need_anchor
+ var compiler = self.compiler.as(SeparateCompiler)
+ if not compiler.live_unanchored_types.has_key(self.frame.mpropdef.mclassdef) then
+ compiler.live_unanchored_types[self.frame.mpropdef.mclassdef] = new HashSet[MType]
+ end
+ compiler.live_unanchored_types[self.frame.mpropdef.mclassdef].add(mtype)
end
end
nitlanguage / nit.git / blobdiff