fix ContentPack enums formatting
This commit is contained in:
parent
f44747587f
commit
53e1528d5c
@ -118,18 +118,18 @@ ContentPack ContentPack::read(const io::path& folder) {
|
||||
const auto& dependencies = *found;
|
||||
for (const auto& elem : dependencies) {
|
||||
std::string depName = elem.asString();
|
||||
auto level = DependencyLevel::required;
|
||||
auto level = DependencyLevel::REQUIRED;
|
||||
switch (depName.at(0)) {
|
||||
case '!':
|
||||
depName = depName.substr(1);
|
||||
break;
|
||||
case '?':
|
||||
depName = depName.substr(1);
|
||||
level = DependencyLevel::optional;
|
||||
level = DependencyLevel::OPTIONAL;
|
||||
break;
|
||||
case '~':
|
||||
depName = depName.substr(1);
|
||||
level = DependencyLevel::weak;
|
||||
level = DependencyLevel::WEAK;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@ -26,14 +26,14 @@ public:
|
||||
};
|
||||
|
||||
enum class DependencyVersionOperator {
|
||||
equal, more, less,
|
||||
more_or_equal, less_or_equal
|
||||
EQUAL, GREATHER, LESS,
|
||||
GREATHER_OR_EQUAL, LESS_OR_EQUAL
|
||||
};
|
||||
|
||||
enum class DependencyLevel {
|
||||
required, // dependency must be installed
|
||||
optional, // dependency will be installed if found
|
||||
weak, // only affects packs order
|
||||
REQUIRED, // dependency must be installed
|
||||
OPTIONAL, // dependency will be installed if found
|
||||
WEAK, // only affects packs order
|
||||
};
|
||||
|
||||
/// @brief Content-pack that should be installed earlier the dependent
|
||||
|
||||
@ -28,17 +28,17 @@ Version::Version(const std::string& version) {
|
||||
|
||||
DependencyVersionOperator Version::string_to_operator(const std::string& op) {
|
||||
if (op == "=")
|
||||
return DependencyVersionOperator::equal;
|
||||
return DependencyVersionOperator::EQUAL;
|
||||
else if (op == ">")
|
||||
return DependencyVersionOperator::more;
|
||||
return DependencyVersionOperator::GREATHER;
|
||||
else if (op == "<")
|
||||
return DependencyVersionOperator::less;
|
||||
return DependencyVersionOperator::LESS;
|
||||
else if (op == ">=" || op == "=>")
|
||||
return DependencyVersionOperator::more_or_equal;
|
||||
return DependencyVersionOperator::GREATHER_OR_EQUAL;
|
||||
else if (op == "<=" || op == "=<")
|
||||
return DependencyVersionOperator::less_or_equal;
|
||||
return DependencyVersionOperator::LESS_OR_EQUAL;
|
||||
else
|
||||
return DependencyVersionOperator::equal;
|
||||
return DependencyVersionOperator::EQUAL;
|
||||
}
|
||||
|
||||
bool isNumber(const std::string& s) {
|
||||
|
||||
@ -37,15 +37,15 @@ public:
|
||||
auto dep_op = Version::string_to_operator(op);
|
||||
|
||||
switch (dep_op) {
|
||||
case DependencyVersionOperator::equal:
|
||||
case DependencyVersionOperator::EQUAL:
|
||||
return *this == other;
|
||||
case DependencyVersionOperator::more:
|
||||
case DependencyVersionOperator::GREATHER:
|
||||
return *this > other;
|
||||
case DependencyVersionOperator::less:
|
||||
case DependencyVersionOperator::LESS:
|
||||
return *this < other;
|
||||
case DependencyVersionOperator::less_or_equal:
|
||||
case DependencyVersionOperator::LESS_OR_EQUAL:
|
||||
return *this <= other;
|
||||
case DependencyVersionOperator::more_or_equal:
|
||||
case DependencyVersionOperator::GREATHER_OR_EQUAL:
|
||||
return *this >= other;
|
||||
default:
|
||||
return false;
|
||||
|
||||
@ -91,7 +91,7 @@ static bool resolve_dependencies(
|
||||
}
|
||||
auto found = packs.find(dep.id);
|
||||
bool exists = found != packs.end();
|
||||
if (!exists && dep.level == DependencyLevel::required) {
|
||||
if (!exists && dep.level == DependencyLevel::REQUIRED) {
|
||||
throw contentpack_error(
|
||||
dep.id, io::path(), "dependency of '" + pack->id + "'"
|
||||
);
|
||||
@ -100,7 +100,7 @@ static bool resolve_dependencies(
|
||||
// ignored for optional or weak dependencies
|
||||
continue;
|
||||
}
|
||||
if (resolveWeaks && dep.level == DependencyLevel::weak) {
|
||||
if (resolveWeaks && dep.level == DependencyLevel::WEAK) {
|
||||
// dependency pack is found but not added yet
|
||||
// resolveWeaks is used on second iteration, so it's will not be
|
||||
// added
|
||||
@ -125,7 +125,7 @@ static bool resolve_dependencies(
|
||||
}
|
||||
|
||||
if (!util::contains(allNames, dep.id) &&
|
||||
dep.level != DependencyLevel::weak) {
|
||||
dep.level != DependencyLevel::WEAK) {
|
||||
allNames.push_back(dep.id);
|
||||
queue.push(&found->second);
|
||||
}
|
||||
|
||||
@ -102,13 +102,13 @@ static int l_pack_get_info(
|
||||
auto& dpack = pack.dependencies[i];
|
||||
std::string prefix;
|
||||
switch (dpack.level) {
|
||||
case DependencyLevel::required:
|
||||
case DependencyLevel::REQUIRED:
|
||||
prefix = "!";
|
||||
break;
|
||||
case DependencyLevel::optional:
|
||||
case DependencyLevel::OPTIONAL:
|
||||
prefix = "?";
|
||||
break;
|
||||
case DependencyLevel::weak:
|
||||
case DependencyLevel::WEAK:
|
||||
prefix = "~";
|
||||
break;
|
||||
default:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user