X-Git-Url: http://nitlanguage.org diff --git a/src/compiling/compiling_methods.nit b/src/compiling/compiling_methods.nit index bc1bf98..1253a51 100644 --- a/src/compiling/compiling_methods.nit +++ b/src/compiling/compiling_methods.nit @@ -25,24 +25,21 @@ redef class CompilerVisitor meth compile_stmt(n: PExpr) do n.prepare_compile_stmt(self) - var i = _variable_index + var i = cfc._variable_index n.compile_stmt(self) - _variable_index = i + cfc._variable_index = i end # Compile is expression node meth compile_expr(n: PExpr): String do - var i = _variable_index + var i = cfc._variable_index var s = n.compile_expr(self) - _variable_index = i + cfc._variable_index = i if s[0] == ' ' then return s end - if s == variable(_variable_index-1) then - return s - end - var v = get_var + var v = cfc.get_var add_assignment(v, s) return v end @@ -53,7 +50,7 @@ redef class CompilerVisitor if s.substring(0,3) == "variable" then return s end - var v = get_var + var v = cfc.get_var add_assignment(v, s) return v end @@ -66,92 +63,32 @@ redef class CompilerVisitor end end - # Return the ith variable - protected meth variable(i: Int): String - do - return "variable{i}" - end - - # Next available variable number - attr _variable_index: Int - - # Total number of variable - attr _variable_index_max: Int - - # Return the next available variable - meth get_var: String - do - var v = variable(_variable_index) - _variable_index = _variable_index + 1 - if _variable_index > _variable_index_max then - add_decl("val_t {v};") - _variable_index_max = _variable_index - end - return v - end - - # Mark the variable available - meth free_var(v: String) - do - # FIXME: So ugly.. - if v == variable(_variable_index-1) then - _variable_index = _variable_index - 1 - end - end - - # Clear all status related to a method body - meth clear - do - _has_return = false - indent_level = 0 - _variable_index = 0 - _variable_index_max = 0 - end - - # Association between nit variable and the corrsponding c variable - readable attr _varnames: Map[Variable, String] = new HashMap[Variable, String] - - # Is a "return" found in the method body - readable writable attr _has_return: Bool + readable writable attr _cfc: CFunctionContext - # Association between parameters and the corresponding c variables - readable writable attr _method_params: Array[String] + readable writable attr _nmc: NitMethodContext - # Current method compiled - readable writable attr _method: MMSrcMethod - - # Where a nit return must branch - readable writable attr _return_label: String - - # Where a nit break must branch - readable writable attr _break_label: String - - # Where a nit continue must branch - readable writable attr _continue_label: String - - # Variable where a functionnal nit return must store its value - readable writable attr _return_value: String + # C outputs written outside the current C function. + readable writable attr _out_contexts: Array[CContext] = new Array[CContext] # Generate an fprintf to display an error location meth printf_locate_error(node: PNode): String do - var s = "fprintf(stderr, \"" - if method != null then s.append(" in %s") + var s = new Buffer.from("fprintf(stderr, \"") + if nmc != null then s.append(" in %s") s.append(" (%s:%d)\\n\", ") - if method != null then s.append("LOCATE_{method.cname}, ") + if nmc != null then s.append("LOCATE_{nmc.method.cname}, ") s.append("LOCATE_{module.name}, {node.line_number});") - return s + return s.to_s end redef init(module: MMSrcModule) do super - clear end meth invoke_super_init_calls_after(start_prop: MMMethod) do - var n = method.node + var n = nmc.method.node assert n isa AConcreteInitPropdef if n.super_init_calls.is_empty then return @@ -180,9 +117,13 @@ redef class CompilerVisitor while i < l do var p = n.super_init_calls[i] if p == stop_prop then break - var cargs = method_params + var cargs = new Array[String] if p.signature.arity == 0 then - cargs = [method_params[0]] + cargs.add(cfc.varname(nmc.method_params[0])) + else + for va in nmc.method_params do + cargs.add(cfc.varname(va)) + end end #s.append(" {p}") p.compile_call(self, cargs) @@ -198,8 +139,141 @@ redef class CompilerVisitor end end +# A C function currently written +class CFunctionContext + readable attr _visitor: CompilerVisitor + + # Next available variable number + attr _variable_index: Int = 0 + + # Total number of variable + attr _variable_index_max: Int = 0 + + # Association between nit variable and the corrsponding c variable + attr _varnames: Map[Variable, String] = new HashMap[Variable, String] + + # Are we currenlty in a closure definition? + readable writable attr _in_closure: Bool = false + + meth varname(v: Variable): String + do + if _in_closure then + return "closctx->{_varnames[v]}" + else + return _varnames[v] + end + end + + # Return the next available variable + meth get_var: String + do + var v = variable(_variable_index) + _variable_index = _variable_index + 1 + if _variable_index > _variable_index_max then + #visitor.add_decl("val_t {v};") + _variable_index_max = _variable_index + end + return v + end + + meth register_variable(v: Variable): String + do + var s = get_var + _varnames[v] = "variable[{_variable_index-1}]" + return s + end + + # Next available closure variable number + attr _closurevariable_index: Int = 0 + + meth register_closurevariable(v: ClosureVariable): String + do + var s = "closurevariable[{_closurevariable_index}]" + _closurevariable_index += 1 + _varnames[v] = s + if _in_closure then + return "(closctx->{s})" + else + return s + end + end + + # Return the ith variable + protected meth variable(i: Int): String + do + if _in_closure then + return "(closctx->variable[{i}])" + else + return "variable[{i}]" + end + end + + # Mark the variable available + meth free_var(v: String) + do + # FIXME: So ugly.. + if v == variable(_variable_index-1) then + _variable_index = _variable_index - 1 + end + end + + # Generate the local variable declarations + # To use at the end of the C function once all variables are known + meth generate_var_decls + do + if _variable_index_max > 0 then + visitor.add_decl("val_t variable[{_variable_index_max}];") + else + visitor.add_decl("val_t *variable = NULL;") + end + if _closurevariable_index > 0 then + visitor.add_decl("void *closurevariable[{_closurevariable_index}];") + else + visitor.add_decl("void **closurevariable = NULL;") + end + end + + init(v: CompilerVisitor) do _visitor = v +end + +# A Nit method currenlty compiled +class NitMethodContext + # Current method compiled + readable attr _method: MMSrcMethod + + # Association between parameters and the corresponding variables + readable writable attr _method_params: Array[ParamVariable] + + # Where a nit return must branch + readable writable attr _return_label: String + + # Where a nit break must branch + readable writable attr _break_label: String + + # Where a nit continue must branch + readable writable attr _continue_label: String + + # Variable where a functionnal nit return must store its value + readable writable attr _return_value: String + + # Variable where a functionnal nit break must store its value + readable writable attr _break_value: String + + # Variable where a functionnal nit continue must store its value + readable writable attr _continue_value: String + + init(method: MMSrcMethod) + do + _method = method + end +end + ############################################################################### +redef class ClosureVariable + readable writable attr _ctypename: String +end + redef class MMMethod # Compile a call on self for given arguments # Most calls are compiled with a table access, @@ -207,18 +281,19 @@ redef class MMMethod # == and != are guarded and possibly inlined meth compile_call(v: CompilerVisitor, cargs: Array[String]): String do - var i = concrete_property - assert i isa MMSrcMethod - if i.node isa AInternMethPropdef or - (i.local_class.name == (once "Array".to_symbol) and name == (once "[]".to_symbol)) - then - var e = i.do_compile_inside(v, cargs) - return e + var i = self + if i isa MMSrcMethod then + if i isa MMMethSrcMethod and i.node isa AInternMethPropdef or + (i.local_class.name == (once "Array".to_symbol) and name == (once "[]".to_symbol)) + then + var e = i.do_compile_inside(v, cargs) + return e + end end var ee = once "==".to_symbol var ne = once "!=".to_symbol if name == ne then - var eqp = signature.recv.select_method(ee) + var eqp = signature.recv.local_class.select_method(ee) var eqcall = eqp.compile_call(v, cargs) return "TAG_Bool(!UNTAG_Bool({eqcall}))" end @@ -227,7 +302,7 @@ redef class MMMethod cargs.add("init_table /*YYY*/") end - var m = "(({cname}_t)CALL({cargs[0]},{global.color_id}))" + var m = "{global.meth_call}({cargs[0]})" var vcall = "{m}({cargs.join(", ")}) /*{local_class}::{name}*/" if name == ee then vcall = "UNTAG_Bool({vcall})" @@ -246,21 +321,26 @@ redef class MMMethod end # Compile a call as constructor with given args - meth compile_constructor_call(v: CompilerVisitor, cargs: Array[String]): String + meth compile_constructor_call(v: CompilerVisitor, recvtype: MMType, cargs: Array[String]): String do - var recv = v.get_var - var stype = signature.recv - v.add_instr("{recv} = NEW_{global.intro.cname}({cargs.join(", ")}); /*new {stype}*/") + var recv = v.cfc.get_var + v.add_instr("{recv} = NEW_{recvtype.local_class}_{global.intro.cname}({cargs.join(", ")}); /*new {recvtype}*/") return recv end # Compile a call as call-next-method on self with given args meth compile_super_call(v: CompilerVisitor, cargs: Array[String]): String do - var m = "(({cname}_t)CALL({cargs[0]},{color_id_for_super}))" + var m = "{super_meth_call}({cargs[0]})" var vcall = "{m}({cargs.join(", ")}) /*super {local_class}::{name}*/" return vcall end + + # Cname of the i-th closure C struct type + protected meth closure_cname(i: Int): String + do + return "WBT_{cname}_{i}" + end end redef class MMAttribute @@ -272,53 +352,71 @@ redef class MMAttribute end end -redef class MMConcreteProperty +redef class MMLocalProperty # Compile the property as a C property meth compile_property_to_c(v: CompilerVisitor) do end end redef class MMSrcMethod + # Compile and declare the signature to C protected meth decl_csignature(v: CompilerVisitor, args: Array[String]): String do var params = new Array[String] - var params_new: Array[String] = null - if global.is_init then - params_new = new Array[String] - end params.add("val_t {args[0]}") for i in [0..signature.arity[ do var p = "val_t {args[i+1]}" params.add(p) - if params_new != null then params_new.add(p) end + + var first_closure_index = signature.arity + 1 # Wich parameter is the first closure + for i in [0..signature.closures.length[ do + var closcn = closure_cname(i) + var cs = signature.closures[i].signature # Closure signature + var subparams = new Array[String] # Parameters of the closure + subparams.add("struct {closcn}*") + for j in [0..cs.arity[ do + var p = "val_t" + subparams.add(p) + end + var r = "void" + if cs.return_type != null then r = "val_t" + params.add("struct {closcn} *{args[first_closure_index+i]}") + v.add_decl("struct {closcn};") + v.add_decl("typedef {r} (*F{closcn})({subparams.join(", ")});") + v.add_decl("struct {closcn} \{F{closcn} fun; val_t *has_broke; val_t broke_value; val_t *variable; void **closurevariable;\};") + end + if global.is_init then params.add("int* init_table") end + var ret: String if signature.return_type != null then ret = "val_t" else ret = "void" end + var p = params.join(", ") var s = "{ret} {cname}({p})" v.add_decl("typedef {ret} (* {cname}_t)({p});") v.add_decl(s + ";") - if params_new != null then - v.add_decl("val_t NEW_{cname}({params_new.join(", ")});") - end return s end redef meth compile_property_to_c(v) do - v.clear + v.cfc = new CFunctionContext(v) + var args = new Array[String] args.add(" self") for i in [0..signature.arity[ do args.add(" param{i}") end + for i in [0..signature.closures.length[ do + args.add(" wd{i}") + end var cs = decl_csignature(v, args) v.add_decl("#define LOCATE_{cname} \"{full_name}\"") @@ -327,8 +425,14 @@ redef class MMSrcMethod var ctx_old = v.ctx v.ctx = new CContext - v.add_decl("struct trace_t trace = \{NULL, LOCATE_{module.name}, {node.line_number}, LOCATE_{cname}};") + v.out_contexts.clear + + var ln = 0 + var s = self + if s.node != null then ln = s.node.line_number + v.add_decl("struct trace_t trace = \{NULL, NULL, {ln}, LOCATE_{cname}};") v.add_instr("trace.prev = tracehead; tracehead = &trace;") + v.add_instr("trace.file = LOCATE_{module.name};") var s = do_compile_inside(v, args) v.add_instr("tracehead = trace.prev;") if s == null then @@ -337,10 +441,14 @@ redef class MMSrcMethod v.add_instr("return {s};") end + v.cfc.generate_var_decls + ctx_old.append(v.ctx) v.ctx = ctx_old v.unindent v.add_instr("}") + + for ctx in v.out_contexts do v.ctx.merge(ctx) end # Compile the method body inline @@ -369,6 +477,33 @@ redef class MMMethSrcMethod end end +redef class MMImplicitInit + redef meth do_compile_inside(v, params) + do + var f = params.length - unassigned_attributes.length + var recv = params.first + for sp in super_inits do + assert sp isa MMMethod + var args_recv = [recv] + if sp == super_init then + var args = new Array[String].with_capacity(f) + args.add(recv) + for i in [1..f[ do + args.add(params[i]) + end + sp.compile_call(v, args) + else + sp.compile_call(v, args_recv) + end + end + for i in [f..params.length[ do + var attribute = unassigned_attributes[i-f] + v.add_assignment(attribute.compile_access(v, recv), params[i]) + end + return null + end +end + redef class MMType # Compile a subtype check to self # Return a NIT Bool @@ -395,66 +530,77 @@ redef class AMethPropdef meth do_compile_inside(v: CompilerVisitor, method: MMSrcMethod, params: Array[String]): String is abstract end +redef class PSignature + meth compile_parameters(v: CompilerVisitor, orig_sig: MMSignature, params: Array[String]) is abstract +end + +redef class ASignature + redef meth compile_parameters(v: CompilerVisitor, orig_sig: MMSignature, params: Array[String]) + do + for ap in n_params do + var cname = v.cfc.register_variable(ap.variable) + v.nmc.method_params.add(ap.variable) + var orig_type = orig_sig[ap.position] + if not orig_type < ap.variable.stype then + # FIXME: do not test always + # FIXME: handle formal types + v.add_instr("/* check if p<{ap.variable.stype} with p:{orig_type} */") + ap.variable.stype.compile_type_check(v, params[ap.position], ap) + end + v.add_assignment(cname, params[ap.position]) + end + for i in [0..n_closure_decls.length[ do + var wd = n_closure_decls[i] + var cname = v.cfc.register_closurevariable(wd.variable) + wd.variable.ctypename = "struct {v.nmc.method.closure_cname(i)} *" + v.add_assignment(cname, "{params[orig_sig.arity + i]}") + end + end +end + redef class AConcreteMethPropdef redef meth do_compile_inside(v, method, params) do - var orig_meth: MMLocalProperty = method.global.intro - var orig_sig = orig_meth.signature.adaptation_to(method.signature.recv) + var old_nmc = v.nmc + v.nmc = new NitMethodContext(method) + + var selfcname = v.cfc.register_variable(self_var) + v.add_assignment(selfcname, params[0]) + params.shift + v.nmc.method_params = [self_var] + if n_signature != null then - var sig = n_signature - assert sig isa ASignature - for ap in sig.n_params do - var cname = v.get_var - v.varnames[ap.variable] = cname - var orig_type = orig_sig[ap.position] - if not orig_type < ap.variable.stype then - # FIXME: do not test always - # FIXME: handle formal types - v.add_instr("/* check if p<{ap.variable.stype} with p:{orig_type} */") - ap.variable.stype.compile_type_check(v, params[ap.position + 1], ap) - end - v.add_assignment(cname, params[ap.position + 1]) - end + var orig_meth: MMLocalProperty = method.global.intro + var orig_sig = orig_meth.signature_for(method.signature.recv) + n_signature.compile_parameters(v, orig_sig, params) end - var old_method_params = v.method_params - var old_return_label = v.return_label - var old_return_value = v.return_value - var old_has_return = v.has_return var itpos: String = null if self isa AConcreteInitPropdef then - itpos = "VAL2OBJ({params[0]})->vft[{method.local_class.global.init_table_pos_id}].i" + itpos = "VAL2OBJ({selfcname})->vft[{method.local_class.global.init_table_pos_id}].i" # v.add_instr("printf(\"{method.full_name}: inittable[%d] = %d\\n\", {itpos}, init_table[{itpos}]);") v.add_instr("if (init_table[{itpos}]) return;") end - v.method_params = params - v.has_return = false - v.return_label = "return_label{v.new_number}" - if method.signature.return_type != null then - v.return_value = v.get_var - v.free_var(v.return_value) - else - v.return_value = null - end - v.method = method + v.nmc.return_label = "return_label{v.new_number}" + v.nmc.return_value = v.cfc.get_var if self isa AConcreteInitPropdef then v.invoke_super_init_calls_after(null) end if n_block != null then v.compile_stmt(n_block) end - if v.has_return then - v.add_instr("{v.return_label}: while(false);") - end + v.add_instr("{v.nmc.return_label}: while(false);") if self isa AConcreteInitPropdef then v.add_instr("init_table[{itpos}] = 1;") end - var ret = v.return_value - v.method_params = old_method_params - v.return_label = old_return_label - v.return_value = old_return_value - v.has_return = old_has_return + + var ret: String = null + if method.signature.return_type != null then + ret = v.nmc.return_value + end + + v.nmc = old_nmc return ret end end @@ -462,7 +608,7 @@ end redef class ADeferredMethPropdef redef meth do_compile_inside(v, method, params) do - v.add_instr("fprintf(stderr, \"Deferred method %s called\");") + v.add_instr("fprintf(stderr, \"Deferred method called\");") v.add_instr(v.printf_locate_error(self)) v.add_instr("nit_exit(1);") if method.signature.return_type != null then @@ -512,7 +658,7 @@ redef class AInternMethPropdef else if n == once "unary -".to_symbol then s = "TAG_Int(-UNTAG_Int({p[0]}))" else if n == once "output".to_symbol then - v.add_instr("printf(\"%d\\n\", UNTAG_Int({p[0]}));") + v.add_instr("printf(\"%ld\\n\", UNTAG_Int({p[0]}));") else if n == once "ascii".to_symbol then s = "TAG_Char(UNTAG_Int({p[0]}))" else if n == once "succ".to_symbol then @@ -550,13 +696,13 @@ redef class AInternMethPropdef end else if c == once "Float".to_symbol then if n == once "object_id".to_symbol then - s = "TAG_Int((int)UNBOX_Float({p[0]}))" + s = "TAG_Int((bigint)UNBOX_Float({p[0]}))" else if n == once "unary -".to_symbol then s = "BOX_Float(-UNBOX_Float({p[0]}))" else if n == once "output".to_symbol then v.add_instr("printf(\"%f\\n\", UNBOX_Float({p[0]}));") else if n == once "to_i".to_symbol then - s = "TAG_Int((int)UNBOX_Float({p[0]}))" + s = "TAG_Int((bigint)UNBOX_Float({p[0]}))" else if n == once "+".to_symbol then s = "BOX_Float(UNBOX_Float({p[0]})+UNBOX_Float({p[1]}))" else if n == once "-".to_symbol then @@ -651,7 +797,7 @@ redef class AInternMethPropdef v.add_instr("(void)memcpy(UNBOX_NativeString({p[1]})+UNTAG_Int({p[4]}), UNBOX_NativeString({p[0]})+UNTAG_Int({p[3]}), UNTAG_Int({p[2]}));") end else if n == once "object_id".to_symbol then - s = "TAG_Int((int){p[0]})" + s = "TAG_Int((bigint){p[0]})" else if n == once "sys".to_symbol then s = "(G_sys)" else if n == once "is_same_type".to_symbol then @@ -702,16 +848,14 @@ end redef class AVardeclExpr redef meth prepare_compile_stmt(v) do - var cname = v.get_var - v.varnames[variable] = cname + v.cfc.register_variable(variable) end redef meth compile_stmt(v) do - var cname = v.varnames[variable] + var cname = v.cfc.varname(variable) if n_expr == null then - var t = variable.stype - v.add_assignment(cname, "{t.default_cvalue} /*decl variable {variable.name}*/") + v.add_instr("/*{cname} is variable {variable.name}*/") else var e = v.compile_expr(n_expr) v.add_assignment(cname, e) @@ -722,26 +866,35 @@ end redef class AReturnExpr redef meth compile_stmt(v) do - v.has_return = true if n_expr != null then var e = v.compile_expr(n_expr) - v.add_assignment(v.return_value, e) + v.add_assignment(v.nmc.return_value, e) end - v.add_instr("goto {v.return_label};") + if v.cfc.in_closure then v.add_instr("closctx->has_broke = &({v.nmc.return_value});") + v.add_instr("goto {v.nmc.return_label};") end end redef class ABreakExpr redef meth compile_stmt(v) do - v.add_instr("goto {v.break_label};") + if n_expr != null then + var e = v.compile_expr(n_expr) + v.add_assignment(v.nmc.break_value, e) + end + if v.cfc.in_closure then v.add_instr("closctx->has_broke = &({v.nmc.break_value}); closctx->broke_value = *closctx->has_broke;") + v.add_instr("goto {v.nmc.break_label};") end end redef class AContinueExpr redef meth compile_stmt(v) do - v.add_instr("goto {v.continue_label};") + if n_expr != null then + var e = v.compile_expr(n_expr) + v.add_assignment(v.nmc.continue_value, e) + end + v.add_instr("goto {v.nmc.continue_label};") end end @@ -766,7 +919,7 @@ redef class AIfExpr do var e = v.compile_expr(n_expr) v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/") - v.free_var(e) + v.cfc.free_var(e) if n_then != null then v.indent v.compile_stmt(n_then) @@ -787,12 +940,12 @@ redef class AIfexprExpr do var e = v.compile_expr(n_expr) v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/") - v.free_var(e) + v.cfc.free_var(e) v.indent var e = v.ensure_var(v.compile_expr(n_then)) v.unindent v.add_instr("} else \{ /*if*/") - v.free_var(e) + v.cfc.free_var(e) v.indent var e2 = v.ensure_var(v.compile_expr(n_else)) v.add_assignment(e, e2) @@ -806,17 +959,17 @@ redef class AControlableBlock meth compile_inside_block(v: CompilerVisitor) is abstract redef meth compile_stmt(v) do - var old_break_label = v.break_label - var old_continue_label = v.continue_label + var old_break_label = v.nmc.break_label + var old_continue_label = v.nmc.continue_label var id = v.new_number - v.break_label = "break_{id}" - v.continue_label = "continue_{id}" + v.nmc.break_label = "break_{id}" + v.nmc.continue_label = "continue_{id}" compile_inside_block(v) - v.break_label = old_break_label - v.continue_label = old_continue_label + v.nmc.break_label = old_break_label + v.nmc.continue_label = old_continue_label end end @@ -827,14 +980,14 @@ redef class AWhileExpr v.indent var e = v.compile_expr(n_expr) v.add_instr("if (!UNTAG_Bool({e})) break; /* while*/") - v.free_var(e) + v.cfc.free_var(e) if n_block != null then v.compile_stmt(n_block) end - v.add_instr("{v.continue_label}: while(0);") + v.add_instr("{v.nmc.continue_label}: while(0);") v.unindent v.add_instr("}") - v.add_instr("{v.break_label}: while(0);") + v.add_instr("{v.nmc.break_label}: while(0);") end end @@ -849,51 +1002,32 @@ redef class AForVardeclExpr redef meth compile_stmt(v) do var e = v.compile_expr(n_expr) - var prop = n_expr.stype.select_method(once "iterator".to_symbol) - if prop == null then - printl("No iterator") - return - end - var ittype = prop.signature.return_type - v.free_var(e) - var iter = v.get_var - v.add_assignment(iter, prop.compile_call(v, [e])) - var prop2 = ittype.select_method(once "is_ok".to_symbol) - if prop2 == null then - printl("No is_ok") - return - end - var prop3 = ittype.select_method(once "item".to_symbol) - if prop3 == null then - printl("No item") - return - end - var prop4 = ittype.select_method(once "next".to_symbol) - if prop4 == null then - printl("No next") - return - end + var ittype = meth_iterator.signature.return_type + v.cfc.free_var(e) + var iter = v.cfc.get_var + v.add_assignment(iter, meth_iterator.compile_call(v, [e])) v.add_instr("while (true) \{ /*for*/") v.indent - var ok = v.get_var - v.add_assignment(ok, prop2.compile_call(v, [iter])) + var ok = v.cfc.get_var + v.add_assignment(ok, meth_is_ok.compile_call(v, [iter])) v.add_instr("if (!UNTAG_Bool({ok})) break; /*for*/") - v.free_var(ok) - var e = prop3.compile_call(v, [iter]) + v.cfc.free_var(ok) + var e = meth_item.compile_call(v, [iter]) e = v.ensure_var(e) - v.varnames[variable] = e + var cname = v.cfc.register_variable(variable) + v.add_assignment(cname, e) var par = parent assert par isa AForExpr var n_block = par.n_block if n_block != null then v.compile_stmt(n_block) end - v.add_instr("{v.continue_label}: while(0);") - e = prop4.compile_call(v, [iter]) + v.add_instr("{v.nmc.continue_label}: while(0);") + e = meth_next.compile_call(v, [iter]) assert e == null v.unindent v.add_instr("}") - v.add_instr("{v.break_label}: while(0);") + v.add_instr("{v.nmc.break_label}: while(0);") end end @@ -912,7 +1046,7 @@ end redef class AVarExpr redef meth compile_expr(v) do - return " {v.varnames[variable]} /*{variable.name}*/" + return " {v.cfc.varname(variable)} /*{variable.name}*/" end end @@ -920,24 +1054,24 @@ redef class AVarAssignExpr redef meth compile_stmt(v) do var e = v.compile_expr(n_value) - v.add_assignment(v.varnames[variable], "{e} /*{variable.name}=*/") + v.add_assignment(v.cfc.varname(variable), "{e} /*{variable.name}=*/") end end redef class AVarReassignExpr redef meth compile_stmt(v) do - var e1 = v.varnames[variable] + var e1 = v.cfc.varname(variable) var e2 = v.compile_expr(n_value) var e3 = assign_method.compile_call(v, [e1, e2]) - v.add_assignment(v.varnames[variable], "{e3} /*{variable.name}*/") + v.add_assignment(v.cfc.varname(variable), "{e3} /*{variable.name}*/") end end redef class ASelfExpr redef meth compile_expr(v) do - return v.method_params[0] + return v.cfc.varname(v.nmc.method_params[0]) end end @@ -946,7 +1080,7 @@ redef class AOrExpr do var e = v.ensure_var(v.compile_expr(n_expr)) v.add_instr("if (!UNTAG_Bool({e})) \{ /* or */") - v.free_var(e) + v.cfc.free_var(e) v.indent var e2 = v.compile_expr(n_expr2) v.add_assignment(e, e2) @@ -961,7 +1095,7 @@ redef class AAndExpr do var e = v.ensure_var(v.compile_expr(n_expr)) v.add_instr("if (UNTAG_Bool({e})) \{ /* and */") - v.free_var(e) + v.cfc.free_var(e) v.indent var e2 = v.compile_expr(n_expr2) v.add_assignment(e, e2) @@ -1042,9 +1176,8 @@ end redef class AStringFormExpr redef meth compile_expr(v) do - var prop = stype.select_method(once "with_native".to_symbol) compute_string_info - return prop.compile_constructor_call(v, ["BOX_NativeString(\"{_cstring}\")", "TAG_Int({_cstring_length})"]) + return meth_with_native.compile_constructor_call(v, stype , ["BOX_NativeString(\"{_cstring}\")", "TAG_Int({_cstring_length})"]) end # The raw string value @@ -1061,7 +1194,7 @@ redef class AStringFormExpr do var len = 0 var str = string_text - var res = new String + var res = new Buffer var i = 0 while i < str.length do var c = str[i] @@ -1077,7 +1210,7 @@ redef class AStringFormExpr res.add(c) i = i + 1 end - _cstring = res + _cstring = res.to_s _cstring_length = len end end @@ -1098,21 +1231,17 @@ end redef class ASuperstringExpr redef meth compile_expr(v) do - var prop = stype.select_method(once "init".to_symbol) - var recv = prop.compile_constructor_call(v, new Array[String]) + var array = meth_with_capacity.compile_constructor_call(v, atype, ["TAG_Int({n_exprs.length})"]) - var prop2 = stype.select_method(once "append".to_symbol) - - var prop3 = stype.select_method(once "to_s".to_symbol) for ne in n_exprs do var e = v.ensure_var(v.compile_expr(ne)) if ne.stype != stype then - v.add_assignment(e, prop3.compile_call(v, [e])) + v.add_assignment(e, meth_to_s.compile_call(v, [e])) end - prop2.compile_call(v, [recv, e]) + meth_add.compile_call(v, [array, e]) end - return recv + return meth_to_s.compile_call(v, [array]) end end @@ -1126,13 +1255,11 @@ end redef class AArrayExpr redef meth compile_expr(v) do - var prop = stype.select_method(once "with_capacity".to_symbol) - var recv = prop.compile_constructor_call(v,["TAG_Int({n_exprs.length})"]) + var recv = meth_with_capacity.compile_constructor_call(v, stype, ["TAG_Int({n_exprs.length})"]) - var prop2 = stype.select_method(once "add".to_symbol) for ne in n_exprs do var e = v.compile_expr(ne) - prop2.compile_call(v, [recv, e]) + meth_add.compile_call(v, [recv, e]) end return recv end @@ -1141,20 +1268,10 @@ end redef class ARangeExpr redef meth compile_expr(v) do - var prop = stype.select_method(propname) var e = v.compile_expr(n_expr) var e2 = v.compile_expr(n_expr2) - return prop.compile_constructor_call(v, [e, e2]) + return meth_init.compile_constructor_call(v, stype, [e, e2]) end - # The constructor that must be used for the range - protected meth propname: Symbol is abstract -end - -redef class ACrangeExpr - redef meth propname do return once "init".to_symbol -end -redef class AOrangeExpr - redef meth propname do return once "without_last".to_symbol end redef class ASuperExpr @@ -1166,15 +1283,15 @@ redef class ASuperExpr redef meth compile_expr(v) do - var arity = v.method_params.length - 1 + var arity = v.nmc.method_params.length - 1 if init_in_superclass != null then arity = init_in_superclass.signature.arity end var args = new Array[String].with_capacity(arity + 1) - args.add(v.method_params[0]) + args.add(v.cfc.varname(v.nmc.method_params[0])) if n_args.length != arity then for i in [0..arity[ do - args.add(v.method_params[i + 1]) + args.add(v.cfc.varname(v.nmc.method_params[i + 1])) end else for na in n_args do @@ -1228,7 +1345,65 @@ redef class ASendExpr cargs.add(v.compile_expr(a)) end - var e = prop.compile_call(v, cargs) + var e: String + if prop_signature.closures.is_empty then + e = prop.compile_call(v, cargs) + else + var cd = closure_defs + var arity = 0 + if cd != null then arity = cd.length + var closcns = new Array[String] + var ve: String = null + + # Prepare result value. + # In case of procedure, the return value is still used to intercept breaks + var old_bv = v.nmc.break_value + ve = v.cfc.get_var + v.nmc.break_value = ve + + # Compile closure to c function + for i in [0..arity[ do + var cn = cd[i].compile_closure(v, prop.closure_cname(i)) + closcns.add(cn) + cargs.add(cn) + end + for i in [arity..prop_signature.closures.length[ do + cargs.add("NULL") + end + + v.nmc.break_value = old_bv + + # Call + e = prop.compile_call(v, cargs) + if e != null then + v.add_assignment(ve, e) + e = ve + end + + # Intercept returns and breaks + for i in [0..arity[ do + # A break or a return is intercepted + v.add_instr("if ({closcns[i]}->has_broke != NULL) \{") + v.indent + # A passtrought break or a return is intercepted: go the the next closure + v.add_instr("if ({closcns[i]}->has_broke != &({ve})) \{") + v.indent + if v.cfc.in_closure then v.add_instr("closctx->has_broke = {closcns[i]}->has_broke; closctx->broke_value = {closcns[i]}->broke_value;") + v.add_instr("goto {v.nmc.return_label};") + v.unindent + # A direct break is interpected + if e != null then + # overwrite the returned value in a function + v.add_instr("\} else {ve} = {closcns[i]}->broke_value;") + else + # Do nothing in a procedure + v.add_instr("\}") + end + v.unindent + v.add_instr("\}") + end + end + if prop.global.is_init then v.invoke_super_init_calls_after(prop) end @@ -1269,7 +1444,218 @@ redef class ANewExpr for a in arguments do cargs.add(v.compile_expr(a)) end - return prop.compile_constructor_call(v, cargs) + return prop.compile_constructor_call(v, stype, cargs) + end +end + +redef class PClosureDef + # Compile the closure definition as a function in v.out_contexts + # Return the cname of the function + meth compile_closure(v: CompilerVisitor, closcn: String): String is abstract + + # Compile the closure definition inside the current C function. + meth do_compile_inside(v: CompilerVisitor, params: Array[String]): String is abstract +end + +redef class AClosureDef + # The cname of the function + readable attr _cname: String + + redef meth compile_closure(v, closcn) + do + var ctx_old = v.ctx + v.ctx = new CContext + v.out_contexts.add(v.ctx) + + var cfc_old = v.cfc.in_closure + v.cfc.in_closure = true + + var old_rv = v.nmc.return_value + var old_bv = v.nmc.break_value + if not cfc_old then + v.nmc.return_value = "closctx->{old_rv}" + v.nmc.break_value = "closctx->{old_bv}" + end + + var cname = "OC_{v.nmc.method.cname}_{v.out_contexts.length}" + _cname = cname + var args = new Array[String] + for i in [0..closure.signature.arity[ do + args.add(" param{i}") + end + + var cs = decl_csignature(v, args, closcn) + + v.add_instr("{cs} \{") + v.indent + var ctx_old2 = v.ctx + v.ctx = new CContext + + v.add_decl("struct trace_t trace = \{NULL, NULL, {line_number}, LOCATE_{v.nmc.method.cname}};") + v.add_instr("trace.prev = tracehead; tracehead = &trace;") + + v.add_instr("trace.file = LOCATE_{v.module.name};") + var s = do_compile_inside(v, args) + + v.add_instr("{v.nmc.return_label}:") + v.add_instr("tracehead = trace.prev;") + if s == null then + v.add_instr("return;") + else + v.add_instr("return {s};") + end + + ctx_old2.append(v.ctx) + v.ctx = ctx_old2 + v.unindent + v.add_instr("}") + v.ctx = ctx_old + + v.cfc.in_closure = cfc_old + v.nmc.return_value = old_rv + v.nmc.break_value = old_bv + + # Build closure + var closcnv = "wbclos{v.new_number}" + v.add_decl("struct {closcn} {closcnv} = \{{cname}, NULL\};") + if cfc_old then + v.add_instr("{closcnv}.variable = closctx->variable;") + v.add_instr("{closcnv}.closurevariable = closctx->closurevariable;") + else + v.add_instr("{closcnv}.variable = variable;") + v.add_instr("{closcnv}.closurevariable = closurevariable;") + end + + return "(&{closcnv})" + end + + protected meth decl_csignature(v: CompilerVisitor, args: Array[String], closcn: String): String + do + var params = new Array[String] + params.add("struct {closcn}* closctx") + for i in [0..closure.signature.arity[ do + var p = "val_t {args[i]}" + params.add(p) + end + var ret: String + if closure.signature.return_type != null then + ret = "val_t" + else + ret = "void" + end + var p = params.join(", ") + var s = "{ret} {cname}({p})" + v.add_decl("struct {closcn};") + v.add_decl("typedef {ret} (* {cname}_t)({p});") + v.add_decl(s + ";") + return s + end + + redef meth do_compile_inside(v, params) + do + for i in [0..variables.length[ do + var vacname = v.cfc.register_variable(variables[i]) + v.add_assignment(vacname, params[i]) + end + + var old_cv = v.nmc.continue_value + var old_cl = v.nmc.continue_label + var old_bl = v.nmc.break_label + + v.nmc.continue_value = v.cfc.get_var + v.nmc.continue_label = "continue_label{v.new_number}" + v.nmc.break_label = v.nmc.return_label + + if n_expr != null then v.compile_stmt(n_expr) + + v.add_instr("{v.nmc.continue_label}: while(false);") + + var ret: String = null + if closure.signature.return_type != null then ret = v.nmc.continue_value + + v.nmc.continue_value = old_cv + v.nmc.continue_label = old_cl + v.nmc.break_label = old_bl + + return ret + end +end + +redef class PClosureDecl + meth do_compile_inside(v: CompilerVisitor, params: Array[String]): String is abstract +end +redef class AClosureDecl + redef meth do_compile_inside(v, params) + do + if n_signature != null then n_signature.compile_parameters(v, variable.closure.signature, params) + + var old_cv = v.nmc.continue_value + var old_cl = v.nmc.continue_label + var old_bl = v.nmc.break_label + + v.nmc.continue_value = v.cfc.get_var + v.nmc.continue_label = "continue_label{v.new_number}" + v.nmc.break_label = v.nmc.return_label + + if n_expr != null then v.compile_stmt(n_expr) + + v.add_instr("{v.nmc.continue_label}: while(false);") + + var ret: String = null + if variable.closure.signature.return_type != null then ret = v.nmc.continue_value + + v.nmc.continue_value = old_cv + v.nmc.continue_label = old_cl + v.nmc.break_label = old_bl + + return ret + end +end + +redef class AClosureCallExpr + redef meth compile_expr(v) + do + var cargs = new Array[String] + for a in arguments do cargs.add(v.compile_expr(a)) + var va: String = null + if variable.closure.signature.return_type != null then va = v.cfc.get_var + + if variable.closure.is_optional then + v.add_instr("if({v.cfc.varname(variable)}==NULL) \{") + v.indent + var n = variable.decl + assert n isa AClosureDecl + var s = n.do_compile_inside(v, cargs) + if s != null then v.add_assignment(va, s) + v.unindent + v.add_instr("} else \{") + v.indent + end + + var ivar = "(({variable.ctypename})({v.cfc.varname(variable)}))" + var cargs2 = [ivar] + cargs2.append(cargs) + var s = "({ivar}->fun({cargs2.join(", ")})) /* Invoke closure {variable} */" + if va != null then + v.add_assignment(va, s) + else + v.add_instr("{s};") + end + v.add_instr("if ({ivar}->has_broke) \{") + v.indent + if n_closure_defs != null and n_closure_defs.length == 1 then do + n_closure_defs.first.do_compile_inside(v, null) + end + if v.cfc.in_closure then v.add_instr("if ({ivar}->has_broke) \{ closctx->has_broke = {ivar}->has_broke; closctx->broke_value = {ivar}->broke_value;\}") + v.add_instr("goto {v.nmc.return_label};") + v.unindent + v.add_instr("\}") + + if variable.closure.is_optional then + v.unindent + v.add_instr("\}") + end + return va end end @@ -1284,16 +1670,16 @@ redef class AOnceExpr redef meth compile_expr(v) do var i = v.new_number - var cvar = v.get_var - v.add_decl("static val_t once_value_{cvar}_{i}; static int once_bool_{cvar}_{i};") - v.add_instr("if (once_bool_{cvar}_{i}) {cvar} = once_value_{cvar}_{i};") + var cvar = v.cfc.get_var + v.add_decl("static val_t once_value_{i}; static int once_bool_{i}; /* Once value for {cvar}*/") + v.add_instr("if (once_bool_{i}) {cvar} = once_value_{i};") v.add_instr("else \{") v.indent - v.free_var(cvar) + v.cfc.free_var(cvar) var e = v.compile_expr(n_expr) v.add_assignment(cvar, e) - v.add_instr("once_value_{cvar}_{i} = {cvar};") - v.add_instr("once_bool_{cvar}_{i} = true;") + v.add_instr("once_value_{i} = {cvar};") + v.add_instr("once_bool_{i} = true;") v.unindent v.add_instr("}") return cvar