X-Git-Url: http://nitlanguage.org diff --git a/src/compiling/compiling_methods.nit b/src/compiling/compiling_methods.nit index 2729ea1..ef6f9e1 100644 --- a/src/compiling/compiling_methods.nit +++ b/src/compiling/compiling_methods.nit @@ -22,8 +22,10 @@ private import syntax redef class CompilerVisitor # Compile a statment node - meth compile_stmt(n: PExpr) + fun compile_stmt(n: nullable PExpr) do + if n == null then return + #add_instr("/* Compile stmt {n.locate} */") n.prepare_compile_stmt(self) var i = cfc._variable_index n.compile_stmt(self) @@ -31,59 +33,59 @@ redef class CompilerVisitor end # Compile is expression node - meth compile_expr(n: PExpr): String + fun compile_expr(n: PExpr): String do + #add_instr("/* Compile expr {n.locate} */") var i = cfc._variable_index var s = n.compile_expr(self) cfc._variable_index = i - if s[0] == ' ' then + if s[0] == ' ' or cfc.is_valid_variable(s) then return s end - var v = cfc.get_var + var v = cfc.get_var("Result") add_assignment(v, s) return v end # Ensure that a c expression is a var - meth ensure_var(s: String): String + fun ensure_var(s: String, comment: String): String do - if s.substring(0,3) == "variable" then + if cfc.is_valid_variable(s) then + add_instr("/* Ensure var {s}: {comment}*/") return s end - var v = cfc.get_var - add_assignment(v, s) + var v = cfc.get_var(null) + add_assignment(v, "{s} /* Ensure var: {comment}*/") return v end # Add a assignment between a variable and an expression - meth add_assignment(v: String, s: String) + fun add_assignment(v: String, s: String) do if v != s then add_instr("{v} = {s};") end end - readable writable attr _cfc: CFunctionContext + readable writable var _cfc: nullable CFunctionContext + + readable writable var _nmc: nullable NitMethodContext - readable writable attr _nmc: NitMethodContext + # C outputs written outside the current C function. + readable writable var _out_contexts: Array[CContext] = new Array[CContext] # Generate an fprintf to display an error location - meth printf_locate_error(node: PNode): String + fun printf_locate_error(node: PNode): String do - var s = "fprintf(stderr, \"" + var s = new Buffer.from("fprintf(stderr, \"") if nmc != null then s.append(" in %s") s.append(" (%s:%d)\\n\", ") if nmc != null then s.append("LOCATE_{nmc.method.cname}, ") s.append("LOCATE_{module.name}, {node.line_number});") - return s - end - - redef init(module: MMSrcModule) - do - super + return s.to_s end - meth invoke_super_init_calls_after(start_prop: MMMethod) + fun invoke_super_init_calls_after(start_prop: nullable MMMethod) do var n = nmc.method.node assert n isa AConcreteInitPropdef @@ -105,7 +107,7 @@ redef class CompilerVisitor end j += 1 end - var stop_prop: MMMethod = null + var stop_prop: nullable MMMethod = null if j < n.explicit_super_init_calls.length then stop_prop = n.explicit_super_init_calls[j] end @@ -118,12 +120,12 @@ redef class CompilerVisitor if p.signature.arity == 0 then cargs.add(cfc.varname(nmc.method_params[0])) else - for va in nmc.method_params do + for va in nmc.method_params.as(not null) do cargs.add(cfc.varname(va)) end end #s.append(" {p}") - p.compile_call(self, cargs) + p.compile_stmt_call(self, cargs) i += 1 end #s.append(" ]") @@ -138,48 +140,109 @@ end # A C function currently written class CFunctionContext - readable attr _visitor: CompilerVisitor + readable var _visitor: CompilerVisitor # Next available variable number - attr _variable_index: Int = 0 + var _variable_index: Int = 0 # Total number of variable - attr _variable_index_max: Int = 0 + var _variable_index_max: Int = 0 + + # Association between nit variable and the corrsponding c variable index + var _varindexes: Map[Variable, Int] = new HashMap[Variable, Int] - # 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 var _closure: nullable NitMethodContext = null - meth varname(v: Variable): String + # Return the cvariable of a Nit variable + fun varname(v: Variable): String do - return _varnames[v] + if v isa ClosureVariable then + return closure_variable(_varindexes[v]) + else + return variable(_varindexes[v]) + end end # Return the next available variable - meth get_var: String + fun get_var(comment: nullable String): String do var v = variable(_variable_index) _variable_index = _variable_index + 1 if _variable_index > _variable_index_max then _variable_index_max = _variable_index end + if comment != null then + visitor.add_instr("/* Register {v}: {comment} */") + end return v end - meth register_variable(v: Variable): String + fun register_variable(v: Variable): String do - var s = get_var - _varnames[v] = "variable[{_variable_index-1}]" + _varindexes[v] = _variable_index + var s = get_var("Local variable") return s end - # Return the ith variable - protected meth variable(i: Int): String + # Next available closure variable number + var _closurevariable_index: Int = 0 + + fun register_closurevariable(v: ClosureVariable): String + do + var s = "closurevariable[{_closurevariable_index}]" + _varindexes[v] = _closurevariable_index + _closurevariable_index += 1 + if _closure != null then + return "(closctx->{s})" + else + return s + end + end + + # Return the ith cvariable + protected fun variable(i: Int): String + do + if closure != null then + var vn = once new Array[String] + if vn.length <= i then + for j in [vn.length..i] do + vn[j] = "(closctx->variable[{j}])" + end + end + return vn[i] + else + var vn = once new Array[String] + if vn.length <= i then + for j in [vn.length..i] do + vn[j] = "variable[{j}]" + end + end + return vn[i] + end + end + + # Return the ith closurevariable + protected fun closure_variable(i: Int): String do - return "variable[{i}]" + if closure != null then + return "(closctx->closurevariable[{i}])" + else + return "closurevariable[{i}]" + end + end + + # Is s a valid variable + protected fun is_valid_variable(s: String): Bool + do + for i in [0.._variable_index[ do + if s == variable(i) then return true + end + return false end # Mark the variable available - meth free_var(v: String) + fun free_var(v: String) do # FIXME: So ugly.. if v == variable(_variable_index-1) then @@ -189,13 +252,18 @@ class CFunctionContext # Generate the local variable declarations # To use at the end of the C function once all variables are known - meth generate_var_decls + fun 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("struct WBT_ *closurevariable[{_closurevariable_index}];") + else + visitor.add_decl("struct WBT_ **closurevariable = NULL;") + end end init(v: CompilerVisitor) do _visitor = v @@ -204,27 +272,30 @@ end # A Nit method currenlty compiled class NitMethodContext # Current method compiled - readable attr _method: MMSrcMethod - - # Is a "return" found in the method body - readable writable attr _has_return: Bool = false + readable var _method: nullable MMSrcMethod # Association between parameters and the corresponding variables - readable writable attr _method_params: Array[ParamVariable] + readable writable var _method_params: nullable Array[ParamVariable] # Where a nit return must branch - readable writable attr _return_label: String - + readable writable var _return_label: nullable String + # Where a nit break must branch - readable writable attr _break_label: String - + readable writable var _break_label: nullable String + # Where a nit continue must branch - readable writable attr _continue_label: String + readable writable var _continue_label: nullable String # Variable where a functionnal nit return must store its value - readable writable attr _return_value: String + readable writable var _return_value: nullable String + + # Variable where a functionnal nit break must store its value + readable writable var _break_value: nullable String - init(method: MMSrcMethod) + # Variable where a functionnal nit continue must store its value + readable writable var _continue_value: nullable String + + init(method: nullable MMSrcMethod) do _method = method end @@ -232,12 +303,35 @@ end ############################################################################### +redef class ClosureVariable + readable writable var _ctypename: nullable String +end + redef class MMMethod + # Compile as an expression. + # require that signature.return_type != null + fun compile_expr_call(v: CompilerVisitor, cargs: Array[String]): String + do + assert signature.return_type != null + var s = intern_compile_call(v, cargs) + assert s != null + return s + end + + # Compile as a statement. + # require that signature.return_type == null + fun compile_stmt_call(v: CompilerVisitor, cargs: Array[String]) + do + assert signature.return_type == null + var s = intern_compile_call(v, cargs) + assert s == null + end + # Compile a call on self for given arguments # Most calls are compiled with a table access, # primitive calles are inlined # == and != are guarded and possibly inlined - meth compile_call(v: CompilerVisitor, cargs: Array[String]): String + private fun intern_compile_call(v: CompilerVisitor, cargs: Array[String]): nullable String do var i = self if i isa MMSrcMethod then @@ -252,7 +346,7 @@ redef class MMMethod var ne = once "!=".to_symbol if name == ne then var eqp = signature.recv.local_class.select_method(ee) - var eqcall = eqp.compile_call(v, cargs) + var eqcall = eqp.compile_expr_call(v, cargs) return "TAG_Bool(!UNTAG_Bool({eqcall}))" end if global.is_init then @@ -260,7 +354,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})" @@ -278,72 +372,164 @@ redef class MMMethod end end + # Compile a call on self for given arguments and given closures + fun compile_call_and_closures(v: CompilerVisitor, cargs: Array[String], clos_defs: nullable Array[PClosureDef]): nullable String + do + var ve: String + var arity = 0 + if clos_defs != null then arity = clos_defs.length + + # 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("Closure return value and escape marker") + v.nmc.break_value = ve + + # Compile closure to c function + var realcargs = new Array[String] # Args to pass to the C function call + var closcns = new Array[String] # Closure C structure names + realcargs.add_all(cargs) + for i in [0..arity[ do + var cn = clos_defs[i].compile_closure(v, closure_cname(i)) + closcns.add(cn) + realcargs.add(cn) + end + for i in [arity..signature.closures.length[ do + realcargs.add("NULL") + end + + v.nmc.break_value = old_bv + + # Call + var e = intern_compile_call(v, realcargs) + 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.closure == v.nmc 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 + return e + end + # Compile a call as constructor with given args - meth compile_constructor_call(v: CompilerVisitor, recvtype: MMType, cargs: Array[String]): String + fun compile_constructor_call(v: CompilerVisitor, recvtype: MMType, cargs: Array[String]): String do - var recv = v.cfc.get_var - v.add_instr("{recv} = NEW_{recvtype.local_class}_{global.intro.cname}({cargs.join(", ")}); /*new {recvtype}*/") - return recv + return "NEW_{recvtype.local_class}_{global.intro.cname}({cargs.join(", ")}) /*new {recvtype}*/" end # Compile a call as call-next-method on self with given args - meth compile_super_call(v: CompilerVisitor, cargs: Array[String]): String + fun 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 fun closure_cname(i: Int): String + do + return "FWBT_{cname}_{i}" + end end redef class MMAttribute - # Compile an acces on selffor a given reciever. - # Result is a valid C left-value for assigment - meth compile_access(v: CompilerVisitor, recv: String): String + # Compile a read acces on selffor a given reciever. + fun compile_isset(v: CompilerVisitor, n: PNode, recv: String): String + do + return "TAG_Bool({global.attr_access}({recv})!=NIT_NULL) /* isset {local_class}::{name}*/" + end + + # Compile a read acces on selffor a given reciever. + fun compile_read_access(v: CompilerVisitor, n: PNode, recv: String): String do - return "{global.attr_access}({recv}) /*{local_class}::{name}*/" + var res = "{global.attr_access}({recv}) /*{local_class}::{name}*/" + if not signature.return_type.is_nullable then + res = v.ensure_var(res, "{local_class}::{name}") + v.add_instr("if ({res} == NIT_NULL) \{ fprintf(stderr, \"Uninitialized attribute %s\", \"{name}\"); {v.printf_locate_error(n)} nit_exit(1); } /* implicit isset */;") + end + return res + end + + # Compile a write acces on selffor a given reciever. + fun compile_write_access(v: CompilerVisitor, n: nullable PNode, recv: String, value: String) + do + v.add_instr("{global.attr_access}({recv}) /*{local_class}::{name}*/ = {value};") end end redef class MMLocalProperty # Compile the property as a C property - meth compile_property_to_c(v: CompilerVisitor) do end + fun 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 + protected fun 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 WBT_ *") + 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 WBT_ *{args[first_closure_index+i]}") + v.add_decl("typedef {r} (*{closcn})({subparams.join(", ")});") + 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) + redef fun compile_property_to_c(v) do v.cfc = new CFunctionContext(v) @@ -352,6 +538,9 @@ redef class MMSrcMethod 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}\"") @@ -360,6 +549,8 @@ redef class MMSrcMethod var ctx_old = v.ctx v.ctx = new CContext + v.out_contexts.clear + var ln = 0 var s = self if s.node != null then ln = s.node.line_number @@ -380,36 +571,38 @@ redef class MMSrcMethod 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 - meth do_compile_inside(v: CompilerVisitor, params: Array[String]): String is abstract + fun do_compile_inside(v: CompilerVisitor, params: Array[String]): nullable String is abstract end redef class MMReadImplementationMethod - redef meth do_compile_inside(v, params) + redef fun do_compile_inside(v, params) do - return node.prop.compile_access(v, params[0]) + return node.prop.compile_read_access(v, node, params[0]) end end redef class MMWriteImplementationMethod - redef meth do_compile_inside(v, params) + redef fun do_compile_inside(v, params) do - v.add_assignment(node.prop.compile_access(v, params[0]), params[1]) + node.prop.compile_write_access(v, node, params[0], params[1]) return null end end redef class MMMethSrcMethod - redef meth do_compile_inside(v, params) + redef fun do_compile_inside(v, params) do return node.do_compile_inside(v, self, params) end end redef class MMImplicitInit - redef meth do_compile_inside(v, params) + redef fun do_compile_inside(v, params) do var f = params.length - unassigned_attributes.length var recv = params.first @@ -422,14 +615,14 @@ redef class MMImplicitInit for i in [1..f[ do args.add(params[i]) end - sp.compile_call(v, args) + sp.compile_stmt_call(v, args) else - sp.compile_call(v, args_recv) + sp.compile_stmt_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]) + attribute.compile_write_access(v, null, recv, params[i]) end return null end @@ -438,19 +631,49 @@ end redef class MMType # Compile a subtype check to self # Return a NIT Bool - meth compile_cast(v: CompilerVisitor, recv: String): String + fun compile_cast(v: CompilerVisitor, recv: String, fromtype: MMType): String do # Fixme: handle formaltypes var g = local_class.global - return "TAG_Bool(({recv}==NIT_NULL) || VAL_ISA({recv}, {g.color_id}, {g.id_id})) /*cast {self}*/" + var s = "" + if fromtype.is_nullable then + if self.is_nullable then + s = "({recv}==NIT_NULL) || " + else + s = "({recv}!=NIT_NULL) && " + end + else + # FIXME This is used to not break code without the nullable KW + s = "({recv}==NIT_NULL) || " + end + return "TAG_Bool({s}VAL_ISA({recv}, {g.color_id}, {g.id_id})) /*cast {self}*/" end # Compile a cast assertion - meth compile_type_check(v: CompilerVisitor, recv: String, n: PNode) + fun compile_type_check(v: CompilerVisitor, recv: String, n: PNode, fromtype: MMType) do # Fixme: handle formaltypes var g = local_class.global - v.add_instr("if (({recv}!=NIT_NULL) && !VAL_ISA({recv}, {g.color_id}, {g.id_id})) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;") + var s = "" + if fromtype.is_nullable then + if self.is_nullable then + s = "({recv}!=NIT_NULL) && " + else + s = "({recv}==NIT_NULL) || " + end + else + # FIXME This is used to not break code without the nullable KW + s = "({recv}!=NIT_NULL) && " + end + v.add_instr("if ({s}!VAL_ISA({recv}, {g.color_id}, {g.id_id})) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;") + end + + # Compile a notnull cast assertion + fun compile_notnull_check(v: CompilerVisitor, recv: String, n: PNode) + do + if is_nullable then + v.add_instr("if (({recv}==NIT_NULL)) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;") + end end end @@ -458,65 +681,76 @@ end redef class AMethPropdef # Compile the method body - meth do_compile_inside(v: CompilerVisitor, method: MMSrcMethod, params: Array[String]): String is abstract + fun do_compile_inside(v: CompilerVisitor, method: MMSrcMethod, params: Array[String]): nullable String is abstract +end + +redef class PSignature + fun compile_parameters(v: CompilerVisitor, orig_sig: MMSignature, params: Array[String]) is abstract +end + +redef class ASignature + redef fun 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.as(not null) 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, orig_type) + 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 = 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) + redef fun do_compile_inside(v, method, params) do var old_nmc = v.nmc v.nmc = new NitMethodContext(method) - var cname = v.cfc.register_variable(self_var) - v.add_assignment(cname, params[0]) + var selfcname = v.cfc.register_variable(self_var) + v.add_assignment(selfcname, params[0]) + params.shift v.nmc.method_params = [self_var] var orig_meth: MMLocalProperty = method.global.intro var orig_sig = orig_meth.signature_for(method.signature.recv) if n_signature != null then - var sig = n_signature - assert sig isa ASignature - for ap in sig.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 + 1], ap) - end - v.add_assignment(cname, params[ap.position + 1]) - end + n_signature.compile_parameters(v, orig_sig, params) end - var itpos: String = null + var itpos: nullable 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.nmc.return_label = "return_label{v.new_number}" - if method.signature.return_type != null then - v.nmc.return_value = v.cfc.get_var - v.cfc.free_var(v.nmc.return_value) - else - v.nmc.return_value = null - end + v.nmc.return_value = v.cfc.get_var("Method return value and escape marker") 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.nmc.has_return then - v.add_instr("{v.nmc.return_label}: while(false);") - end + v.compile_stmt(n_block) + 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.nmc.return_value + + var ret: nullable String = null + if method.signature.return_type != null then + ret = v.nmc.return_value + end v.nmc = old_nmc return ret @@ -524,9 +758,9 @@ redef class AConcreteMethPropdef end redef class ADeferredMethPropdef - redef meth do_compile_inside(v, method, params) + redef fun 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 @@ -538,7 +772,7 @@ redef class ADeferredMethPropdef end redef class AExternMethPropdef - redef meth do_compile_inside(v, method, params) + redef fun do_compile_inside(v, method, params) do var ename = "{method.module.name}_{method.local_class.name}_{method.local_class.name}_{method.name}_{method.signature.arity}" if n_extern != null then @@ -565,18 +799,18 @@ redef class AExternMethPropdef end redef class AInternMethPropdef - redef meth do_compile_inside(v, method, p) + redef fun do_compile_inside(v, method, p) do var c = method.local_class.name var n = method.name - var s: String = null + var s: nullable String = null if c == once "Int".to_symbol then if n == once "object_id".to_symbol then s = "{p[0]}" 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 @@ -742,20 +976,20 @@ end redef class PExpr # Compile the node as an expression # Only the visitor should call it - meth compile_expr(v: CompilerVisitor): String is abstract + fun compile_expr(v: CompilerVisitor): String is abstract # Prepare a call of node as a statement # Only the visitor should call it # It's used for local variable managment - meth prepare_compile_stmt(v: CompilerVisitor) do end + fun prepare_compile_stmt(v: CompilerVisitor) do end # Compile the node as a statement # Only the visitor should call it - meth compile_stmt(v: CompilerVisitor) do printl("Error!") + fun compile_stmt(v: CompilerVisitor) do printl("Error!") end redef class ABlockExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do for n in n_expr do v.compile_stmt(n) @@ -764,68 +998,74 @@ redef class ABlockExpr end redef class AVardeclExpr - redef meth prepare_compile_stmt(v) + redef fun prepare_compile_stmt(v) do v.cfc.register_variable(variable) end - redef meth compile_stmt(v) + redef fun compile_stmt(v) do 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) + var e = v.compile_expr(n_expr.as(not null)) v.add_assignment(cname, e) end end end redef class AReturnExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do - v.nmc.has_return = true if n_expr != null then - var e = v.compile_expr(n_expr) - v.add_assignment(v.nmc.return_value, e) + var e = v.compile_expr(n_expr.as(not null)) + v.add_assignment(v.nmc.return_value.as(not null), e) end + if v.cfc.closure == v.nmc 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) + redef fun compile_stmt(v) do + if n_expr != null then + var e = v.compile_expr(n_expr.as(not null)) + v.add_assignment(v.nmc.break_value.as(not null), e) + end + if v.cfc.closure == v.nmc 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) + redef fun compile_stmt(v) do + if n_expr != null then + var e = v.compile_expr(n_expr.as(not null)) + v.add_assignment(v.nmc.continue_value.as(not null), e) + end v.add_instr("goto {v.nmc.continue_label};") end end redef class AAbortExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do v.add_instr("fprintf(stderr, \"Aborted\"); {v.printf_locate_error(self)} nit_exit(1);") end end redef class ADoExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do - if n_block != null then - v.compile_stmt(n_block) - end + v.compile_stmt(n_block) end end redef class AIfExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do var e = v.compile_expr(n_expr) v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/") @@ -846,18 +1086,18 @@ redef class AIfExpr end redef class AIfexprExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do var e = v.compile_expr(n_expr) v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/") v.cfc.free_var(e) v.indent - var e = v.ensure_var(v.compile_expr(n_then)) + var e = v.ensure_var(v.compile_expr(n_then), "Then value") v.unindent v.add_instr("} else \{ /*if*/") v.cfc.free_var(e) v.indent - var e2 = v.ensure_var(v.compile_expr(n_else)) + var e2 = v.ensure_var(v.compile_expr(n_else), "Else value") v.add_assignment(e, e2) v.unindent v.add_instr("}") @@ -865,9 +1105,10 @@ redef class AIfexprExpr end end -redef class AControlableBlock - meth compile_inside_block(v: CompilerVisitor) is abstract - redef meth compile_stmt(v) +class AControlableBlock +special PExpr + fun compile_inside_block(v: CompilerVisitor) is abstract + redef fun compile_stmt(v) do var old_break_label = v.nmc.break_label var old_continue_label = v.nmc.continue_label @@ -884,16 +1125,15 @@ redef class AControlableBlock end redef class AWhileExpr - redef meth compile_inside_block(v) +special AControlableBlock + redef fun compile_inside_block(v) do v.add_instr("while (true) \{ /*while*/") v.indent var e = v.compile_expr(n_expr) v.add_instr("if (!UNTAG_Bool({e})) break; /* while*/") v.cfc.free_var(e) - if n_block != null then - v.compile_stmt(n_block) - end + v.compile_stmt(n_block) v.add_instr("{v.nmc.continue_label}: while(0);") v.unindent v.add_instr("}") @@ -902,59 +1142,27 @@ redef class AWhileExpr end redef class AForExpr - redef meth compile_inside_block(v) - do - v.compile_stmt(n_vardecl) - end -end - -redef class AForVardeclExpr - redef meth compile_stmt(v) +special AControlableBlock + redef fun compile_inside_block(v) do var e = v.compile_expr(n_expr) - var prop = n_expr.stype.local_class.select_method(once "iterator".to_symbol) - if prop == null then - printl("No iterator") - return - end - var ittype = prop.signature.return_type + var ittype = meth_iterator.signature.return_type v.cfc.free_var(e) - var iter = v.cfc.get_var - v.add_assignment(iter, prop.compile_call(v, [e])) - var prop2 = ittype.local_class.select_method(once "is_ok".to_symbol) - if prop2 == null then - printl("No is_ok") - return - end - var prop3 = ittype.local_class.select_method(once "item".to_symbol) - if prop3 == null then - printl("No item") - return - end - var prop4 = ittype.local_class.select_method(once "next".to_symbol) - if prop4 == null then - printl("No next") - return - end + var iter = v.cfc.get_var("For iterator") + v.add_assignment(iter, meth_iterator.compile_expr_call(v, [e])) v.add_instr("while (true) \{ /*for*/") v.indent - var ok = v.cfc.get_var - v.add_assignment(ok, prop2.compile_call(v, [iter])) + var ok = v.cfc.get_var("For 'is_ok' result") + v.add_assignment(ok, meth_is_ok.compile_expr_call(v, [iter])) v.add_instr("if (!UNTAG_Bool({ok})) break; /*for*/") v.cfc.free_var(ok) - var e = prop3.compile_call(v, [iter]) - e = v.ensure_var(e) + var e = meth_item.compile_expr_call(v, [iter]) + e = v.ensure_var(e, "For item") 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.compile_stmt(n_block) v.add_instr("{v.nmc.continue_label}: while(0);") - e = prop4.compile_call(v, [iter]) - assert e == null + meth_next.compile_stmt_call(v, [iter]) v.unindent v.add_instr("}") v.add_instr("{v.nmc.break_label}: while(0);") @@ -962,7 +1170,7 @@ redef class AForVardeclExpr end redef class AAssertExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do var e = v.compile_expr(n_expr) var s = "" @@ -974,14 +1182,14 @@ redef class AAssertExpr end redef class AVarExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return " {v.cfc.varname(variable)} /*{variable.name}*/" end end redef class AVarAssignExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do var e = v.compile_expr(n_value) v.add_assignment(v.cfc.varname(variable), "{e} /*{variable.name}=*/") @@ -989,26 +1197,26 @@ redef class AVarAssignExpr end redef class AVarReassignExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do var e1 = v.cfc.varname(variable) var e2 = v.compile_expr(n_value) - var e3 = assign_method.compile_call(v, [e1, e2]) + var e3 = assign_method.compile_expr_call(v, [e1, e2]) v.add_assignment(v.cfc.varname(variable), "{e3} /*{variable.name}*/") end end redef class ASelfExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return v.cfc.varname(v.nmc.method_params[0]) end end redef class AOrExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do - var e = v.ensure_var(v.compile_expr(n_expr)) + var e = v.ensure_var(v.compile_expr(n_expr), "Left 'or' operand") v.add_instr("if (!UNTAG_Bool({e})) \{ /* or */") v.cfc.free_var(e) v.indent @@ -1021,9 +1229,9 @@ redef class AOrExpr end redef class AAndExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do - var e = v.ensure_var(v.compile_expr(n_expr)) + var e = v.ensure_var(v.compile_expr(n_expr), "Left 'and' operand") v.add_instr("if (UNTAG_Bool({e})) \{ /* and */") v.cfc.free_var(e) v.indent @@ -1036,14 +1244,14 @@ redef class AAndExpr end redef class ANotExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return " TAG_Bool(!UNTAG_Bool({v.compile_expr(n_expr)}))" end end redef class AEeExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do var e = v.compile_expr(n_expr) var e2 = v.compile_expr(n_expr2) @@ -1052,80 +1260,100 @@ redef class AEeExpr end redef class AIsaExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do var e = v.compile_expr(n_expr) - return n_type.stype.compile_cast(v, e) + return n_type.stype.compile_cast(v, e, n_expr.stype) end end redef class AAsCastExpr - redef meth compile_expr(v) + redef fun compile_expr(v) + do + var e = v.compile_expr(n_expr) + n_type.stype.compile_type_check(v, e, self, n_expr.stype) + return e + end +end + +redef class AAsNotnullExpr + redef fun compile_expr(v) do var e = v.compile_expr(n_expr) - n_type.stype.compile_type_check(v, e, self) + n_expr.stype.compile_notnull_check(v, e, self) return e end end redef class ATrueExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return " TAG_Bool(true)" end end redef class AFalseExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return " TAG_Bool(false)" end end redef class AIntExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return " TAG_Int({n_number.text})" end end redef class AFloatExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return "BOX_Float({n_float.text})" end end redef class ACharExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return " TAG_Char({n_char.text})" end end redef class AStringFormExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do - var prop = stype.local_class.select_method(once "with_native".to_symbol) compute_string_info - return prop.compile_constructor_call(v, stype , ["BOX_NativeString(\"{_cstring}\")", "TAG_Int({_cstring_length})"]) + var i = v.new_number + var cvar = v.cfc.get_var("Once String constant") + v.add_decl("static val_t once_value_{i} = NIT_NULL; /* Once value for string {cvar}*/") + v.add_instr("if (once_value_{i} != NIT_NULL) {cvar} = once_value_{i};") + v.add_instr("else \{") + v.indent + v.cfc.free_var(cvar) + var e = meth_with_native.compile_constructor_call(v, stype, ["BOX_NativeString(\"{_cstring}\")", "TAG_Int({_cstring_length})"]) + v.add_assignment(cvar, e) + v.add_instr("once_value_{i} = {cvar};") + v.unindent + v.add_instr("}") + return cvar end # The raw string value - protected meth string_text: String is abstract + protected fun string_text: String is abstract # The string in a C native format - protected attr _cstring: String + protected var _cstring: nullable String # The string length in bytes - protected attr _cstring_length: Int + protected var _cstring_length: nullable Int # Compute _cstring and _cstring_length using string_text - protected meth compute_string_info + protected fun compute_string_info 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] @@ -1141,94 +1369,91 @@ redef class AStringFormExpr res.add(c) i = i + 1 end - _cstring = res + _cstring = res.to_s _cstring_length = len end end redef class AStringExpr - redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2) + redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2) end redef class AStartStringExpr - redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2) + redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2) end redef class AMidStringExpr - redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2) + redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2) end redef class AEndStringExpr - redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2) + redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2) end redef class ASuperstringExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do - var prop = stype.local_class.select_method(once "init".to_symbol) - var recv = prop.compile_constructor_call(v, stype, new Array[String]) - - var prop2 = stype.local_class.select_method(once "append".to_symbol) + var array = meth_with_capacity.compile_constructor_call(v, atype.as(not null), ["TAG_Int({n_exprs.length})"]) + array = v.ensure_var(array, "Array (for super-string)") - var prop3 = stype.local_class.select_method(once "to_s".to_symbol) for ne in n_exprs do - var e = v.ensure_var(v.compile_expr(ne)) + var e = v.ensure_var(v.compile_expr(ne), "super-string element") if ne.stype != stype then - v.add_assignment(e, prop3.compile_call(v, [e])) + v.cfc.free_var(e) + e = meth_to_s.compile_expr_call(v, [e]) end - prop2.compile_call(v, [recv, e]) + v.cfc.free_var(e) + meth_add.compile_stmt_call(v, [array, e]) end - return recv + return meth_to_s.compile_expr_call(v, [array]) end end redef class ANullExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return " NIT_NULL /*null*/" end end redef class AArrayExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do - var prop = stype.local_class.select_method(once "with_capacity".to_symbol) - var recv = prop.compile_constructor_call(v, stype, ["TAG_Int({n_exprs.length})"]) + var recv = meth_with_capacity.compile_constructor_call(v, stype, ["TAG_Int({n_exprs.length})"]) + recv = v.ensure_var(recv, "Literal array") - var prop2 = stype.local_class.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_stmt_call(v, [recv, e]) end return recv end end redef class ARangeExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do - var prop = stype.local_class.select_method(propname) var e = v.compile_expr(n_expr) var e2 = v.compile_expr(n_expr2) - return prop.compile_constructor_call(v, stype, [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 - redef meth compile_stmt(v) + redef fun compile_stmt(v) do - var e = compile_expr(v) - if e != null then v.add_instr("{e};") + var e = intern_compile_call(v) + if e != null then + v.add_instr(e + ";") + end end - redef meth compile_expr(v) + redef fun compile_expr(v) + do + var e = intern_compile_call(v) + assert e != null + return e + end + + private fun intern_compile_call(v: CompilerVisitor): nullable String do var arity = v.nmc.method_params.length - 1 if init_in_superclass != null then @@ -1247,7 +1472,7 @@ redef class ASuperExpr end #return "{prop.cname}({args.join(", ")}) /*super {prop.local_class}::{prop.name}*/" if init_in_superclass != null then - return init_in_superclass.compile_call(v, args) + return init_in_superclass.intern_compile_call(v, args) else if prop.global.is_init then args.add("init_table") return prop.compile_super_call(v, args) @@ -1256,52 +1481,82 @@ redef class ASuperExpr end redef class AAttrExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do var e = v.compile_expr(n_expr) - return prop.compile_access(v, e) + return prop.compile_read_access(v, n_id, e) end end redef class AAttrAssignExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do var e = v.compile_expr(n_expr) var e2 = v.compile_expr(n_value) - v.add_assignment(prop.compile_access(v, e), e2) + prop.compile_write_access(v, n_id, e, e2) end end redef class AAttrReassignExpr - redef meth compile_stmt(v) + redef fun compile_stmt(v) do var e1 = v.compile_expr(n_expr) - var e2 = prop.compile_access(v, e1) + var e2 = prop.compile_read_access(v, n_id, e1) var e3 = v.compile_expr(n_value) - var e4 = assign_method.compile_call(v, [e2, e3]) - v.add_assignment(e2, e4) + var e4 = assign_method.compile_expr_call(v, [e2, e3]) + prop.compile_write_access(v, n_id, e1, e4) + end +end + +redef class AIssetAttrExpr + redef fun compile_expr(v) + do + var e = v.compile_expr(n_expr) + return prop.compile_isset(v, n_id, e) end end +redef class AAbsAbsSendExpr + # Compile each argument and add them to the array + fun compile_arguments_in(v: CompilerVisitor, cargs: Array[String]) + do + for a in arguments.as(not null) do + cargs.add(v.compile_expr(a)) + end + end + +end + redef class ASendExpr - redef meth compile_expr(v) + private fun intern_compile_call(v: CompilerVisitor): nullable String do var recv = v.compile_expr(n_expr) var cargs = new Array[String] cargs.add(recv) - for a in arguments do - cargs.add(v.compile_expr(a)) + compile_arguments_in(v, cargs) + + var e: nullable String + if prop_signature.closures.is_empty then + e = prop.intern_compile_call(v, cargs) + else + e = prop.compile_call_and_closures(v, cargs, closure_defs) end - var e = prop.compile_call(v, cargs) if prop.global.is_init then v.invoke_super_init_calls_after(prop) end return e end - redef meth compile_stmt(v) + redef fun compile_expr(v) do - var e = compile_expr(v) + var e = intern_compile_call(v) + assert e != null + return e + end + + redef fun compile_stmt(v) + do + var e = intern_compile_call(v) if e != null then v.add_instr(e + ";") end @@ -1309,46 +1564,273 @@ redef class ASendExpr end redef class ASendReassignExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do abort + + redef fun compile_stmt(v) do var recv = v.compile_expr(n_expr) var cargs = new Array[String] cargs.add(recv) - for a in arguments do - cargs.add(v.compile_expr(a)) - end + compile_arguments_in(v, cargs) - var e2 = read_prop.compile_call(v, cargs) + var e2 = read_prop.compile_expr_call(v, cargs) var e3 = v.compile_expr(n_value) - var e4 = assign_method.compile_call(v, [e2, e3]) + var e4 = assign_method.compile_expr_call(v, [e2, e3]) cargs.add(e4) - return prop.compile_call(v, cargs) + prop.compile_stmt_call(v, cargs) end end redef class ANewExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do var cargs = new Array[String] - for a in arguments do - cargs.add(v.compile_expr(a)) + compile_arguments_in(v, cargs) + return prop.compile_constructor_call(v, stype, cargs) + end + + redef fun compile_stmt(v) do abort +end + +redef class PClosureDef + # Compile the closure definition as a function in v.out_contexts + # Return the cname of the function + fun compile_closure(v: CompilerVisitor, closcn: String): String is abstract + + # Compile the closure definition inside the current C function. + fun do_compile_inside(v: CompilerVisitor, params: nullable Array[String]): nullable String is abstract +end + +redef class AClosureDef + # The cname of the function + readable var _cname: nullable String + + redef fun 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.closure + v.cfc.closure = v.nmc + + var old_rv = v.nmc.return_value + var old_bv = v.nmc.break_value + if cfc_old == null 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.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 WBT_ {closcnv};") + v.add_instr("{closcnv}.fun = (fun_t){cname};") + v.add_instr("{closcnv}.has_broke = NULL;") + if cfc_old != null 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 fun decl_csignature(v: CompilerVisitor, args: Array[String], closcn: String): String + do + var params = new Array[String] + params.add("struct WBT_ *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("typedef {ret} (* {cname}_t)({p});") + v.add_decl(s + ";") + return s + end + + redef fun 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("Continue value and escape marker") + v.nmc.continue_label = "continue_label{v.new_number}" + v.nmc.break_label = v.nmc.return_label + + v.compile_stmt(n_expr) + + v.add_instr("{v.nmc.continue_label}: while(false);") + + var ret: nullable 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 + fun do_compile_inside(v: CompilerVisitor, params: Array[String]): nullable String is abstract +end +redef class AClosureDecl + redef fun do_compile_inside(v, params) + do + 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("Continue value and escape marker") + v.nmc.continue_label = "continue_label{v.new_number}" + v.nmc.break_label = v.nmc.return_label + + v.compile_stmt(n_expr) + + v.add_instr("{v.nmc.continue_label}: while(false);") + + var ret: nullable 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 + fun intern_compile_call(v: CompilerVisitor): nullable String + do + var cargs = new Array[String] + compile_arguments_in(v, cargs) + var va: nullable String = null + if variable.closure.signature.return_type != null then va = v.cfc.get_var("Closure call result value") + + 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.as(not null), s) + v.unindent + v.add_instr("} else \{") + v.indent + end + + var ivar = v.cfc.varname(variable) + var cargs2 = [ivar] + cargs2.append(cargs) + var s = "(({variable.ctypename})({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.length == 1 then do + n_closure_defs.first.do_compile_inside(v, null) + end + if v.cfc.closure == v.nmc 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 + + redef fun compile_expr(v) + do + var e = intern_compile_call(v) + assert e != null + return e + end + + redef fun compile_stmt(v) + do + var e = intern_compile_call(v) + if e != null then + v.add_instr(e + ";") end - return prop.compile_constructor_call(v, stype, cargs) end end redef class AProxyExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do return v.compile_expr(n_expr) end end redef class AOnceExpr - redef meth compile_expr(v) + redef fun compile_expr(v) do var i = v.new_number - var cvar = v.cfc.get_var + var cvar = v.cfc.get_var("Once expression result") 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 \{")