From: Jürg Billeter <j@bitron.ch>
Date: Wed, 28 Aug 2013 15:07:11 +0000 (+0200)
Subject: girparser: accept empty tuple for parameters without initializer
X-Git-Tag: 0.21.2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c5b620301b970f37a5fc87dc0ffd4d01a32673;p=thirdparty%2Fvala.git

girparser: accept empty tuple for parameters without initializer
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index fde6b68fb..3ad733568 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -427,6 +427,14 @@ public class Vala.GirParser : CodeVisitor {
 					expr = new MemberAccess (expr, get_string (), get_current_src ());
 				}
 				return expr;
+			case TokenType.OPEN_PARENS:
+				// empty tuple => no expression
+				if (next () != TokenType.CLOSE_PARENS) {
+					Report.error (get_current_src (), "expected `)', got %s".printf (current.to_string ()));
+					break;
+				}
+				expr = new Tuple (src);
+				break;
 			default:
 				Report.error (src, "expected literal or symbol got %s".printf (current.to_string ()));
 				break;
@@ -2278,6 +2286,11 @@ public class Vala.GirParser : CodeVisitor {
 				}
 			}
 			param.initializer = metadata.get_expression (ArgumentType.DEFAULT);
+
+			// empty tuple used for parameters without initializer
+			if (param.initializer is Tuple) {
+				param.initializer = null;
+			}
 		}
 		end_element ("parameter");
 		return param;