From: Florian Brosch <flo.brosch@gmail.com>
Date: Fri, 6 Jan 2012 01:36:19 +0000 (+0100)
Subject: libvaladoc: gir-reader: allow _ as prefix in function names
X-Git-Tag: 0.37.1~3^2~257
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6b15ef4ca6180d42b5d1efba3a8b6117214ce088;p=thirdparty%2Fvala.git

libvaladoc: gir-reader: allow _ as prefix in function names
---

diff --git a/src/libvaladoc/documentation/gtkdoccommentscanner.vala b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
index 2c24947fb..978bce870 100644
--- a/src/libvaladoc/documentation/gtkdoccommentscanner.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
@@ -236,24 +236,25 @@ public class Valadoc.Gtkdoc.Scanner {
 	}
 
 	private inline int id_prefix () {
-		if (!letter (get ())) {
+		unichar c = get ();
+
+		if (!letter (c) && c != '_') {
 			return 0;
 		}
 
 		int start = this.column;
-		unichar c;
 		while ((c = next_char ()) == '_' || letter_or_number (c));
 		return this.column - start;
 	}
 
 	private inline int g_id_prefix () {
 		unowned string start = this.pos;
+		unichar c = get ();
 
-		if (!letter (get ())) {
+		if (!letter (c)) {
 			return 0;
 		}
 
-		unichar c;
 		while ((c = next_char ()) == '_' || c == '-' || letter_or_number (c));
 		return offset (this.pos, start);
 	}
@@ -271,6 +272,7 @@ public class Valadoc.Gtkdoc.Scanner {
 		unowned string start = this.pos;
 		int column_start = this.column;
 		int id_len = 0;
+
 		if ((id_len = id_prefix ()) == 0) {
 			return null;
 		}