From: Florian Brosch <flo.brosch@gmail.com>
Date: Fri, 6 Jan 2012 00:46:25 +0000 (+0100)
Subject: libvaladoc: gir-reader: Improve @-quirks-mode
X-Git-Tag: 0.37.1~3^2~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=404d1a7d4ddee6505ff3dfbf859e835e58bec292;p=thirdparty%2Fvala.git

libvaladoc: gir-reader: Improve @-quirks-mode
---

diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index b804692f0..376624e56 100644
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -80,6 +80,13 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 				continue;
 			}
 
+			// ignore numbers
+			if (cmp0.get (1).isdigit ()) {
+				offset = offset + 2;
+				continue;
+			}
+
+
 			Text sec = factory.create_text (text.content.substring (offset+1, -1));
 			text.content = text.content.substring (0, offset+1);
 			return sec;
diff --git a/src/libvaladoc/documentation/gtkdoccommentscanner.vala b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
index fd16e3b15..2c24947fb 100644
--- a/src/libvaladoc/documentation/gtkdoccommentscanner.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
@@ -582,11 +582,12 @@ public class Valadoc.Gtkdoc.Scanner {
 	private Token? word_prefix () {
 		unowned string start = this.pos;
 		int column_start = this.column;
-		if (get () == '<') {
+		unichar c = get ();
+		if (c == '<' || c == '@') {
 			next_char ();
 		}
 
-		for (unichar c = get (); c != ' ' && c != '\t' && c != '\n' && c != '\0' && c != '<'; c = next_char ());
+		for (c = get (); c != ' ' && c != '\t' && c != '\n' && c != '\0' && c != '<' && c != '@'; c = next_char ());
 		int len = offset (this.pos, start);
 		if (len == 0) {
 			this.column = column_start;