7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-27 01:45:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make >= default prevent issues

Browse source
This commit is contained in:
camila314 2023-02-09 09:45:06 -06:00
parent 1f7d50a9b9
commit 41aef57758
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
loader/include/Geode/utils/VersionInfo.hpp
View file

@ -121,12 +121,15 @@ namespace geode {
if (m_version.getMajor() != version.getMajor()) { if (m_version.getMajor() != version.getMajor()) {
return false; return false;
} }
switch (m_compare) { switch (m_compare) {
case VersionCompare::Exact: return m_version == version; break; case VersionCompare::LessEq:
case VersionCompare::LessEq: return m_version <= version; break; return m_version <= version;
case VersionCompare::MoreEq: return m_version >= version; break; case VersionCompare::MoreEq:
return m_version >= version;
default:
return m_version == version;
} }
return false;
} }
std::string toString() const; std::string toString() const;

9
loader/src/utils/VersionInfo.cpp
View file

@ -115,15 +115,16 @@ Result<ComparableVersionInfo> ComparableVersionInfo::parse(std::string const& ra
if (string.starts_with("<=")) { if (string.starts_with("<=")) {
compare = VersionCompare::LessEq; compare = VersionCompare::LessEq;
string.erase(0, 2); string.erase(0, 2);
} } else if (string.starts_with(">=")) {
else if (string.starts_with(">=")) {
compare = VersionCompare::MoreEq; compare = VersionCompare::MoreEq;
string.erase(0, 2); string.erase(0, 2);
} } else if (string.starts_with("=")) {
else if (string.starts_with("=")) {
compare = VersionCompare::Exact; compare = VersionCompare::Exact;
string.erase(0, 1); string.erase(0, 1);
} else {
compare = VersionCompare::MoreEq;
} }
GEODE_UNWRAP_INTO(auto version, VersionInfo::parse(string)); GEODE_UNWRAP_INTO(auto version, VersionInfo::parse(string));
return Ok(ComparableVersionInfo(version, compare)); return Ok(ComparableVersionInfo(version, compare));
} }