[vala/switch-to-gir] girparser: Add vfunc_name, abstract and virtual arguments

[Luca Bruno <lucabru src gnome org>]

commit 2b636f5230a5afdc07734f54eb090a38550bab56
Author: Luca Bruno <lucabru src gnome org>
Date:   Mon Aug 30 00:59:04 2010 +0200

    girparser: Add vfunc_name, abstract and virtual arguments

 vala/valagirparser.vala |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index b96272a..4998f5b 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -65,7 +65,10 @@ public class Vala.GirParser : CodeVisitor {
 		ARRAY_LENGTH_POS,
 		DEFAULT,
 		OUT,
-		REF;
+		REF,
+		VFUNC_NAME,
+		VIRTUAL,
+		ABSTRACT;
 
 		public static ArgumentType? from_string (string name) {
 			var enum_class = (EnumClass) typeof(ArgumentType).class_ref ();
@@ -324,6 +327,8 @@ public class Vala.GirParser : CodeVisitor {
 					case TokenType.DEFAULT:
 					case TokenType.OUT:
 					case TokenType.REF:
+					case TokenType.VIRTUAL:
+					case TokenType.ABSTRACT:
 						str = get_string ();
 						break;
 					}
@@ -2136,7 +2141,7 @@ public class Vala.GirParser : CodeVisitor {
 		if (element_name == "virtual-method" || element_name == "callback") {
 			if (s is Method) {
 				((Method) s).is_virtual = true;
-				if (invoker == null) {
+				if (invoker == null && !metadata.has_argument (ArgumentType.VFUNC_NAME)) {
 					s.attributes.append (new Attribute ("NoWrapper", s.source_reference));
 				}
 			}
@@ -2148,6 +2153,18 @@ public class Vala.GirParser : CodeVisitor {
 			((Method) s).binding = MemberBinding.STATIC;
 		}
 
+		if (s is Method) {
+			var method = (Method) s;
+			if (metadata.has_argument (ArgumentType.VIRTUAL)) {
+				method.is_virtual = metadata.get_bool (ArgumentType.VIRTUAL);
+				method.is_abstract = false;
+			} else if (metadata.has_argument (ArgumentType.ABSTRACT)) {
+				method.is_abstract = metadata.get_bool (ArgumentType.ABSTRACT);
+				method.is_virtual = false;
+			}
+			method.vfunc_name = metadata.get_string (ArgumentType.VFUNC_NAME);
+		}
+
 		var parameters = new ArrayList<MethodInfo> ();
 		var array_length_parameters = new ArrayList<int> ();
 		var closure_parameters = new ArrayList<int> ();