folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from wolfv/more_complex_deps 

add support for parsing `!=` and make fuzzy logic easier
This commit is contained in:
Wolf Vollprecht 2019-03-26 10:22:40 +01:00 committed by GitHub
parent 30e61ca688 03eab42d9b
commit 69cc56d4a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/parsing.cpp
View File

@ -82,6 +82,10 @@ parsed_relation get_relation(const std::string_view& vs)
res.relation = REL_EQ;
start = 2;
}
else if (vs[0] == '!' && vs[1] == '=')
{
res.relation = REL_GT | REL_LT;
}
if (vs[vs.size() - 1] == '*')
{
@ -100,23 +104,15 @@ parsed_relation get_relation(const std::string_view& vs)
if (res.fuzzy && res.relation != REL_EQ)
{
if (res.relation | REL_GT)
if (res.relation & REL_GT || res.relation & REL_LT)
{
res.relation = REL_EQ;
// just remove * from end, do nothing
res.fuzzy = false;
}
else
{
if (res.relation & REL_LT)
{
// just remove * from end, do nothing
res.fuzzy = false;
}
else
{
std::cout << vs << std::endl;
throw std::runtime_error("Cannot match fuzzy version with other than `==`");
}
std::cout << vs << std::endl;
throw std::runtime_error("Cannot match fuzzy version with other than `==`");
// TODO fix this intelligently with build string comparison ... ?
}
}