src: update core FFI to use `self` instead of `recv` in C

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/src/compiler/compiler_ffi/compiler_ffi.nit b/src/compiler/compiler_ffi/compiler_ffi.nit
index 8b8f9de..edf0a16 100644 (file)
--- a/src/compiler/compiler_ffi/compiler_ffi.nit
+++ b/src/compiler/compiler_ffi/compiler_ffi.nit
@@ -107,11 +107,11 @@ redef class MExplicitCall
                if mproperty.is_init then
                        var recv_mtype = recv_mtype
                        recv_var = nitni_visitor.init_instance_or_extern(recv_mtype)
-                       nitni_visitor.add("{mtype.ctype} recv /* var self: {mtype} */;")
-                       nitni_visitor.add("recv = {recv_var};")
+                       nitni_visitor.add("{mtype.ctype} self /* var self: {mtype} */;")
+                       nitni_visitor.add("self = {recv_var};")
                else
                        mtype = mtype.anchor_to(v.compiler.mainmodule, recv_mtype)
-                       recv_var = nitni_visitor.var_from_c("recv", mtype)
+                       recv_var = nitni_visitor.var_from_c("self", mtype)
                        recv_var = nitni_visitor.box_extern(recv_var, mtype)
                end
 
@@ -226,7 +226,7 @@ redef class MExplicitSuper
 
                var vars = new Array[RuntimeVariable]
 
-               var recv_var = nitni_visitor.var_from_c("recv", mclass_type)
+               var recv_var = nitni_visitor.var_from_c("self", mclass_type)
                recv_var = nitni_visitor.box_extern(recv_var, mclass_type)
                vars.add(recv_var)
 

diff --git a/src/nitni/nitni_utilities.nit b/src/nitni/nitni_utilities.nit
index 631421a..7de8053 100644 (file)
--- a/src/nitni/nitni_utilities.nit
+++ b/src/nitni/nitni_utilities.nit
@@ -72,7 +72,7 @@ redef class MMethod
 
                var cparams = new List[String]
                if not self.is_init then
-                       cparams.add( "{call_context.name_mtype(recv_mtype)} recv" )
+                       cparams.add( "{call_context.name_mtype(recv_mtype)} self" )
                end
                for p in signature.mparameters do
                        var param_mtype = p.mtype.resolve_for(recv_mtype, recv_mtype, from_mmodule, true)
@@ -110,7 +110,7 @@ redef class MMethod
 
                var cparams = new List[String]
                if not self.is_init then
-                       cparams.add(call_context.cast_to(recv_mtype, "recv{param_suffix}"))
+                       cparams.add(call_context.cast_to(recv_mtype, "self{param_suffix}"))
                end
 
                for p in signature.mparameters do