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



commit 056a7494cc2a60370608f44e261cd9da75dfde3b
Author: Florian Brosch <flo brosch gmail com>
Date:   Mon Aug 6 19:16:45 2012 +0200

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

 src/libvaladoc/moduleloader.vala         |    8 ++++++--
 src/libvaladoc/taglets/tagletthrows.vala |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala
index 9033670..1571d51 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 d833883..6bc51e6 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 ;
 		}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]