From 2a280f1db8f0ed8eb30b44cb761440e406997d69 Mon Sep 17 00:00:00 2001 From: Frederik 'playya' Sdun Date: Sun, 10 Jan 2010 00:41:39 +0100 Subject: [PATCH 1/3] Fix methods result names for async methods Signed-off-by: Frederik 'playya' Sdun --- codegen/valagasyncmodule.vala | 8 ++++---- vala/valaclass.vala | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/codegen/valagasyncmodule.vala b/codegen/valagasyncmodule.vala index 9bd6cb7..680dea9 100644 --- a/codegen/valagasyncmodule.vala +++ b/codegen/valagasyncmodule.vala @@ -349,7 +349,7 @@ internal class Vala.GAsyncModule : GSignalModule { var return_type = m.return_type; if (!(return_type is VoidType)) { var cdecl = new CCodeDeclaration (m.return_type.get_cname ()); - cdecl.add_declarator (new CCodeVariableDeclarator ("result")); + cdecl.add_declarator (new CCodeVariableDeclarator ("_result")); finishblock.add_statement (cdecl); } @@ -388,19 +388,19 @@ internal class Vala.GAsyncModule : GSignalModule { } if (!(return_type is VoidType)) { - finishblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("result"), new CCodeMemberAccess.pointer (data_var, "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 (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 (data_var, 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 (data_var, "result"), new CCodeConstant ("NULL")))); } - finishblock.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("result"))); + finishblock.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("_result"))); } cparam_map.set (get_param_pos (0.1), new CCodeFormalParameter ("_res_", "GAsyncResult*")); diff --git a/vala/valaclass.vala b/vala/valaclass.vala index aee7743..a563339 100644 --- a/vala/valaclass.vala +++ b/vala/valaclass.vala @@ -327,7 +327,7 @@ public class Vala.Class : ObjectTypeSymbol { if (m.result_var != null) { m.scope.remove (m.result_var.name); } - m.result_var = new LocalVariable (m.return_type.copy (), "result"); + m.result_var = new LocalVariable (m.return_type.copy (), "_result"); m.result_var.is_result = true; } if (m is CreationMethod) { -- 1.6.3.3