Merge branch 'a'

Author: danngreen

tests/version_tools_tests.cc

@@ -7,54 +7,70 @@ TEST_CASE("parse") {
 		CHECK(vers.major == 1);
 		CHECK(vers.minor == 2);
 		CHECK(vers.revision == 16);
+		CHECK(vers.is_normal);
 	}
 
 	{
 		auto vers = VersionUtil::Version("9.1");
 		CHECK(vers.major == 9);
 		CHECK(vers.minor == 1);
 		CHECK(vers.revision == 0);
+		CHECK(vers.is_normal);
 	}
 
 	{
 		auto vers = VersionUtil::Version("2.0.99");
 		CHECK(vers.major == 2);
 		CHECK(vers.minor == 0);
 		CHECK(vers.revision == 99);
+		CHECK(vers.is_normal);
 	}
 
 	{
 		auto vers = VersionUtil::Version("209");
 		CHECK(vers.major == 209);
 		CHECK(vers.minor == 0);
 		CHECK(vers.revision == 0);
+		CHECK(vers.is_normal);
 	}
 
 	{
 		auto vers = VersionUtil::Version("garbage");
 		CHECK(vers.major == 0);
 		CHECK(vers.minor == 0);
 		CHECK(vers.revision == 0);
+		CHECK(vers.is_normal);
 	}
 
 	{
 		auto vers = VersionUtil::Version("67.BAD.123");
 		CHECK(vers.major == 67);
 		CHECK(vers.minor == 0);
 		CHECK(vers.revision == 123);
+		CHECK(vers.is_normal);
 	}
 
 	{
 		auto vers = VersionUtil::Version("77.-22.33");
 		CHECK(vers.major == 77);
 		CHECK(vers.minor == 0);
 		CHECK(vers.revision == 33);
+		CHECK(vers.is_normal);
 	}
 	{
 		auto vers = VersionUtil::Version("1.2.3-dev");
 		CHECK(vers.major == 1);
 		CHECK(vers.minor == 2);
 		CHECK(vers.revision == 3);
+		CHECK_FALSE(vers.is_normal);
+	}
+	{
+		auto vers = VersionUtil::Version("1.2.3");
+		CHECK(vers.is_normal);
+	}
+	{
+		auto vers = VersionUtil::Version("1.2.3-");
+		CHECK_FALSE(vers.is_normal);
 	}
 }
 

util/version_tools.hh

@@ -1,6 +1,6 @@
 #pragma once
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 #include <string_view>
 
 namespace VersionUtil
@@ -10,10 +10,11 @@ struct Version {
 	uint8_t major{};
 	uint8_t minor{};
 	uint8_t revision{};
+	bool is_normal{true}; // i.e. not a pre-release
 
 	void set_field(unsigned index, unsigned val) {
 		//sanity check:
-		if (val > 9999)
+		if (val > 255)
 			return;
 
 		if (index == 0)
@@ -29,7 +30,8 @@ struct Version {
 	Version(uint8_t maj, uint8_t min, uint8_t rev)
 		: major{maj}
 		, minor{min}
-		, revision{rev} {
+		, revision{rev}
+		, is_normal{true} {
 	}
 
 	Version(std::string_view vers) {
@@ -47,8 +49,11 @@ struct Version {
 			auto num = strtol(token.data(), nullptr, 10);
 			set_field(i++, num);
 
-			if (pos == std::string_view::npos)
+			if (pos == std::string_view::npos) {
+				// "normal" means not a pre-release, meaning there's no dash after the last number
+				is_normal = vers.find_first_of('-') == vers.npos;
 				break;
+			}
 		}
 	}
 
@@ -58,11 +63,13 @@ struct Version {
 	}
 
 	auto operator<=>(Version const &other) const {
-		if (major == other.major && minor == other.minor && revision == other.revision)
+		if (major == other.major && minor == other.minor && revision == other.revision && is_normal == other.is_normal)
 			return std::strong_ordering::equal;
 
 		if ((major < other.major) || (major == other.major && minor < other.minor) ||
-			(major == other.major && minor == other.minor && revision < other.revision))
+			(major == other.major && minor == other.minor && revision < other.revision) ||
+			(major == other.major && minor == other.minor && revision == other.revision && !is_normal &&
+			 other.is_normal))
 			return std::strong_ordering::less;
 
 		return std::strong_ordering::greater;