From: Jürg Billeter <j@bitron.ch>
Date: Sat, 27 Mar 2010 08:33:35 +0000 (+0100)
Subject: vapigen: Support pointer type for type arguments and field types
X-Git-Tag: 0.8.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31b2e0e6eb6496e2960369318f11bbc5d8920cd0;p=thirdparty%2Fvala.git

vapigen: Support pointer type for type arguments and field types
---

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 34a363769..d0831128f 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1472,11 +1472,15 @@ public class Vala.GIdlParser : CodeVisitor {
 		return type;
 	}
 
-	public UnresolvedType? get_type_from_string (string type_arg) {
+	public DataType get_type_from_string (string type_arg) {
 		bool is_unowned = false;
 		UnresolvedSymbol? sym = null;
 
-		if ( type_arg.has_prefix ("unowned ") ) {
+		if (type_arg == "pointer") {
+			return new PointerType (new VoidType ());
+		}
+
+		if (type_arg.has_prefix ("unowned ")) {
 			type_arg = type_arg.offset ("unowned ".len ());
 			is_unowned = true;
 		}
@@ -1489,7 +1493,7 @@ public class Vala.GIdlParser : CodeVisitor {
 		arg_type.value_owned = !is_unowned;
 
 		return arg_type;
-     }
+	}
 
 	private Method? create_method (string name, string symbol, IdlNodeParam? res, GLib.List<IdlNodeParam>? parameters, bool is_constructor, bool is_interface) {
 		DataType return_type = null;
@@ -2046,11 +2050,15 @@ public class Vala.GIdlParser : CodeVisitor {
 						type.value_owned = true;
 					}
 				} else if (nv[0] == "type_name") {
-					var unresolved_sym = new UnresolvedSymbol (null, eval (nv[1]));
-					if (type is ArrayType) {
-						((UnresolvedType) ((ArrayType) type).element_type).unresolved_symbol = unresolved_sym;
+					if (eval (nv[1]) == "pointer") {
+						type = new PointerType (new VoidType ());
 					} else {
-						((UnresolvedType) type).unresolved_symbol = unresolved_sym;
+						var unresolved_sym = new UnresolvedSymbol (null, eval (nv[1]));
+						if (type is ArrayType) {
+							((UnresolvedType) ((ArrayType) type).element_type).unresolved_symbol = unresolved_sym;
+						} else {
+							((UnresolvedType) type).unresolved_symbol = unresolved_sym;
+						}
 					}
 				} else if (nv[0] == "type_arguments") {
 					var type_args = eval (nv[1]).split (",");