typing: new class CallSite
[nit.git] / src / separate_compiler.nit
index f03116e..a497593 100644 (file)
@@ -17,7 +17,8 @@ module separate_compiler
 
 
 import global_compiler # TODO better separation of concerns
-intrude import coloring
+import coloring
+
 redef class ToolContext
        # --separate
        var opt_separate: OptionBool = new OptionBool("Use separate compilation", "--separate")
@@ -28,12 +29,16 @@ redef class ToolContext
        # --inline-coloring-numbers
        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")
+
        redef init
        do
                super
                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)
        end
 end
 
@@ -44,32 +49,6 @@ redef class ModelBuilder
                self.toolcontext.info("*** COMPILING TO C ***", 1)
 
                var compiler = new SeparateCompiler(mainmodule, runtime_type_analysis, self)
-               var v = compiler.header
-               v.add_decl("#include <stdlib.h>")
-               v.add_decl("#include <stdio.h>")
-               v.add_decl("#include <string.h>")
-               v.add_decl("#include <gc/gc.h>")
-               v.add_decl("typedef void(*nitmethod_t)(void); /* general C type representing a Nit method. */")
-               v.add_decl("typedef void* nitattribute_t; /* general C type representing a Nit attribute. */")
-
-               # Class abstract representation
-               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; 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;")
-               v.add_decl("extern val *glob_sys;")
-
-               # The main function of the C
-               compiler.compile_main_function
 
                # compile class structures
                for m in mainmodule.in_importation.greaters do
@@ -78,6 +57,9 @@ redef class ModelBuilder
                        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)
@@ -94,9 +76,6 @@ redef class ModelBuilder
                        compiler.compile_live_gentype_to_c(mclass)
                end
 
-               # for the class_name and output_class_name methods
-               compiler.compile_class_names
-
                write_and_make(compiler)
        end
 end
@@ -127,18 +106,45 @@ class SeparateCompiler
        protected var vt_colors: Map[MVirtualTypeProp, Int]
        protected var vt_tables: Map[MClass, Array[nullable MVirtualTypeDef]]
 
-       private var ft_colors: Map[MParameterType, Int]
-       private var ft_tables: Map[MClass, Array[nullable MParameterType]]
+       protected var ft_colors: nullable Map[MParameterType, Int]
+       protected var ft_tables: nullable Map[MClass, Array[nullable MParameterType]]
 
        init(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis, mmbuilder: ModelBuilder) do
-               self.header = self.new_visitor
                self.do_property_coloring
+               self.compile_box_kinds
+       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
-               generate_color_consts(self.ft_colors)
+       redef fun compile_header_structs do
+               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
+               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
+               end
+               v.add("\};")
        end
 
        fun compile_box_kinds
@@ -167,31 +173,7 @@ class SeparateCompiler
 
        end
 
-       protected 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
-               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
-               end
-               v.add("\};")
-       end
-
-       fun generate_color_consts(colors: Map[Object, Int]) do
+       fun compile_color_consts(colors: Map[Object, Int]) do
                for m, c in colors do
                        if m isa MProperty then
                                if modelbuilder.toolcontext.opt_inline_coloring_numbers.value then
@@ -213,27 +195,32 @@ class SeparateCompiler
 
        # colorize classe properties
        fun do_property_coloring do
+
                # classes coloration
-               self.class_coloring = new ClassColoring(mainmodule)
+               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)
 
                # methods coloration
                var method_coloring = new MethodColoring(self.class_coloring)
                self.method_colors = method_coloring.colorize
                self.method_tables = method_coloring.build_property_tables
-               generate_color_consts(self.method_colors)
+               self.compile_color_consts(self.method_colors)
 
                # attributes coloration
                var attribute_coloring = new AttributeColoring(class_coloring)
                self.attr_colors = attribute_coloring.colorize
                self.attr_tables = attribute_coloring.build_property_tables
-               generate_color_consts(self.attr_colors)
+               self.compile_color_consts(self.attr_colors)
 
                # vt coloration
                var vt_coloring = new VTColoring(class_coloring)
                self.vt_colors = vt_coloring.colorize
                self.vt_tables = vt_coloring.build_property_tables
-               generate_color_consts(self.vt_colors)
+               self.compile_color_consts(self.vt_colors)
        end
 
        # colorize live types of the program
@@ -276,6 +263,12 @@ class SeparateCompiler
                        self.typeids[mtype] = self.typeids.length
                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
+               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)
@@ -283,10 +276,18 @@ class SeparateCompiler
                self.livetypes_tables_sizes = entries_coloring.livetypes_tables_sizes
 
                # colorize types
-               var type_coloring = new TypeColoring(self.mainmodule, mtypes)
+               var type_coloring
+               if modelbuilder.toolcontext.opt_use_naive_coloring.value then
+                       type_coloring = new NaiveTypeColoring(self.mainmodule, mtypes)
+               else
+                       type_coloring = new TypeColoring(self.mainmodule, mtypes)
+               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
 
@@ -354,13 +355,6 @@ class SeparateCompiler
                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} \{")
@@ -374,18 +368,6 @@ class SeparateCompiler
                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[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]},")
@@ -410,14 +392,11 @@ class SeparateCompiler
                v.add_decl("\},")
                v.add_decl("\};")
 
-               build_fts_table(mtype, v)
-               build_vts_table(mtype, v)
+               compile_type_fts_table(mtype)
+               compile_type_vts_table(mtype)
        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("\{")
+       protected fun compile_type_fts_table(mtype: MType) do
 
                var mclass_type: MClassType
                if mtype isa MNullableType then
@@ -426,6 +405,16 @@ class SeparateCompiler
                        mclass_type = mtype.as(MClassType)
                end
 
+               # 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} \{")
+               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} = \{")
+               v.add_decl("\{")
                for ft in self.ft_tables[mclass_type.mclass] do
                        if ft == null then
                                v.add_decl("NULL, /* empty */")
@@ -447,10 +436,7 @@ class SeparateCompiler
                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("\{")
+       protected fun compile_type_vts_table(mtype: MType) do
 
                var mclass_type: MClassType
                if mtype isa MNullableType then
@@ -459,6 +445,17 @@ class SeparateCompiler
                        mclass_type = mtype.as(MClassType)
                end
 
+               # 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} \{")
+               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} = \{")
+               v.add_decl("\{")
+
                for vt in self.vt_tables[mclass_type.mclass] do
                        if vt == null then
                                v.add_decl("NULL, /* empty */")
@@ -508,7 +505,7 @@ class SeparateCompiler
 
                var vft = self.method_tables[mclass]
                var attrs = self.attr_tables[mclass]
-               var v = new SeparateCompilerVisitor(self)
+               var v = new_visitor
 
                v.add_decl("/* runtime class {c_name} */")
                var idnum = classids.length
@@ -1278,27 +1275,38 @@ class SeparateCompilerVisitor
 
        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
+                       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)
+               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