Merge branch 'wip2'

[nit.git] / src / syntax / icode_generation.nit

diff --git a/src/syntax/icode_generation.nit b/src/syntax/icode_generation.nit
index d78829f..54874d1 100644 (file)
--- a/src/syntax/icode_generation.nit
+++ b/src/syntax/icode_generation.nit
@@ -82,6 +82,9 @@ class A2IContext
        # The method associated to the iroutine (if any)
        readable var _method: nullable MMMethod
 
+       # The register of self (if any)
+       var selfreg: nullable IRegister writable
+
        init(visitor: AbsSyntaxVisitor, r: IRoutine, m: nullable MMMethod)
        do
                super(visitor.mmmodule, r)
@@ -177,8 +180,8 @@ redef class MMSrcModule
        fun generate_icode(tc: ToolContext)
        do
                var v = new A2IVisitor(tc, self)
-               for c in src_local_classes do
-                       for p in c.src_local_properties do
+               for c in src_local_classes.values do
+                       for p in c.src_local_properties.values do
                                if p isa MMSrcMethod then
                                        p.generate_iroutine(v)
                                else if p isa MMSrcAttribute then
@@ -368,6 +371,7 @@ redef class AConcreteMethPropdef
                var params = v.iroutine.params.to_a
                var selfreg = v.variable(self_var)
                v.stmt(new IMove(selfreg, params[0]))
+               v.selfreg = selfreg
                params.shift
 
                var orig_meth: MMLocalProperty = method.global.intro
@@ -383,6 +387,39 @@ redef class AConcreteMethPropdef
                if n_block != null then
                        v.generate_stmt(n_block)
                end
+               v.selfreg = null
+       end
+end
+
+redef class AExternPropdef
+       redef fun fill_iroutine(v, method)
+       do
+               # add all explicit extern calls for this extern method
+               for explicit_import in method.as(MMMethSrcMethod).explicit_imports
+               do
+                       var prop = explicit_import.method
+                       var ic : IAbsCall
+                       if prop.is_init then
+                               ic = new INew(prop.signature.recv, prop, new List[IRegister])
+                       else
+                               ic = new ICall(prop, new List[IRegister])
+                       end
+                       ic.is_explicit_from_extern = true
+                       v.stmt(ic)
+               end
+       end
+end
+
+redef class AExternInitPropdef
+       redef fun fill_iroutine(v, method)
+       do
+               var params = v.iroutine.params
+               var sig = method.signature
+               assert params.length == sig.arity + 1
+               var rtype = sig.recv # sig.return_type
+               v.add_assignment(new IRegister(rtype), v.expr(new INative(method, params), rtype))
+
+               super
        end
 end
 
@@ -403,6 +440,8 @@ redef class AExternMethPropdef
                else
                        v.stmt(new INative(method, params))
                end
+
+               super
        end
 end
 
@@ -652,7 +691,7 @@ redef class AAssertExpr
                if id == null then
                        v.add_abort("Assert failed")
                else
-                       v.add_abort("Assert %s  failed", id.to_s)
+                       v.add_abort("Assert '%s' failed", id.text.to_s)
                end
                v.seq = seq_old
                return null
@@ -812,7 +851,7 @@ redef class AIsaExpr
        redef fun generate_icode(v)
        do
                var e = v.generate_expr(n_expr)
-               return v.expr(new ITypeCheck(e, n_type.stype), stype)
+               return v.expr(new ITypeCheck(v.selfreg.as(not null), e, n_type.stype), stype)
        end
 end
 
@@ -960,8 +999,9 @@ end
 redef class AArrayExpr
        redef fun generate_icode(v)
        do
-               var recv = v.add_new_array(stype, n_exprs.length)
-               for ne in n_exprs do
+               var nes = n_exprs.n_exprs
+               var recv = v.add_new_array(stype, nes.length)
+               for ne in nes do
                        var e = v.generate_expr(ne)
                        v.add_call_array_add(recv, e)
                end
@@ -998,12 +1038,13 @@ redef class ASuperExpr
                end
                var args = new Array[IRegister].with_capacity(arity + 1)
                args.add(v.iroutine.params[0])
-               if n_args.length != arity then
+               var nas = n_args.n_exprs
+               if nas.length != arity then
                        for i in [0..arity[ do
                                args.add(v.iroutine.params[i + 1])
                        end
                else
-                       for na in n_args do
+                       for na in nas do
                                args.add(v.generate_expr(na))
                        end
                end
@@ -1320,3 +1361,11 @@ redef class AClosureCallExpr
                return r
        end
 end
+
+redef class ADebugTypeExpr
+       redef fun generate_icode(v)
+       do
+               # Do nothing.
+               return null
+       end
+end