# --separate
var opt_separate: OptionBool = new OptionBool("Use separate compilation", "--separate")
+ # --no-inline-intern
+ var opt_no_inline_intern: OptionBool = new OptionBool("Do not inline call to intern methods", "--no-inline-intern")
+
redef init
do
super
self.option_context.add_option(self.opt_separate)
+ self.option_context.add_option(self.opt_no_inline_intern)
end
end
redef class ModelBuilder
- redef fun run_global_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis)
- do
- # Hijack the run_global_compiler to run the separate one if requested.
- if self.toolcontext.opt_separate.value then
- run_separate_compiler(mainmodule, runtime_type_analysis)
- else
- super
- end
- end
-
fun run_separate_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis)
do
var time0 = get_time
v.add_decl("typedef void* nitattribute_t; /* general C type representing a Nit attribute. */")
# Class abstract representation
- v.add_decl("struct class \{ nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
+ v.add_decl("struct class \{ int box_kind; nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
# Type abstract representation
- v.add_decl("struct type \{ int id; int color; struct fts_table *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
+ v.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. */")
v.add_decl("struct fts_table \{ struct type *fts[1]; \}; /* fts list of a C type representation. */")
+ v.add_decl("struct vts_table \{ struct type *vts[1]; \}; /* vts list of a C type representation. */")
# Instance abstract representation
v.add_decl("typedef struct \{ struct type *type; struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
+ compiler.compile_box_kinds
+
# Declare global instances
v.add_decl("extern int glob_argc;")
v.add_decl("extern char **glob_argv;")
class SeparateCompiler
super GlobalCompiler # TODO better separation of concerns
- private var undead_types: Set[MClassType] = new HashSet[MClassType]
- protected var typeids: HashMap[MClassType, Int] protected writable = new HashMap[MClassType, Int]
+ private var undead_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 type_tables: nullable Map[MType, Array[nullable MType]] = null
- private var type_colors: Map[MClassType, Int] = typeids
- private var type_tables: nullable Map[MClassType, Array[nullable MClassType]] = null
+ 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]]
protected var attr_colors: Map[MAttribute, Int] protected writable
protected var attr_tables: Map[MClass, Array[nullable MAttributeDef]] protected writable
+ private var vt_colors: Map[MVirtualTypeProp, Int]
+ private var vt_tables: Map[MClass, Array[nullable MVirtualTypeDef]]
+
private var ft_colors: Map[MParameterType, Int]
private var ft_tables: Map[MClass, Array[nullable MParameterType]]
self.attr_colors = attribute_coloring.colorize
self.attr_tables = attribute_coloring.build_property_tables
+ # vt coloration
+ var vt_coloring = new VTColoring(class_coloring)
+ self.vt_colors = vt_coloring.colorize
+ self.vt_tables = vt_coloring.build_property_tables
+
# fts coloration
var ft_coloring = new FTColoring(class_coloring)
self.ft_colors = ft_coloring.colorize
self.ft_tables = ft_coloring.build_ft_tables
end
+ fun compile_box_kinds
+ do
+ # Collect all bas box class
+ # FIXME: this is not completely fine with a separate compilation scheme
+ for classname in ["Int", "Bool", "Char", "Float", "NativeString", "Pointer"] do
+ var classes = self.mainmodule.model.get_mclasses_by_name(classname)
+ if classes == null then continue
+ assert classes.length == 1 else print classes.join(", ")
+ self.box_kinds[classes.first] = self.box_kinds.length + 1
+ end
+ end
+
+ var box_kinds = new HashMap[MClass, Int]
+
+ fun box_kind_of(mclass: MClass): Int
+ do
+ if mclass.mclass_type.ctype == "val*" then
+ return 0
+ else if mclass.kind == extern_kind then
+ return self.box_kinds[self.mainmodule.get_primitive_class("Pointer")]
+ else
+ return self.box_kinds[mclass]
+ end
+
+ end
+
protected fun compile_class_names do
# Build type names table
- var type_array = new Array[nullable MClassType]
+ var type_array = new Array[nullable MType]
for t, i in typeids do
if i >= type_array.length then
type_array[i] = null
end
# colorize live types of the program
- private fun do_global_type_coloring: Set[MClassType] do
- var mtypes = new HashSet[MClassType]
- #print "undead types:"
- #for t in self.undead_types do
- # print t
- #end
- #print "live types:"
- #for t in runtime_type_analysis.live_types do
- # print t
- #end
- #print "cast types:"
- #for t in runtime_type_analysis.live_cast_types do
- # print t
- #end
- #print "--"
+ private fun do_global_type_coloring: Set[MType] do
+ var mtypes = new HashSet[MType]
mtypes.add_all(self.runtime_type_analysis.live_types)
mtypes.add_all(self.runtime_type_analysis.live_cast_types)
mtypes.add_all(self.undead_types)
- # add formal types arguments to mtypes
+ self.undead_types.clear
for mtype in mtypes do
+ # add formal types arguments to mtypes
if mtype isa MGenericType then
- #TODO do it recursive
for ft in mtype.arguments do
- if ft isa MNullableType then ft = ft.mtype
- mtypes.add(ft.as(MClassType))
+ 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
end
+ mtypes.add_all(self.undead_types)
# set type unique id
for mtype in mtypes do
self.typeids[mtype] = self.typeids.length
end
- # build livetypes tables
- self.livetypes_tables = new HashMap[MClass, Array[nullable Object]]
- self.livetypes_tables_sizes = new HashMap[MClass, Array[Int]]
- for mtype in mtypes do
- if mtype isa MGenericType then
- var table: Array[nullable Object]
- var sizes: Array[Int]
- if livetypes_tables.has_key(mtype.mclass) then
- table = livetypes_tables[mtype.mclass]
- else
- table = new Array[nullable Object]
- self.livetypes_tables[mtype.mclass] = table
- end
- if livetypes_tables_sizes.has_key(mtype.mclass) then
- sizes = livetypes_tables_sizes[mtype.mclass]
- else
- sizes = new Array[Int]
- self.livetypes_tables_sizes[mtype.mclass] = sizes
- end
- build_livetype_table(mtype, 0, table, sizes)
- end
- end
+ # 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
- # colorize
- var type_coloring = new TypeColoring(self.mainmodule, self.runtime_type_analysis)
+ # colorize types
+ 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)
return mtypes
end
- # build live gentype table recursively
- private fun build_livetype_table(mtype: MGenericType, current_rank: Int, table: Array[nullable Object], sizes: Array[Int]) do
- var ft = mtype.arguments[current_rank]
- if ft isa MNullableType then ft = ft.mtype
- var id = self.typeids[ft.as(MClassType)]
-
- if current_rank >= sizes.length then
- sizes[current_rank] = id + 1
- else if id >= sizes[current_rank] then
- sizes[current_rank] = id + 1
- end
-
- if id > table.length then
- for i in [table.length .. id[ do table[i] = null
- end
-
- if current_rank == mtype.arguments.length - 1 then
- table[id] = mtype
- else
- var ft_table = new Array[nullable Object]
- table[id] = ft_table
- build_livetype_table(mtype, current_rank + 1, ft_table, sizes)
- end
- end
-
- private fun add_to_livetypes_table(table: Array[nullable Object], ft: MClassType) do
- var id = self.typeids[ft]
- for i in [table.length .. id[ do
- table[i] = null
- end
- table[id] = ft
- end
-
- private fun compile_livetype_table(table: Array[nullable Object], buffer: Buffer, depth: Int, max: Int) do
- for obj in table do
- if obj == null then
- if depth == max then
- buffer.append("NULL,\n")
- else
- buffer.append("\{\},\n")
- end
- else if obj isa MClassType then
- buffer.append("(struct type*) &type_{obj.c_name}, /* {obj} */\n")
- else if obj isa Array[nullable Object] then
- buffer.append("\{\n")
- compile_livetype_table(obj, buffer, depth + 1, max)
- buffer.append("\},\n")
- end
- end
- end
-
# declare live generic types tables selection
private fun compile_live_gentype_to_c(mclass: MClass) do
if mclass.arity > 0 then
end
end
+ private fun compile_livetype_table(table: Array[nullable Object], buffer: Buffer, depth: Int, max: Int) do
+ for obj in table do
+ if obj == null then
+ if depth == max then
+ buffer.append("NULL,\n")
+ else
+ buffer.append("\{\},\n")
+ end
+ else if obj isa MClassType then
+ buffer.append("(struct type*) &type_{obj.c_name}, /* {obj} */\n")
+ else if obj isa Array[nullable Object] then
+ buffer.append("\{\n")
+ compile_livetype_table(obj, buffer, depth + 1, max)
+ buffer.append("\},\n")
+ end
+ end
+ end
+
# Separately compile all the method definitions of the module
fun compile_module_to_c(mmodule: MModule)
do
end
# Globaly compile the type structure of a live type
- fun compile_type_to_c(mtype: MClassType)
+ fun compile_type_to_c(mtype: MType)
do
var c_name = mtype.c_name
var v = new SeparateCompilerVisitor(self)
v.add_decl("/* runtime type {mtype} */")
+ var mclass_type: MClassType
+ if mtype isa MNullableType then
+ mclass_type = mtype.mtype.as(MClassType)
+ else
+ mclass_type = mtype.as(MClassType)
+ end
+
# extern const struct type_X
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("int color;")
+ self.header.add_decl("int livecolor;")
+ self.header.add_decl("short int is_nullable;")
+ 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;")
self.header.add_decl("int type_table[{self.type_tables[mtype].length}];")
self.header.add_decl("\};")
+ # extern const struct vts_table_X vts_table_X
+ self.header.add_decl("extern const struct vts_table_{c_name} vts_table_{c_name};")
+ self.header.add_decl("struct vts_table_{c_name} \{")
+ self.header.add_decl("struct type *vts[{self.vt_tables[mclass_type.mclass].length}];")
+ self.header.add_decl("\};")
+
# extern const struct fst_table_X fst_table_X
self.header.add_decl("extern const struct fts_table_{c_name} fts_table_{c_name};")
self.header.add_decl("struct fts_table_{c_name} \{")
- self.header.add_decl("struct type *fts[{self.ft_tables[mtype.mclass].length}];")
+ self.header.add_decl("struct type *fts[{self.ft_tables[mclass_type.mclass].length}];")
self.header.add_decl("\};")
# const struct type_X
v.add_decl("const struct type_{c_name} type_{c_name} = \{")
v.add_decl("{self.typeids[mtype]},")
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},")
v.add_decl("{self.type_tables[mtype].length},")
v.add_decl("\{")
v.add_decl("\},")
v.add_decl("\};")
- # const struct fst_table_X fst_table_X
- v.add_decl("const struct fts_table_{c_name} fts_table_{c_name} = \{")
+ build_fts_table(mtype, v)
+ build_vts_table(mtype, v)
+ end
+
+ # const struct fst_table_X fst_table_X
+ private fun build_fts_table(mtype: MType, v: SeparateCompilerVisitor) do
+ v.add_decl("const struct fts_table_{mtype.c_name} fts_table_{mtype.c_name} = \{")
v.add_decl("\{")
- for ft in self.ft_tables[mtype.mclass] do
+ var mclass_type: MClassType
+ if mtype isa MNullableType then
+ mclass_type = mtype.mtype.as(MClassType)
+ else
+ mclass_type = mtype.as(MClassType)
+ end
+
+ for ft in self.ft_tables[mclass_type.mclass] do
if ft == null then
v.add_decl("NULL, /* empty */")
else
- var id = -1
var ntype: MType
- if ft.mclass == mtype.mclass then
- ntype = mtype.arguments[ft.rank]
+ if ft.mclass == mclass_type.mclass then
+ ntype = mclass_type.arguments[ft.rank]
else
- ntype = ft.anchor_to(self.mainmodule, mtype)
+ ntype = ft.anchor_to(self.mainmodule, mclass_type)
end
- if ntype isa MNullableType then ntype = ntype.mtype
- var ftype = ntype.as(MClassType)
- if self.typeids.has_key(ftype) then
- v.add_decl("(struct type*)&type_{ftype.c_name}, /* {ft} ({ftype}) */")
+ if self.typeids.has_key(ntype) then
+ v.add_decl("(struct type*)&type_{ntype.c_name}, /* {ft} ({ntype}) */")
else
v.add_decl("NULL, /* empty ({ft} not a live type) */")
end
end
end
+ v.add_decl("\},")
+ v.add_decl("\};")
+ end
+
+ # const struct vts_table_X vts_table_X
+ private fun build_vts_table(mtype: MType, v: SeparateCompilerVisitor) do
+ v.add_decl("const struct vts_table_{mtype.c_name} vts_table_{mtype.c_name} = \{")
+ v.add_decl("\{")
+
+ var mclass_type: MClassType
+ if mtype isa MNullableType then
+ mclass_type = mtype.mtype.as(MClassType)
+ else
+ mclass_type = mtype.as(MClassType)
+ end
+ for vt in self.vt_tables[mclass_type.mclass] do
+ if vt == null then
+ v.add_decl("NULL, /* empty */")
+ else
+ var bound = vt.bound
+ if bound == null then
+ #FIXME how can a bound be null here ?
+ print "No bound found for virtual type {vt} ?"
+ abort
+ else
+ var ntype = bound
+ if ntype isa MNullableType then ntype = ntype.mtype
+ if ntype isa MVirtualType then
+ bound = ntype.anchor_to(self.mainmodule, mclass_type)
+ else if ntype isa MParameterType then
+ bound = ntype.anchor_to(self.mainmodule, mclass_type)
+ else if ntype isa MGenericType and bound.need_anchor then
+ bound = ntype.anchor_to(self.mainmodule, mclass_type)
+ else if ntype isa MClassType then
+ else
+ print "NOT YET IMPLEMENTED: mtype_to_livetype with type: {ntype}"
+ abort
+ end
+
+ if self.typeids.has_key(bound) then
+ v.add_decl("(struct type*)&type_{bound.c_name}, /* {ntype} */")
+ else
+ v.add_decl("NULL, /* dead type {ntype} */")
+ end
+ end
+ end
+ end
v.add_decl("\},")
v.add_decl("\};")
end
#self.header.add_decl("#define {idname} {idnum} /* {c_name} */")
self.header.add_decl("struct class_{c_name} \{")
+ self.header.add_decl("int box_kind;")
self.header.add_decl("nitmethod_t vft[{vft.length}];")
self.header.add_decl("\};")
# Build class vft
self.header.add_decl("extern const struct class_{c_name} class_{c_name};")
v.add_decl("const struct class_{c_name} class_{c_name} = \{")
+ v.add_decl("{self.box_kind_of(mclass)}, /* box_kind */")
v.add_decl("\{")
for i in [0 .. vft.length[ do
var mpropdef = vft[i]
v.add("{res}->type = type;")
v.add("{res}->class = (struct class*) &class_{c_name};")
- for cd in mtype.collect_mclassdefs(self.mainmodule)
- do
- var n = self.modelbuilder.mclassdef2nclassdef[cd]
- for npropdef in n.n_propdefs do
- if npropdef isa AAttrPropdef then
- npropdef.init_expr(v, res)
- end
- end
- end
+ self.generate_init_attr(v, res, mtype)
v.add("return {res};")
v.add("\}")
+
+ generate_check_init_instance(mtype)
+ end
+
+ redef fun generate_check_init_instance(mtype)
+ do
+ if self.modelbuilder.toolcontext.opt_no_check_initialization.value then return
+
+ var v = self.new_visitor
+ var c_name = mtype.mclass.c_name
+ var res = new RuntimeVariable("self", mtype, mtype)
+ self.header.add_decl("void CHECK_NEW_{c_name}({mtype.ctype});")
+ v.add_decl("/* allocate {mtype} */")
+ v.add_decl("void CHECK_NEW_{c_name}({mtype.ctype} {res}) \{")
+ self.generate_check_attr(v, res, mtype)
+ v.add("\}")
end
redef fun new_visitor do return new SeparateCompilerVisitor(self)
# ENSURE: result.mtype.ctype == mtype.ctype
redef fun autobox(value: RuntimeVariable, mtype: MType): RuntimeVariable
do
- if value.mtype.ctype == mtype.ctype then
+ if value.mtype == mtype then
+ return value
+ else if value.mtype.ctype == "val*" and mtype.ctype == "val*" then
return value
else if value.mtype.ctype == "val*" then
return self.new_expr("((struct instance_{mtype.c_name}*){value})->value; /* autounbox from {value.mtype} to {mtype} */", mtype)
ss.append(", {a}")
end
- var maybenull = recv.mcasttype isa MNullableType
+ var consider_null = not self.compiler.modelbuilder.toolcontext.opt_no_check_other.value or mmethod.name == "==" or mmethod.name == "!="
+ var maybenull = recv.mcasttype isa MNullableType and consider_null
if maybenull then
self.add("if ({recv} == NULL) \{")
if mmethod.name == "==" then
res = self.new_var(ret)
end
+ if self.compiler.modelbuilder.mpropdef2npropdef.has_key(mmethoddef) and
+ self.compiler.modelbuilder.mpropdef2npropdef[mmethoddef] isa AInternMethPropdef and
+ not compiler.modelbuilder.toolcontext.opt_no_inline_intern.value then
+ var frame = new Frame(self, mmethoddef, recvtype, arguments)
+ frame.returnlabel = self.get_name("RET_LABEL")
+ frame.returnvar = res
+ var old_frame = self.frame
+ self.frame = frame
+ self.add("\{ /* Inline {mmethoddef} ({arguments.join(",")}) */")
+ mmethoddef.compile_inside_to_c(self, arguments)
+ self.add("{frame.returnlabel.as(not null)}:(void)0;")
+ self.add("\}")
+ self.frame = old_frame
+ return res
+ end
+
# Autobox arguments
self.adapt_signature(mmethoddef, arguments)
self.add("{res} = {recv}->attrs[{self.compiler.as(SeparateCompiler).attr_colors[a]}]; /* {a} on {recv.inspect} */")
# Check for Uninitialized attribute
- if not ret isa MNullableType then
+ if not ret isa MNullableType and not self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then
self.add("if ({res} == NULL) \{")
self.add_abort("Uninitialized attribute {a.name}")
self.add("\}")
var compiler = self.compiler.as(SeparateCompiler)
for ft in mtype.arguments do
- if ft isa MParameterType then
- var ftcolor = compiler.ft_colors[ft]
- buffer.append("[self->type->fts_table->fts[{ftcolor}]->id]")
- else if ft isa MGenericType and ft.need_anchor then
+
+ var ntype = ft
+ var s: String = ""
+ if ntype isa MNullableType then
+ ntype = ntype.mtype
+ end
+
+ if ntype isa MParameterType then
+ var ftcolor = compiler.ft_colors[ntype]
+ buffer.append("[self->type->fts_table->fts[{ftcolor}]->livecolor]")
+ else if ntype isa MVirtualType then
+ var vtcolor = compiler.vt_colors[ntype.mproperty.as(MVirtualTypeProp)]
+ buffer.append("[self->type->vts_table->vts[{vtcolor}]->livecolor]")
+ else if ntype isa MGenericType and ntype.need_anchor then
var bbuff = new Buffer
- retrieve_anchored_livetype(ft, bbuff)
- buffer.append("[livetypes_{ft.mclass.c_name}{bbuff.to_s}->id]")
- else if ft isa MClassType then
- var typecolor = compiler.type_colors[ft]
- buffer.append("[{typecolor}]")
+ retrieve_anchored_livetype(ntype, bbuff)
+ buffer.append("[livetypes_{ntype.mclass.c_name}{bbuff.to_s}->livecolor]")
+ else if ntype isa MClassType then
+ compiler.undead_types.add(ft)
+ buffer.append("[type_{ft.c_name}.livecolor]")
else
- self.add("printf(\"NOT YET IMPLEMENTED: init_instance(%s, {mtype}).\\n\", \"{ft.inspect}\"); exit(1);")
+ self.add("printf(\"NOT YET IMPLEMENTED: init_instance(%s, {mtype}).\\n\", \"{ft}\"); exit(1);")
end
end
end
return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) &type_{mtype.c_name})", mtype)
end
+ redef fun check_init_instance(value, mtype)
+ do
+ if self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then return
+ self.add("CHECK_NEW_{mtype.mclass.c_name}({value});")
+ end
+
+
redef fun type_test(value, mtype)
do
var compiler = self.compiler.as(SeparateCompiler)
+
+ var recv = self.frame.arguments.first
+ var recv_boxed = self.autobox(recv, self.object_type)
+
var res = self.new_var(bool_type)
var cltype = self.get_name("cltype")
- self.add_decl("short int {cltype};")
+ self.add_decl("int {cltype};")
var idtype = self.get_name("idtype")
- self.add_decl("short int {idtype};")
+ self.add_decl("int {idtype};")
+
+ var is_nullable = self.get_name("is_nullable")
+ self.add_decl("short int {is_nullable};")
- var buff = new Buffer
var boxed = self.autobox(value, self.object_type)
- var s: String
- if mtype isa MNullableType then
- mtype = mtype.mtype
- s = "{boxed} == NULL ||"
- else
- s = "{boxed} != NULL &&"
- end
- if mtype isa MParameterType then
- var ftcolor = compiler.ft_colors[mtype]
- self.add("{cltype} = self->type->fts_table->fts[{ftcolor}]->color;")
- self.add("{idtype} = self->type->fts_table->fts[{ftcolor}]->id;")
- else if mtype isa MGenericType and mtype.need_anchor then
- for ft in mtype.mclass.mclass_type.arguments do
- var ftcolor = compiler.ft_colors[ft.as(MParameterType)]
- buff.append("[self->type->fts_table->fts[{ftcolor}]->id]")
- end
- self.add("{cltype} = livetypes_{mtype.mclass.c_name}{buff.to_s}->color;")
- self.add("{idtype} = livetypes_{mtype.mclass.c_name}{buff.to_s}->id;")
- else if mtype isa MClassType then
+ var ntype = mtype
+ if ntype isa MNullableType then
+ ntype = ntype.mtype
+ end
+
+ if ntype isa MParameterType then
+ var ftcolor = compiler.ft_colors[ntype]
+ self.add("{cltype} = {recv_boxed}->type->fts_table->fts[{ftcolor}]->color;")
+ self.add("{idtype} = {recv_boxed}->type->fts_table->fts[{ftcolor}]->id;")
+ self.add("{is_nullable} = {recv_boxed}->type->fts_table->fts[{ftcolor}]->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;")
+ else if ntype isa MClassType then
compiler.undead_types.add(mtype)
self.add("{cltype} = type_{mtype.c_name}.color;")
self.add("{idtype} = type_{mtype.c_name}.id;")
+ self.add("{is_nullable} = type_{mtype.c_name}.is_nullable;")
+ else if ntype isa MVirtualType then
+ var vtcolor = compiler.vt_colors[ntype.mproperty.as(MVirtualTypeProp)]
+ 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;")
else
self.add("printf(\"NOT YET IMPLEMENTED: type_test(%s, {mtype}).\\n\", \"{boxed.inspect}\"); exit(1);")
end
+ if mtype isa MNullableType then
+ self.add("{is_nullable} = 1;")
+ end
+
# check color is in table
- self.add("if({boxed} != NULL && {cltype} >= {boxed}->type->table_size) \{")
+ self.add("if({boxed} == NULL) \{")
+ self.add("{res} = {is_nullable};")
+ self.add("\} else \{")
+ self.add("if({cltype} >= {boxed}->type->table_size) \{")
self.add("{res} = 0;")
self.add("\} else \{")
- self.add("{res} = {s} {boxed}->type->type_table[{cltype}] == {idtype};")
+ self.add("{res} = {boxed}->type->type_table[{cltype}] == {idtype};")
+ self.add("\}")
self.add("\}")
return res
value2 = tmp
end
if value1.mtype.ctype != "val*" then
- if value2.mtype.ctype == value1.mtype.ctype then
+ if value2.mtype == value1.mtype then
self.add("{res} = 1; /* is_same_type_test: compatible types {value1.mtype} vs. {value2.mtype} */")
else if value2.mtype.ctype != "val*" then
self.add("{res} = 0; /* is_same_type_test: incompatible types {value1.mtype} vs. {value2.mtype}*/")
value2 = tmp
end
if value1.mtype.ctype != "val*" then
- if value2.mtype.ctype == value1.mtype.ctype then
+ if value2.mtype == value1.mtype then
self.add("{res} = {value1} == {value2};")
else if value2.mtype.ctype != "val*" then
self.add("{res} = 0; /* incompatible types {value1.mtype} vs. {value2.mtype}*/")
self.add("{res} = ({self.autobox(value2, value1.mtype)} == {value1});")
self.add("\}")
end
+ return res
+ end
+ var maybe_null = true
+ var test = new Array[String]
+ var t1 = value1.mcasttype
+ if t1 isa MNullableType then
+ test.add("{value1} != NULL")
+ t1 = t1.mtype
else
- var s = new Array[String]
- # This is just ugly on so many level. this works but must be rewriten
- for t in self.compiler.live_primitive_types do
- if not t.is_subtype(self.compiler.mainmodule, null, value1.mcasttype) then continue
- if not t.is_subtype(self.compiler.mainmodule, null, value2.mcasttype) then continue
- s.add "({value1}->class == (struct class*)&class_{t.c_name} && ((struct instance_{t.c_name}*){value1})->value == ((struct instance_{t.c_name}*){value2})->value)"
+ maybe_null = false
+ end
+ var t2 = value2.mcasttype
+ if t2 isa MNullableType then
+ test.add("{value2} != NULL")
+ t2 = t2.mtype
+ else
+ maybe_null = false
+ end
+
+ var incompatible = false
+ var primitive
+ if t1.ctype != "val*" then
+ primitive = t1
+ if t1 == t2 then
+ # No need to compare class
+ else if t2.ctype != "val*" then
+ incompatible = true
+ else if can_be_primitive(value2) then
+ test.add("{value1}->class == {value2}->class")
+ else
+ incompatible = true
end
- if s.is_empty then
- self.add("{res} = {value1} == {value2};")
+ else if t2.ctype != "val*" then
+ primitive = t2
+ if can_be_primitive(value1) then
+ test.add("{value1}->class == {value2}->class")
else
- self.add("{res} = {value1} == {value2} || ({value1} != NULL && {value2} != NULL && {value1}->class == {value2}->class && ({s.join(" || ")}));")
+ incompatible = true
+ end
+ else
+ primitive = null
+ end
+
+ if incompatible then
+ if maybe_null then
+ self.add("{res} = {value1} == {value2}; /* incompatible types {t1} vs. {t2}; but may be NULL*/")
+ return res
+ else
+ self.add("{res} = 0; /* incompatible types {t1} vs. {t2}; cannot be NULL */")
+ return res
end
end
+ if primitive != null then
+ test.add("((struct instance_{primitive.c_name}*){value1})->value == ((struct instance_{primitive.c_name}*){value2})->value")
+ else if can_be_primitive(value1) and can_be_primitive(value2) then
+ test.add("{value1}->class == {value2}->class")
+ var s = new Array[String]
+ for t, v in self.compiler.as(SeparateCompiler).box_kinds do
+ s.add "({value1}->class->box_kind == {v} && ((struct instance_{t.c_name}*){value1})->value == ((struct instance_{t.c_name}*){value2})->value)"
+ end
+ test.add("({s.join(" || ")})")
+ else
+ self.add("{res} = {value1} == {value2};")
+ return res
+ end
+ self.add("{res} = {value1} == {value2} || ({test.join(" && ")});")
return res
end
+ fun can_be_primitive(value: RuntimeVariable): Bool
+ do
+ var t = value.mcasttype
+ if t isa MNullableType then t = t.mtype
+ if not t isa MClassType then return false
+ var k = t.mclass.kind
+ return k == interface_kind or t.ctype != "val*"
+ end
+
+ fun maybe_null(value: RuntimeVariable): Bool
+ do
+ var t = value.mcasttype
+ return t isa MNullableType or t isa MNullType
+ end
+
redef fun array_instance(array, elttype)
do
var compiler = self.compiler.as(SeparateCompiler)
end
var length = self.int_instance(array.length)
self.send(self.get_property("with_native", arraytype), [res, nat, length])
- self.check_init_instance(res)
+ self.check_init_instance(res, arraytype)
self.add("\}")
return res
end
redef fun calloc_array(ret_type, arguments)
do
- var ret = ret_type.as(MClassType)
+ var ret = ret_type.as(MGenericType)
var compiler = self.compiler.as(SeparateCompiler)
compiler.undead_types.add(ret)
- self.ret(self.new_expr("NEW_{ret.mclass.c_name}({arguments[1]}, (struct type*) &type_{ret_type.c_name})", ret_type))
+ var mclass = self.get_class("ArrayCapable")
+ var ft = mclass.mclass_type.arguments.first.as(MParameterType)
+ var color = compiler.ft_colors[ft]
+ self.ret(self.new_expr("NEW_{ret.mclass.c_name}({arguments[1]}, (struct type*) livetypes_array__NativeArray[self->type->fts_table->fts[{color}]->livecolor])", ret_type))
end
end
nitlanguage / nit.git / blobdiff