GAsync: Fix name conflicts

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index b3c9ea5b8a3b1ed124153d7ded6095acf6af2746..8160fdb37e64b4ea8b7e057a91a3ae6dbdc6ec1e 100644 (file)
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -93,7 +93,7 @@ internal class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                                // output arguments used separately
                                out_arg_map = new HashMap<int,CCodeExpression> (direct_hash, direct_equal);
                                // pass GAsyncResult stored in closure to finish function
-                               out_arg_map.set (get_param_pos (0.1), new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "res"));
+                               out_arg_map.set (get_param_pos (0.1), new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_res_"));
                        }
                }
 
@@ -650,7 +650,7 @@ internal class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                                pre_statement_fragment.append (new CCodeExpressionStatement (async_call));
 
                                int state = next_coroutine_state++;
-                               pre_statement_fragment.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "state"), new CCodeConstant (state.to_string ()))));
+                               pre_statement_fragment.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_state_"), new CCodeConstant (state.to_string ()))));
                                pre_statement_fragment.append (new CCodeReturnStatement (new CCodeConstant ("FALSE")));
                                pre_statement_fragment.append (new CCodeCaseStatement (new CCodeConstant (state.to_string ())));
                        }

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 30a90504749759c4ccfdaf124faafc0cf8b81334..4cb0e049b2300f01ec2bd09f8f6ffbb34a2c7c8c 100644 (file)
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -141,7 +141,7 @@ internal class Vala.CCodeMethodModule : CCodeStructModule {
                idle_call.add_argument (async_result_expr);
                idle_block.add_statement (new CCodeExpressionStatement (idle_call));
 
-               var state = new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "state");
+               var state = new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_state_");
                var zero = new CCodeConstant ("0");
                var state_is_zero = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, state, zero);
                var dispatch = new CCodeIfStatement (state_is_zero, idle_block, direct_block);
@@ -379,7 +379,7 @@ internal class Vala.CCodeMethodModule : CCodeStructModule {
                                        co_function.modifiers |= CCodeModifiers.STATIC;
                                        source_declarations.add_type_member_declaration (co_function.copy ());
 
-                                       var cswitch = new CCodeSwitchStatement (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "state"));
+                                       var cswitch = new CCodeSwitchStatement (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_state_"));
 
                                        // let gcc know that this can't happen
                                        cswitch.add_statement (new CCodeLabel ("default"));

diff --git a/codegen/valadbusclientmodule.vala b/codegen/valadbusclientmodule.vala
index bf89555cb106811dd41c0ca63a15913f6d7ac0d3..a05a246c2476dfc191a97a223fcaeb35b89ae530 100644 (file)
--- a/codegen/valadbusclientmodule.vala
+++ b/codegen/valadbusclientmodule.vala
@@ -1679,8 +1679,8 @@ internal class Vala.DBusClientModule : DBusModule {
                string dataname = "%sDBusProxy%sData".printf (iface.get_cname (), Symbol.lower_case_to_camel_case (m.name));
                var datastruct = new CCodeStruct ("_" + dataname);
 
-               datastruct.add_field ("GAsyncReadyCallback", "callback");
-               datastruct.add_field ("gpointer", "user_data");
+               datastruct.add_field ("GAsyncReadyCallback", "_callback_");
+               datastruct.add_field ("gpointer", "_user_data_");
                datastruct.add_field ("DBusPendingCall*", "pending");
 
                source_declarations.add_type_definition (datastruct);
@@ -1694,8 +1694,8 @@ internal class Vala.DBusClientModule : DBusModule {
 
                var cparam_map = new HashMap<int,CCodeFormalParameter> (direct_hash, direct_equal);
 
-               cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("callback", "GAsyncReadyCallback"));
-               cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("user_data", "gpointer"));
+               cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("_callback_", "GAsyncReadyCallback"));
+               cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("_user_data_", "gpointer"));
 
                generate_cparameters (m, source_declarations, cparam_map, function, null, null, null, 1);
 
@@ -1756,8 +1756,8 @@ internal class Vala.DBusClientModule : DBusModule {
                block.add_statement (datadecl);
                block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("data"), dataalloc)));
 
-               block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "callback"), new CCodeIdentifier ("callback"))));
-               block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "user_data"), new CCodeIdentifier ("user_data"))));
+               block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_callback_"), new CCodeIdentifier ("_callback_"))));
+               block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_user_data_"), new CCodeIdentifier ("_user_data_"))));
                block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "pending"), new CCodeIdentifier ("_pending"))));
 
                var pending = new CCodeFunctionCall (new CCodeIdentifier ("dbus_pending_call_set_notify"));
@@ -1795,8 +1795,8 @@ internal class Vala.DBusClientModule : DBusModule {
 
                var async_result_creation = new CCodeFunctionCall (new CCodeIdentifier ("g_simple_async_result_new"));
                async_result_creation.add_argument (object_creation);
-               async_result_creation.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "callback"));
-               async_result_creation.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "user_data"));
+               async_result_creation.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_callback_"));
+               async_result_creation.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_user_data_"));
                async_result_creation.add_argument (new CCodeIdentifier ("data"));
 
                var completecall = new CCodeFunctionCall (new CCodeIdentifier ("g_simple_async_result_complete"));
@@ -1823,7 +1823,7 @@ internal class Vala.DBusClientModule : DBusModule {
 
                var cparam_map = new HashMap<int,CCodeFormalParameter> (direct_hash, direct_equal);
 
-               cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("res", "GAsyncResult*"));
+               cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("_res_", "GAsyncResult*"));
 
                generate_cparameters (m, source_declarations, cparam_map, function, null, null, null, 2);
 
@@ -1845,7 +1845,7 @@ internal class Vala.DBusClientModule : DBusModule {
                block.add_statement (cdecl);
 
                var get_source_tag = new CCodeFunctionCall (new CCodeIdentifier ("g_simple_async_result_get_source_tag"));
-               get_source_tag.add_argument (new CCodeCastExpression (new CCodeIdentifier ("res"), "GSimpleAsyncResult *"));
+               get_source_tag.add_argument (new CCodeCastExpression (new CCodeIdentifier ("_res_"), "GSimpleAsyncResult *"));
                block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("data"), get_source_tag)));
 
                var ccall = new CCodeFunctionCall (new CCodeIdentifier ("dbus_pending_call_steal_reply"));

diff --git a/codegen/valadbusservermodule.vala b/codegen/valadbusservermodule.vala
index 84ebe988c4557ac03f8abeffbf5fb29512678b6a..54bce3f1f8cbd82351fcde85b0734ded4cd4bb07 100644 (file)
--- a/codegen/valadbusservermodule.vala
+++ b/codegen/valadbusservermodule.vala
@@ -102,15 +102,15 @@ internal class Vala.DBusServerModule : DBusClientModule {
                        ready_function = new CCodeFunction (wrapper_name + "_ready", "void");
                        ready_function.modifiers = CCodeModifiers.STATIC;
                        ready_function.add_parameter (new CCodeFormalParameter ("source_object", "GObject *"));
-                       ready_function.add_parameter (new CCodeFormalParameter ("res", "GAsyncResult *"));
-                       ready_function.add_parameter (new CCodeFormalParameter ("user_data", "gpointer *"));
+                       ready_function.add_parameter (new CCodeFormalParameter ("_res_", "GAsyncResult *"));
+                       ready_function.add_parameter (new CCodeFormalParameter ("_user_data_", "gpointer *"));
                        ready_block = new CCodeBlock ();
 
                        cdecl = new CCodeDeclaration ("DBusConnection *");
-                       cdecl.add_declarator (new CCodeVariableDeclarator ("connection", new CCodeIdentifier ("user_data[0]")));
+                       cdecl.add_declarator (new CCodeVariableDeclarator ("connection", new CCodeIdentifier ("_user_data_[0]")));
                        ready_block.add_statement (cdecl);
                        cdecl = new CCodeDeclaration ("DBusMessage *");
-                       cdecl.add_declarator (new CCodeVariableDeclarator ("message", new CCodeIdentifier ("user_data[1]")));
+                       cdecl.add_declarator (new CCodeVariableDeclarator ("message", new CCodeIdentifier ("_user_data_[1]")));
                        ready_block.add_statement (cdecl);
                }
 
@@ -173,7 +173,7 @@ internal class Vala.DBusServerModule : DBusClientModule {
                if (m.coroutine) {
                        finish_ccall = new CCodeFunctionCall (new CCodeIdentifier (m.get_finish_cname ()));
                        finish_ccall.add_argument (new CCodeIdentifier ("source_object"));
-                       finish_ccall.add_argument (new CCodeIdentifier ("res"));
+                       finish_ccall.add_argument (new CCodeIdentifier ("_res_"));
                }
 
                ccall.add_argument (new CCodeIdentifier ("self"));
@@ -349,17 +349,17 @@ internal class Vala.DBusServerModule : DBusClientModule {
                        new_call.add_argument (new CCodeIdentifier ("gpointer"));
                        new_call.add_argument (new CCodeConstant ("2"));
                        cdecl = new CCodeDeclaration ("gpointer *");
-                       cdecl.add_declarator (new CCodeVariableDeclarator ("user_data", new_call));
+                       cdecl.add_declarator (new CCodeVariableDeclarator ("_user_data_", new_call));
                        in_prefragment.append (cdecl);
 
                        var ref_call = new CCodeFunctionCall (new CCodeIdentifier ("dbus_connection_ref"));
                        ref_call.add_argument (new CCodeIdentifier ("connection"));
-                       in_prefragment.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("user_data[0]"), ref_call)));
+                       in_prefragment.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("_user_data_[0]"), ref_call)));
                        ref_call = new CCodeFunctionCall (new CCodeIdentifier ("dbus_message_ref"));
                        ref_call.add_argument (new CCodeIdentifier ("message"));
-                       in_prefragment.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("user_data[1]"), ref_call)));
+                       in_prefragment.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("_user_data_[1]"), ref_call)));
 
-                       ccall.add_argument (new CCodeIdentifier ("user_data"));
+                       ccall.add_argument (new CCodeIdentifier ("_user_data_"));
                }
 
                if (m.get_error_types ().size > 0) {
@@ -402,7 +402,7 @@ internal class Vala.DBusServerModule : DBusClientModule {
                        unref_call.add_argument (new CCodeIdentifier ("message"));
                        ready_block.add_statement (new CCodeExpressionStatement (unref_call));
                        var free_call = new CCodeFunctionCall (new CCodeIdentifier ("g_free"));
-                       free_call.add_argument (new CCodeIdentifier ("user_data"));
+                       free_call.add_argument (new CCodeIdentifier ("_user_data_"));
                        ready_block.add_statement (new CCodeExpressionStatement (free_call));
                }
 
@@ -630,7 +630,7 @@ internal class Vala.DBusServerModule : DBusClientModule {
 
                var cfunc = new CCodeFunction ("_" + sym.get_lower_case_cprefix () + "dbus_unregister", "void");
                cfunc.add_parameter (new CCodeFormalParameter ("connection", "DBusConnection*"));
-               cfunc.add_parameter (new CCodeFormalParameter ("user_data", "void*"));
+               cfunc.add_parameter (new CCodeFormalParameter ("_user_data_", "void*"));
 
                source_declarations.add_type_member_declaration (cfunc.copy ());
 

diff --git a/codegen/valagasyncmodule.vala b/codegen/valagasyncmodule.vala
index c8cc8fda6a602de5fab4b5788a88c43883c741b7..cc69d26f941ebd341880f5959d165cea5b6100ac 100644 (file)
--- a/codegen/valagasyncmodule.vala
+++ b/codegen/valagasyncmodule.vala
@@ -32,8 +32,8 @@ internal class Vala.GAsyncModule : GSignalModule {
                string dataname = Symbol.lower_case_to_camel_case (m.get_cname ()) + "Data";
                var data = new CCodeStruct ("_" + dataname);
 
-               data.add_field ("int", "state");
-               data.add_field ("GAsyncResult*", "res");
+               data.add_field ("int", "_state_");
+               data.add_field ("GAsyncResult*", "_res_");
                data.add_field ("GSimpleAsyncResult*", "_async_result");
 
                if (m.binding == MemberBinding.INSTANCE) {
@@ -132,10 +132,12 @@ internal class Vala.GAsyncModule : GSignalModule {
                var dataalloc = new CCodeFunctionCall (new CCodeIdentifier ("g_slice_new0"));
                dataalloc.add_argument (new CCodeIdentifier (dataname));
 
+               var data_var = new CCodeIdentifier ("_data_");
+
                var datadecl = new CCodeDeclaration (dataname + "*");
-               datadecl.add_declarator (new CCodeVariableDeclarator ("data"));
+               datadecl.add_declarator (new CCodeVariableDeclarator ("_data_"));
                asyncblock.add_statement (datadecl);
-               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("data"), dataalloc)));
+               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (data_var, dataalloc)));
 
                var create_result = new CCodeFunctionCall (new CCodeIdentifier ("g_simple_async_result_new"));
 
@@ -150,42 +152,42 @@ internal class Vala.GAsyncModule : GSignalModule {
                        create_result.add_argument (new CCodeConstant ("NULL"));
                }
 
-               create_result.add_argument (new CCodeIdentifier ("callback"));
-               create_result.add_argument (new CCodeIdentifier ("user_data"));
+               create_result.add_argument (new CCodeIdentifier ("_callback_"));
+               create_result.add_argument (new CCodeIdentifier ("_user_data_"));
                create_result.add_argument (new CCodeIdentifier (m.get_real_cname ()));
 
-               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_async_result"), create_result)));
+               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, "_async_result"), create_result)));
 
                var set_op_res_call = new CCodeFunctionCall (new CCodeIdentifier ("g_simple_async_result_set_op_res_gpointer"));
-               set_op_res_call.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_async_result"));
-               set_op_res_call.add_argument (new CCodeIdentifier ("data"));
+               set_op_res_call.add_argument (new CCodeMemberAccess.pointer (data_var, "_async_result"));
+               set_op_res_call.add_argument (data_var);
                set_op_res_call.add_argument (new CCodeIdentifier (m.get_real_cname () + "_data_free"));
                asyncblock.add_statement (new CCodeExpressionStatement (set_op_res_call));
 
                if (m.binding == MemberBinding.INSTANCE) {
-                       asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "self"), new CCodeIdentifier ("self"))));
+                       asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, "self"), new CCodeIdentifier ("self"))));
                }
 
                foreach (FormalParameter param in m.get_parameters ()) {
                        if (param.direction != ParameterDirection.OUT) {
-                               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_variable_cname (param.name)), new CCodeIdentifier (get_variable_cname (param.name)))));
+                               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, get_variable_cname (param.name)), new CCodeIdentifier (get_variable_cname (param.name)))));
                                if (param.parameter_type is ArrayType) {
                                        var array_type = (ArrayType) param.parameter_type;
                                        for (int dim = 1; dim <= array_type.rank; dim++) {
-                                               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_array_length_cname (get_variable_cname (param.name), dim)), new CCodeIdentifier (get_array_length_cname (get_variable_cname (param.name), dim)))));
+                                               asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, get_array_length_cname (get_variable_cname (param.name), dim)), new CCodeIdentifier (get_array_length_cname (get_variable_cname (param.name), dim)))));
                                        }
                                } else if (param.parameter_type is DelegateType) {
-                                       asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_delegate_target_cname (get_variable_cname (param.name))), new CCodeIdentifier (get_delegate_target_cname (get_variable_cname (param.name))))));
+                                       asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, get_delegate_target_cname (get_variable_cname (param.name))), new CCodeIdentifier (get_delegate_target_cname (get_variable_cname (param.name))))));
                                }
                        }
                }
 
                var ccall = new CCodeFunctionCall (new CCodeIdentifier (m.get_real_cname () + "_co"));
-               ccall.add_argument (new CCodeIdentifier ("data"));
+               ccall.add_argument (data_var);
                asyncblock.add_statement (new CCodeExpressionStatement (ccall));
 
-               cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("callback", "GAsyncReadyCallback"));
-               cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("user_data", "gpointer"));
+               cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("_callback_", "GAsyncReadyCallback"));
+               cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("_user_data_", "gpointer"));
 
                generate_cparameters (m, source_declarations, cparam_map, asyncfunc, null, null, null, 1);
 
@@ -227,8 +229,8 @@ internal class Vala.GAsyncModule : GSignalModule {
 
                        var asyncfunc = new CCodeFunction (m.get_cname (), "void");
                        var cparam_map = new HashMap<int,CCodeFormalParameter> (direct_hash, direct_equal);
-                       cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("callback", "GAsyncReadyCallback"));
-                       cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("user_data", "gpointer"));
+                       cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("_callback_", "GAsyncReadyCallback"));
+                       cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("_user_data_", "gpointer"));
 
                        generate_cparameters (m, decl_space, cparam_map, asyncfunc, null, null, null, 1);
 
@@ -240,7 +242,7 @@ internal class Vala.GAsyncModule : GSignalModule {
 
                        var finishfunc = new CCodeFunction (m.get_finish_cname ());
                        cparam_map = new HashMap<int,CCodeFormalParameter> (direct_hash, direct_equal);
-                       cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("res", "GAsyncResult*"));
+                       cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("_res_", "GAsyncResult*"));
 
                        generate_cparameters (m, source_declarations, cparam_map, finishfunc, null, null, null, 2);
 
@@ -308,41 +310,43 @@ internal class Vala.GAsyncModule : GSignalModule {
                        finishblock.add_statement (cdecl);
                }
 
+               var data_var = new CCodeIdentifier ("_data_");
+
                var datadecl = new CCodeDeclaration (dataname + "*");
-               datadecl.add_declarator (new CCodeVariableDeclarator ("data"));
+               datadecl.add_declarator (new CCodeVariableDeclarator ("_data_"));
                finishblock.add_statement (datadecl);
 
                var simple_async_result_cast = new CCodeFunctionCall (new CCodeIdentifier ("G_SIMPLE_ASYNC_RESULT"));
-               simple_async_result_cast.add_argument (new CCodeIdentifier ("res"));
+               simple_async_result_cast.add_argument (new CCodeIdentifier ("_res_"));
 
                var ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_simple_async_result_get_op_res_gpointer"));
                ccall.add_argument (simple_async_result_cast);
-               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("data"), ccall)));
+               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (data_var, ccall)));
 
                foreach (FormalParameter param in m.get_parameters ()) {
                        if (param.direction != ParameterDirection.IN) {
-                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (param.name)), new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_variable_cname (param.name)))));
-                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_variable_cname (param.name)), new CCodeConstant ("NULL"))));
+                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (param.name)), new CCodeMemberAccess.pointer (data_var, get_variable_cname (param.name)))));
+                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, get_variable_cname (param.name)), new CCodeConstant ("NULL"))));
                        }
                }
 
                if (!(return_type is VoidType)) {
-                       finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("result"), new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "result"))));
+                       finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("result"), new CCodeMemberAccess.pointer (data_var, "result"))));
                        if (return_type is ArrayType) {
                                var array_type = (ArrayType) return_type;
                                for (int dim = 1; dim <= array_type.rank; dim++) {
-                                       finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (get_array_length_cname ("result", dim))), new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_array_length_cname ("result", dim)))));
+                                       finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (get_array_length_cname ("result", dim))), new CCodeMemberAccess.pointer (data_var, get_array_length_cname ("result", dim)))));
                                }
                        } else if (return_type is DelegateType) {
-                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (get_delegate_target_cname ("result"))), new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_delegate_target_cname ("result")))));
+                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (get_delegate_target_cname ("result"))), new CCodeMemberAccess.pointer (data_var, get_delegate_target_cname ("result")))));
                        }
                        if (!(return_type is ValueType) || return_type.nullable) {
-                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "result"), new CCodeConstant ("NULL"))));
+                               finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, "result"), new CCodeConstant ("NULL"))));
                        }
                        finishblock.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("result")));
                }
 
-               cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("res", "GAsyncResult*"));
+               cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("_res_", "GAsyncResult*"));
 
                generate_cparameters (m, source_declarations, cparam_map, finishfunc, null, null, null, 2);
 
@@ -362,16 +366,16 @@ internal class Vala.GAsyncModule : GSignalModule {
                var readyfunc = new CCodeFunction (m.get_cname () + "_ready", "void");
 
                readyfunc.add_parameter (new CCodeFormalParameter ("source_object", "GObject*"));
-               readyfunc.add_parameter (new CCodeFormalParameter ("res", "GAsyncResult*"));
-               readyfunc.add_parameter (new CCodeFormalParameter ("user_data", "gpointer"));
+               readyfunc.add_parameter (new CCodeFormalParameter ("_res_", "GAsyncResult*"));
+               readyfunc.add_parameter (new CCodeFormalParameter ("_user_data_", "gpointer"));
 
                var readyblock = new CCodeBlock ();
 
                var datadecl = new CCodeDeclaration (dataname + "*");
                datadecl.add_declarator (new CCodeVariableDeclarator ("data"));
                readyblock.add_statement (datadecl);
-               readyblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("data"), new CCodeIdentifier ("user_data"))));
-               readyblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "res"), new CCodeIdentifier ("res"))));
+               readyblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("data"), new CCodeIdentifier ("_user_data_"))));
+               readyblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_res_"), new CCodeIdentifier ("_res_"))));
 
                var ccall = new CCodeFunctionCall (new CCodeIdentifier (m.get_real_cname () + "_co"));
                ccall.add_argument (new CCodeIdentifier ("data"));
@@ -427,7 +431,7 @@ internal class Vala.GAsyncModule : GSignalModule {
 
                        int state = next_coroutine_state++;
 
-                       cfrag.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "state"), new CCodeConstant (state.to_string ()))));
+                       cfrag.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), "_state_"), new CCodeConstant (state.to_string ()))));
                        cfrag.append (new CCodeReturnStatement (new CCodeConstant ("FALSE")));
                        cfrag.append (new CCodeCaseStatement (new CCodeConstant (state.to_string ())));
                        cfrag.append (new CCodeEmptyStatement ());
@@ -523,16 +527,16 @@ internal class Vala.GAsyncModule : GSignalModule {
                        decl_space.add_include ("gio/gio.h");
 
                        if (direction == 1) {
-                               cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("callback", "GAsyncReadyCallback"));
-                               cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("user_data", "gpointer"));
+                               cparam_map.set (get_param_pos (-1), new CCodeFormalParameter ("_callback_", "GAsyncReadyCallback"));
+                               cparam_map.set (get_param_pos (-0.9), new CCodeFormalParameter ("_user_data_", "gpointer"));
                                if (carg_map != null) {
-                                       carg_map.set (get_param_pos (-1), new CCodeIdentifier ("callback"));
-                                       carg_map.set (get_param_pos (-0.9), new CCodeIdentifier ("user_data"));
+                                       carg_map.set (get_param_pos (-1), new CCodeIdentifier ("_callback_"));
+                                       carg_map.set (get_param_pos (-0.9), new CCodeIdentifier ("_user_data_"));
                                }
                        } else if (direction == 2) {
-                               cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("res", "GAsyncResult*"));
+                               cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("_res_", "GAsyncResult*"));
                                if (carg_map != null) {
-                                       carg_map.set (get_param_pos (0.1), new CCodeIdentifier ("res"));
+                                       carg_map.set (get_param_pos (0.1), new CCodeIdentifier ("_res_"));
                                }
                        }
                }

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index 8d8d184476a40328ce57136340c3b5ffa143c8be..f56101105e5f8547bd9f3dd827874ece2ef496c8 100644 (file)
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -993,7 +993,7 @@ public class Vala.Method : Member {
                var callback_type = new DelegateType ((Delegate) glib_ns.scope.lookup ("AsyncReadyCallback"));
                callback_type.nullable = true;
 
-               var callback_param = new FormalParameter ("callback", callback_type);
+               var callback_param = new FormalParameter ("_callback_", callback_type);
                callback_param.default_expression = new NullLiteral (source_reference);
                callback_param.cparameter_position = -1;
                callback_param.cdelegate_target_parameter_position = -0.9;
@@ -1017,7 +1017,7 @@ public class Vala.Method : Member {
 
                var result_type = new ObjectType ((ObjectTypeSymbol) glib_ns.scope.lookup ("AsyncResult"));
 
-               var result_param = new FormalParameter ("res", result_type);
+               var result_param = new FormalParameter ("_res_", result_type);
                result_param.default_expression = new NullLiteral (source_reference);
                result_param.cparameter_position = 0.1;