From: Jamie McCracken <jamiemcc gnome org>
Date: Mon, 13 Apr 2009 21:57:03 +0000 (-0400)
Subject: Report error when using conflicting method modifiers  in Genie parser
X-Git-Tag: 0.7.1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41efbe449e61d9fd892449fa7735457d01646ffb;p=thirdparty%2Fvala.git

Report error when using conflicting method modifiers  in Genie parser
---

diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index cef9324e7..3bca60049 100644
--- a/vala/valagenieparser.vala
+++ b/vala/valagenieparser.vala
@@ -2663,6 +2663,11 @@ public class Vala.Genie.Parser : CodeVisitor {
 		if (ModifierFlags.OVERRIDE in flags) {
 			method.overrides = true;
 		}
+		if ((method.is_abstract && method.is_virtual)
+		    || (method.is_abstract && method.overrides)
+		    || (method.is_virtual && method.overrides)) {
+			throw new ParseError.SYNTAX (get_error ("only one of `abstract', `virtual', or `override' may be specified"));
+		}
 		if (ModifierFlags.INLINE in flags) {
 			method.is_inline = true;
 		}