src: update Java and C++ FFI to use `self`

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

diff --git a/src/ffi/cpp.nit b/src/ffi/cpp.nit
index ba6c2e0..7a5dec0 100644 (file)
--- a/src/ffi/cpp.nit
+++ b/src/ffi/cpp.nit
@@ -85,7 +85,7 @@ class CPPLanguage
                # Will convert C arguments to C++ and call the C++ implementation function.
                fc = new CFunction(indirection_sig)
                if not mproperty.is_init then
-                       var param_name = "recv"
+                       var param_name = "self"
                        var type_name = to_cpp_call_context.name_mtype(mclass_type)
                        if mclass_type.mclass.ftype isa ForeignCppType then
                                fc.exprs.add("{type_name} {param_name}_for_cpp = static_cast<{type_name}>({param_name});\n")

diff --git a/src/ffi/java.nit b/src/ffi/java.nit
index ae37d9d..41c9c26 100644 (file)
--- a/src/ffi/java.nit
+++ b/src/ffi/java.nit
@@ -105,7 +105,7 @@ class JavaLanguage
                        jni_signature_alt = mclass_type.jni_signature_alt
                        return_type = mclass_type
                else
-                       params.add "recv"
+                       params.add "self"
                        if signature.return_mtype != null then
                                var ret_mtype = signature.return_mtype
                                ret_mtype = ret_mtype.resolve_for(mclass_type, mclass_type, mmodule, true)
@@ -637,7 +637,7 @@ redef class MMethod
                cparams.add "jclass clazz"
 
                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)