X-Git-Url: http://nitlanguage.org diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit index 9061b5f..031be97 100644 --- a/src/abstract_compiler.nit +++ b/src/abstract_compiler.nit @@ -202,8 +202,12 @@ class MakefileToolchain do if self.toolcontext.opt_stacktrace.value == "nitstack" then compiler.build_c_to_nit_bindings + var platform = compiler.mainmodule.target_platform + var cc_opt_with_libgc = "-DWITH_LIBGC" + if platform != null and not platform.supports_libgc then cc_opt_with_libgc = "" + # Add gc_choser.h to aditionnal bodies - var gc_chooser = new ExternCFile("gc_chooser.c", "-DWITH_LIBGC") + var gc_chooser = new ExternCFile("gc_chooser.c", cc_opt_with_libgc) compiler.extern_bodies.add(gc_chooser) compiler.files_to_copy.add "{cc_paths.first}/gc_chooser.c" compiler.files_to_copy.add "{cc_paths.first}/gc_chooser.h" @@ -288,18 +292,19 @@ class MakefileToolchain self.toolcontext.info("Total C source files to compile: {cfiles.length}", 2) end + fun makefile_name(mainmodule: MModule): String do return "{mainmodule.name}.mk" + + fun default_outname(mainmodule: MModule): String do return mainmodule.name + fun write_makefile(compiler: AbstractCompiler, compile_dir: String, cfiles: Array[String]) do var mainmodule = compiler.mainmodule - var outname = self.toolcontext.opt_output.value - if outname == null then - outname = "{mainmodule.name}" - end + var outname = self.toolcontext.opt_output.value or else default_outname(mainmodule) var orig_dir=".." # FIXME only works if `compile_dir` is a subdirectory of cwd var outpath = orig_dir.join_path(outname).simplify_path - var makename = "{mainmodule.name}.mk" + var makename = makefile_name(mainmodule) var makepath = "{compile_dir}/{makename}" var makefile = new OFStream.open(makepath) @@ -318,7 +323,7 @@ class MakefileToolchain var ost = toolcontext.opt_stacktrace.value if ost == "libunwind" or ost == "nitstack" then linker_options.add("-lunwind") - makefile.write("CC = ccache cc\nCFLAGS = -g -O2\nCINCL = {cc_includes}\nLDFLAGS ?= \nLDLIBS ?= -lm -lgc {linker_options.join(" ")}\n\n") + makefile.write("CC = ccache cc\nCFLAGS = -g -O2 -Wno-unused-value -Wno-switch\nCINCL = {cc_includes}\nLDFLAGS ?= \nLDLIBS ?= -lm -lgc {linker_options.join(" ")}\n\n") makefile.write("all: {outpath}\n\n") var ofiles = new Array[String] @@ -367,7 +372,7 @@ class MakefileToolchain fun compile_c_code(compiler: AbstractCompiler, compile_dir: String) do - var makename = "{compiler.mainmodule.name}.mk" # FIXME duplicated from write_makefile + var makename = makefile_name(compiler.mainmodule) var makeflags = self.toolcontext.opt_make_flags.value if makeflags == null then makeflags = "" @@ -1700,6 +1705,8 @@ redef class AMethPropdef var ret = mpropdef.msignature.return_mtype if ret != null then ret = v.resolve_for(ret, arguments.first) + else if mpropdef.mproperty.is_new then + ret = arguments.first.mcasttype end if pname != "==" and pname != "!=" then v.adapt_signature(mpropdef, arguments) @@ -1879,6 +1886,9 @@ redef class AMethPropdef else if pname == "atoi" then v.ret(v.new_expr("atoi({arguments[0]});", ret.as(not null))) return + else if pname == "init" then + v.ret(v.new_expr("(char*)nit_alloc({arguments[1]})", ret.as(not null))) + return end else if cname == "NativeArray" then v.native_array_def(pname, ret, arguments) @@ -2608,13 +2618,18 @@ redef class ANewExpr var mtype = self.mtype.as(MClassType) var recv var ctype = mtype.ctype - if ctype == "val*" then + if mtype.mclass.name == "NativeArray" then + assert self.n_args.n_exprs.length == 1 + var l = v.expr(self.n_args.n_exprs.first, null) + assert mtype isa MGenericType + var elttype = mtype.arguments.first + return v.native_array_instance(elttype, l) + else if ctype == "val*" then recv = v.init_instance(mtype) else if ctype == "void*" then recv = v.new_expr("NULL/*special!*/", mtype) else - debug("cannot new {mtype}") - abort + recv = v.new_expr("({ctype})0/*special!*/", mtype) end var args = [recv] for a in self.n_args.n_exprs do