From: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Date: Wed, 3 Nov 2010 00:22:56 +0000 (+0100)
Subject: codegen: Fix reserved identifiers in delegate parameters
X-Git-Tag: 0.11.2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5884ac236b53df85fe6587b3f336cb688c65c28f;p=thirdparty%2Fvala.git

codegen: Fix reserved identifiers in delegate parameters

Fixes bug 633250.
---

diff --git a/codegen/valaccodedelegatemodule.vala b/codegen/valaccodedelegatemodule.vala
index a703f7ac7..12ecb6335 100644
--- a/codegen/valaccodedelegatemodule.vala
+++ b/codegen/valaccodedelegatemodule.vala
@@ -278,7 +278,7 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
 					Report.error (expr != null ? expr.source_reference : null, "Cannot create delegate without target for instance method or closure");
 					arg = new CCodeConstant ("NULL");
 				} else {
-					arg = new CCodeIdentifier (d_params.get (0).name);
+					arg = new CCodeIdentifier (get_variable_cname (d_params.get (0).name));
 					i = 1;
 				}
 			}
@@ -297,7 +297,7 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
 			}
 
 			CCodeExpression arg;
-			arg = new CCodeIdentifier (d_params.get (i).name);
+			arg = new CCodeIdentifier (get_variable_cname (d_params.get (i).name));
 			carg_map.set (get_param_pos (param.cparameter_position), arg);
 
 			// handle array arguments