Semver: implement tryParse (#1084)

Author: ken-matsui

src/Manifest.cc

@@ -69,9 +69,9 @@ Package::tryFromToml(const toml::value& val) noexcept {
   auto edition = Try(Edition::tryFromString(
       Try(toml::try_find<std::string>(val, "package", "edition"))
   ));
-  auto version =
-      Version::parse(Try(toml::try_find<std::string>(val, "package", "version"))
-      );
+  auto version = Try(Version::tryParse(
+      Try(toml::try_find<std::string>(val, "package", "version"))
+  ));
   return Ok(Package(std::move(name), std::move(edition), std::move(version)));
 }
 

src/Semver.cc

@@ -469,18 +469,44 @@ Prerelease::parse(const std::string_view str) {
   VersionParser parser(str);
   return parser.parsePre();
 }
+Result<Prerelease>
+Prerelease::tryParse(const std::string_view str) noexcept {
+  try {
+    return Ok(parse(str));
+  } catch (const SemverError& e) {
+    Bail(e.what());
+  }
+}
 
 BuildMetadata
 BuildMetadata::parse(const std::string_view str) {
   VersionParser parser(str);
   return parser.parseBuild();
 }
+Result<BuildMetadata>
+BuildMetadata::tryParse(const std::string_view str) noexcept {
+  try {
+    return Ok(parse(str));
+  } catch (const SemverError& e) {
+    Bail(e.what());
+  }
+}
 
 Version
 Version::parse(const std::string_view str) {
   VersionParser parser(str);
   return parser.parse();
 }
+Result<Version>
+Version::tryParse(const std::string_view str) noexcept {
+  try {
+    return Ok(parse(str));
+  } catch (const SemverError& e) {
+    Bail(e.what());
+  }
+}
+
+// FIXME: remove exceptions and use Result entirely.
 
 #ifdef CABIN_TEST
 

src/Semver.hpp

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "Exception.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstddef>
 #include <cstdint>
@@ -57,6 +58,7 @@ struct Prerelease {
   std::vector<VersionToken> ident;
 
   static Prerelease parse(std::string_view str);
+  static Result<Prerelease> tryParse(std::string_view str) noexcept;
   bool empty() const noexcept;
   std::string toString() const noexcept;
 };
@@ -71,6 +73,7 @@ struct BuildMetadata {
   std::vector<VersionToken> ident;
 
   static BuildMetadata parse(std::string_view str);
+  static Result<BuildMetadata> tryParse(std::string_view str) noexcept;
   bool empty() const noexcept;
   std::string toString() const noexcept;
 };
@@ -83,6 +86,7 @@ struct Version {
   BuildMetadata build;
 
   static Version parse(std::string_view str);
+  static Result<Version> tryParse(std::string_view str) noexcept;
   std::string toString() const noexcept;
 };
 std::ostream& operator<<(std::ostream& os, const Version& ver) noexcept;