X-Git-Url: http://nitlanguage.org diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit index c2785ed..0f4070c 100644 --- a/src/abstract_compiler.nit +++ b/src/abstract_compiler.nit @@ -323,7 +323,16 @@ 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") + + # Dynamic adaptations + # While `platform` enable complex toolchains, they are statically applied + # For a dynamic adaptsation of the compilation, the generated Makefile should check and adapt things itself + + # Check and adapt for the compiler used + # clang need an additionnal `-Qunused-arguments` + makefile.write("clang_check := $(shell sh -c '$(CC) -v 2>&1 | grep -q clang; echo $$?')\nifeq ($(clang_check), 0)\n\tCFLAGS += -Qunused-arguments\nendif\n") + makefile.write("all: {outpath}\n\n") var ofiles = new Array[String] @@ -893,6 +902,8 @@ abstract class AbstractCompilerVisitor return self.send(callsite.mproperty, args) end + fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable is abstract + fun calloc_array(ret_type: MType, arguments: Array[RuntimeVariable]) is abstract fun native_array_def(pname: String, ret_type: nullable MType, arguments: Array[RuntimeVariable]) is abstract @@ -1703,6 +1714,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) @@ -1882,6 +1895,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) @@ -2611,13 +2627,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