From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 25 Jul 2010 07:03:31 +0000 (+0200)
Subject: Fix ellipsis parameter position in generated methods
X-Git-Tag: 0.9.8~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=260248750023cdbbe0bddc9348463e7efee14a35;p=thirdparty%2Fvala.git

Fix ellipsis parameter position in generated methods

Fixes bug 620673.
---

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 003e17a09..0df172f5f 100644
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -788,9 +788,9 @@ public class Vala.CCodeMethodModule : CCodeStructModule {
 			param.ccodenode = new CCodeFormalParameter.with_ellipsis ();
 		}
 
-		cparam_map.set (get_param_pos (param.cparameter_position), (CCodeFormalParameter) param.ccodenode);
+		cparam_map.set (get_param_pos (param.cparameter_position, param.ellipsis), (CCodeFormalParameter) param.ccodenode);
 		if (carg_map != null && !param.ellipsis) {
-			carg_map.set (get_param_pos (param.cparameter_position), get_variable_cexpression (param.name));
+			carg_map.set (get_param_pos (param.cparameter_position, param.ellipsis), get_variable_cexpression (param.name));
 		}
 	}
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dcaf3f029..e09841a0c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,6 +32,7 @@ TESTS = \
 	methods/bug598738.vala \
 	methods/bug599892.vala \
 	methods/bug613483.vala \
+	methods/bug620673.vala \
 	control-flow/break.vala \
 	control-flow/expressions-conditional.vala \
 	control-flow/for.vala \
diff --git a/tests/methods/bug620673.vala b/tests/methods/bug620673.vala
new file mode 100644
index 000000000..a305a3eb6
--- /dev/null
+++ b/tests/methods/bug620673.vala
@@ -0,0 +1,5 @@
+void foo (int bar, ...) throws Error {
+}
+
+void main () {
+}
\ No newline at end of file