]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
libvaladoc: accept "Vala ??.??.??-dirty" as driver format
authorFlorian Brosch <flo.brosch@gmail.com>
Mon, 6 Aug 2012 17:16:45 +0000 (19:16 +0200)
committerFlorian Brosch <flo.brosch@gmail.com>
Mon, 6 Aug 2012 19:19:29 +0000 (21:19 +0200)
src/libvaladoc/moduleloader.vala
src/libvaladoc/taglets/tagletthrows.vala

index 903367084fae9afab27b9129e7c1c0b32b6d528a..1571d51ebd87a0d8fa5a52c67be672b5449f3dc5 100644 (file)
@@ -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 (".");
index d833883d46945cb9e5300754411164a23e76aa8f..6bc51e64eebde0c220a4e2820df54884ec0630bf 100644 (file)
@@ -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 ;
                }