From 1a8d8210c92131bea237c379d4984d9b7198e98b Mon Sep 17 00:00:00 2001
From: Juerg Billeter <j@bitron.ch>
Date: Sat, 1 Sep 2007 05:58:23 +0000
Subject: [PATCH] check arguments of methods with ellipsis parameters

2007-09-01  Juerg Billeter  <j@bitron.ch>

	* vala/valasemanticanalyzer.vala: check arguments of methods with
	  ellipsis parameters

svn path=/trunk/; revision=560
---
 ChangeLog                      |  5 +++++
 vala/valasemanticanalyzer.vala | 22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f6fe99..a2cf888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-01  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valasemanticanalyzer.vala: check arguments of methods with
+	  ellipsis parameters
+
 2007-08-31  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valasemanticanalyzer.vala: improve error reporting for
diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index b498346..dfc7eff 100644
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1529,7 +1529,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 					return false;
 				} else if (arg.static_type == null) {
 					// disallow untyped arguments except for type inference of callbacks
-					if (!(param.type_reference.data_type is Callback)) {
+					if (!(param.type_reference.data_type is Callback) || !(arg.symbol_reference is Method)) {
 						expr.error = true;
 						Report.error (expr.source_reference, "Invalid type for argument %d".printf (i + 1));
 						return false;
@@ -1546,7 +1546,25 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 			}
 		}
 
-		if (!ellipsis && arg_it.next ()) {
+		if (ellipsis) {
+			while (arg_it.next ()) {
+				var arg = arg_it.get ();
+				if (arg.error) {
+					// ignore inner error
+					expr.error = true;
+					return false;
+				} else if (arg.static_type == null) {
+					// disallow untyped arguments except for type inference of callbacks
+					if (!(arg.symbol_reference is Method)) {
+						expr.error = true;
+						Report.error (expr.source_reference, "Invalid type for argument %d".printf (i + 1));
+						return false;
+					}
+				}
+
+				i++;
+			}
+		} else if (!ellipsis && arg_it.next ()) {
 			expr.error = true;
 			Report.error (expr.source_reference, "Too many arguments, method `%s' does not take %d arguments".printf (msym.get_full_name (), args.size));
 			return false;
-- 
2.7.4