class SeparateErasureCompiler
super SeparateCompiler
- private var class_layout: nullable TypingLayout[MClass]
- protected var vt_layout: nullable PropertyLayout[MVirtualTypeProp]
+ private var class_layout: nullable Layout[MClass]
+ protected var vt_layout: nullable Layout[MVirtualTypeProp]
init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do
super
var layout_builder: TypingLayoutBuilder[MClass]
if modelbuilder.toolcontext.opt_phmod_typing.value then
- layout_builder = new PHClassLayoutBuilder(mainmodule, new PHModOperator)
+ layout_builder = new MClassHasher(new PHModOperator, mainmodule)
else if modelbuilder.toolcontext.opt_phand_typing.value then
- layout_builder = new PHClassLayoutBuilder(mainmodule, new PHAndOperator)
+ layout_builder = new MClassHasher(new PHAndOperator, mainmodule)
else if modelbuilder.toolcontext.opt_bm_typing.value then
- layout_builder = new BMClassLayoutBuilder(mainmodule)
+ layout_builder = new MClassBMizer(mainmodule)
else
- layout_builder = new CLClassLayoutBuilder(mainmodule)
+ layout_builder = new MClassColorer(mainmodule)
end
self.class_layout = layout_builder.build_layout(mclasses)
self.class_tables = self.build_class_typing_tables(mclasses)
# vt coloration
- var vt_coloring = new CLPropertyLayoutBuilder[MVirtualTypeProp](new MVirtualTypePropColorer(mainmodule))
+ var vt_coloring = new MVirtualTypePropColorer(mainmodule)
var vt_layout = vt_coloring.build_layout(mclasses)
self.vt_tables = build_vt_tables(mclasses, vt_layout)
self.compile_color_consts(vt_layout.pos)
self.vt_layout = vt_layout
end
- fun build_vt_tables(mclasses: Set[MClass], layout: PropertyLayout[MProperty]): Map[MClass, Array[nullable MPropDef]] do
+ fun build_vt_tables(mclasses: Set[MClass], layout: Layout[MProperty]): Map[MClass, Array[nullable MPropDef]] do
var tables = new HashMap[MClass, Array[nullable MPropDef]]
for mclass in mclasses do
var table = new Array[nullable MPropDef]
supers.add(mclass)
for sup in supers do
var color: Int
- if layout isa PHTypingLayout[MClass] then
+ if layout isa PHLayout[MClass, MClass] then
color = layout.hashes[mclass][sup]
else
color = layout.pos[sup]
self.header.add_decl("struct type_table \{ int size; int table[1]; \}; /* colorized type table. */")
self.header.add_decl("struct vts_entry \{ short int is_nullable; struct class *class; \}; /* link (nullable or not) between the vts and is bound. */")
- if self.vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+ if self.vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
self.header.add_decl("struct vts_table \{ int mask; struct vts_entry vts[1]; \}; /* vts list of a C type representation. */")
else
self.header.add_decl("struct vts_table \{ struct vts_entry vts[1]; \}; /* vts list of a C type representation. */")
v.add_decl("\"{mclass.name}\", /* class_name_string */")
v.add_decl("{self.box_kind_of(mclass)}, /* box_kind */")
var layout = self.class_layout
- if layout isa PHTypingLayout[MClass] then
+ if layout isa PHLayout[MClass, MClass] then
v.add_decl("{layout.masks[mclass]},")
else
v.add_decl("{layout.pos[mclass]},")
self.header.add_decl("extern const struct vts_table_{mclass.c_name} vts_table_{mclass.c_name};")
self.header.add_decl("struct vts_table_{mclass.c_name} \{")
- if self.vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+ if self.vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
self.header.add_decl("int mask;")
end
self.header.add_decl("struct vts_entry vts[{self.vt_tables[mclass].length}];")
var v = new_visitor
v.add_decl("const struct vts_table_{mclass.c_name} vts_table_{mclass.c_name} = \{")
- if self.vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+ if self.vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
#TODO redo this when PHPropertyLayoutBuilder will be implemented
#v.add_decl("{vt_masks[mclass]},")
end
end
var entry = self.get_name("entry")
self.add("struct vts_entry {entry};")
- if self.compiler.as(SeparateErasureCompiler).vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+ if self.compiler.as(SeparateErasureCompiler).vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
self.add("{entry} = {recv_ptr}vts_table->vts[HASH({recv_ptr}vts_table->mask, {mtype.mproperty.const_color})];")
else
self.add("{entry} = {recv_ptr}vts_table->vts[{mtype.mproperty.const_color}];")
self.add("{res} = {accept_null};")
self.add("\} else \{")
end
- if self.compiler.as(SeparateErasureCompiler).class_layout isa PHTypingLayout[MClass] then
+ if self.compiler.as(SeparateErasureCompiler).class_layout isa PHLayout[MClass, MClass] then
self.add("{cltype} = HASH({class_ptr}color, {idtype});")
end
self.add("if({cltype} >= {class_ptr}type_table->size) \{")