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.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. */")
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}];")