From: Florian Brosch <flo.brosch@gmail.com>
Date: Mon, 6 Aug 2012 17:16:45 +0000 (+0200)
Subject: libvaladoc: accept "Vala ??.??.??-dirty" as driver format
X-Git-Tag: 0.37.1~3^2~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=056a7494cc2a60370608f44e261cd9da75dfde3b;p=thirdparty%2Fvala.git

libvaladoc: accept "Vala ??.??.??-dirty" as driver format
---

diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala
index 903367084..1571d51eb 100644
--- a/src/libvaladoc/moduleloader.vala
+++ b/src/libvaladoc/moduleloader.vala
@@ -118,9 +118,13 @@ public class Valadoc.ModuleLoader : Object {
 		}
 
 
-		// selected string is a version number:
+		// selected string is a `valac --version` number:
 		if (driverpath.has_prefix ("Vala ")) {
-			driverpath = driverpath.substring (5);
+			if (driverpath.has_suffix ("-dirty")) {
+				driverpath = driverpath.substring (5, driverpath.length - 6 - 5);
+			} else {
+				driverpath = driverpath.substring (5);
+			}
 		}
 
 		string[] segments = driverpath.split (".");
diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala
index d833883d4..6bc51e64e 100644
--- a/src/libvaladoc/taglets/tagletthrows.vala
+++ b/src/libvaladoc/taglets/tagletthrows.vala
@@ -49,7 +49,7 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
 		error_domain = api_root.search_symbol_str (container, error_domain_name);
 		if (error_domain == null) {
 			// TODO use ContentElement's source reference
-			reporter.simple_error ("%s: %s: @throws: warning: %s does not exist", file_path, container.get_full_name (), error_domain_name);
+			reporter.simple_error ("%s: %s: @throws: error: %s does not exist", file_path, container.get_full_name (), error_domain_name);
 			base.check (api_root, container, file_path, reporter, settings);
 			return ;
 		}