compile: Superstring compilation bug
[nit.git] / src / compiling / compiling_methods.nit
index 2729ea1..3e20f95 100644 (file)
@@ -24,6 +24,7 @@ redef class CompilerVisitor
        # Compile a statment node
        meth compile_stmt(n: PExpr)
        do
+               add_instr("/* Compile stmt {n.locate} */")
                n.prepare_compile_stmt(self)
                var i = cfc._variable_index
                n.compile_stmt(self)
@@ -33,25 +34,26 @@ redef class CompilerVisitor
        # Compile is expression node
        meth 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
                        return s
                end
-               var v = cfc.get_var
+               var v = cfc.get_var("Result for expr {n.locate}")
                add_assignment(v, s)
                return v
        end
 
        # Ensure that a c expression is a var
-       meth ensure_var(s: String): String
+       meth ensure_var(s: String, comment: String): String
        do
                if s.substring(0,3) == "variable" then
                        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
 
@@ -67,15 +69,18 @@ redef class CompilerVisitor
 
        readable writable attr _nmc: NitMethodContext
 
+       # 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, \""
+               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
+               return s.to_s
        end
 
        redef init(module: MMSrcModule)
@@ -146,36 +151,88 @@ class CFunctionContext
        # 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]
+       # Association between nit variable and the corrsponding c variable index
+       attr _varindexes: Map[Variable, Int] = new HashMap[Variable, Int]
+
+       # Are we currenlty in a closure definition?
+       readable writable attr _closure: NitMethodContext = null
 
+       # Return the cvariable of a Nit variable
        meth 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
+       meth get_var(comment: 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
        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
+       # Next available closure variable number
+       attr _closurevariable_index: Int = 0
+
+       meth 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 meth variable(i: Int): String
        do
-               return "variable[{i}]"
+               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 meth closure_variable(i: Int): String
+       do
+               if closure != null then
+                       return "(closctx->closurevariable[{i}])"
+               else
+                       return "closurevariable[{i}]"
+               end
        end
 
        # Mark the variable available
@@ -196,6 +253,11 @@ class CFunctionContext
                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
@@ -206,9 +268,6 @@ class NitMethodContext
        # Current method compiled
        readable attr _method: MMSrcMethod
 
-       # Is a "return" found in the method body
-       readable writable attr _has_return: Bool = false
-
        # Association between parameters and the corresponding variables
        readable writable attr _method_params: Array[ParamVariable] 
 
@@ -224,6 +283,12 @@ class NitMethodContext
        # 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
@@ -232,6 +297,10 @@ 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,
@@ -260,7 +329,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,21 +347,85 @@ redef class MMMethod
                end
        end
 
+       # Compile a call on self for given arguments and given closures
+       meth compile_call_and_closures(v: CompilerVisitor, cargs: Array[String], clos_defs: Array[PClosureDef]): String
+       do
+               var ve: String = null
+               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 = 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
        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
        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 "FWBT_{cname}_{i}"
+       end
 end
 
 redef class MMAttribute
@@ -310,36 +443,48 @@ redef class MMLocalProperty
 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 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
 
@@ -352,6 +497,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 +508,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,6 +530,8 @@ 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
@@ -461,62 +613,75 @@ 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 = 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 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
+                       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 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.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.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: String = null
+               if method.signature.return_type != null then
+                       ret = v.nmc.return_value
+               end
 
                v.nmc = old_nmc
                return ret
@@ -526,7 +691,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
@@ -576,7 +741,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
@@ -773,8 +938,7 @@ redef class AVardeclExpr
        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)
                        v.add_assignment(cname, e)
@@ -785,11 +949,11 @@ end
 redef class AReturnExpr
        redef meth 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)
                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
@@ -797,6 +961,11 @@ end
 redef class ABreakExpr
        redef meth compile_stmt(v)
        do
+               if n_expr != null then
+                       var e = v.compile_expr(n_expr)
+                       v.add_assignment(v.nmc.break_value, 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
@@ -804,6 +973,10 @@ end
 redef class AContinueExpr
        redef meth compile_stmt(v)
        do
+               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
@@ -852,12 +1025,12 @@ redef class AIfexprExpr
                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("}")
@@ -904,56 +1077,27 @@ 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)
-       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_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_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_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
+               var n_block = n_block
                if n_block != null then
                        v.compile_stmt(n_block)
                end
                v.add_instr("{v.nmc.continue_label}: while(0);")
-               e = prop4.compile_call(v, [iter])
+               e = meth_next.compile_call(v, [iter])
                assert e == null
                v.unindent
                v.add_instr("}")
@@ -1008,7 +1152,7 @@ end
 redef class AOrExpr
        redef meth 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
@@ -1023,7 +1167,7 @@ end
 redef class AAndExpr
        redef meth 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
@@ -1106,9 +1250,20 @@ end
 redef class AStringFormExpr
        redef meth 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
@@ -1125,7 +1280,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]
@@ -1141,7 +1296,7 @@ redef class AStringFormExpr
                        res.add(c)
                        i = i + 1
                end
-               _cstring = res
+               _cstring = res.to_s
                _cstring_length = len
        end
 end
@@ -1162,21 +1317,20 @@ end
 redef class ASuperstringExpr
        redef meth 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 array = meth_with_capacity.compile_constructor_call(v, atype, ["TAG_Int({n_exprs.length})"])
+               array = v.ensure_var(array, "Array (for super-string)")
 
-               var prop2 = stype.local_class.select_method(once "append".to_symbol)
-
-               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_call(v, [e])
                        end
-                       prop2.compile_call(v, [recv, e])
+                       v.cfc.free_var(e)
+                       meth_add.compile_call(v, [array, e])
                end
 
-               return recv
+               return meth_to_s.compile_call(v, [array])
        end
 end
 
@@ -1190,13 +1344,12 @@ end
 redef class AArrayExpr
        redef meth 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_call(v, [recv, e])
                end
                return recv
        end
@@ -1205,20 +1358,10 @@ end
 redef class ARangeExpr
        redef meth 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
@@ -1292,7 +1435,13 @@ 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
+                       e = prop.compile_call_and_closures(v, cargs, closure_defs)
+               end
+
                if prop.global.is_init then
                        v.invoke_super_init_calls_after(prop)
                end
@@ -1337,6 +1486,218 @@ redef class ANewExpr
        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.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 meth 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 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("Continue value and escape marker")
+               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("Continue value and escape marker")
+               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("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, 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 != null and 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
+end
+
 redef class AProxyExpr
        redef meth compile_expr(v)
        do
@@ -1348,7 +1709,7 @@ redef class AOnceExpr
        redef meth 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 \{")