voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-06 19:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

commands results and variables

Browse source
This commit is contained in:
MihailRis 2024-05-13 19:23:46 +03:00
parent 0a45987811
commit 5b2b89c778
7 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/logic/CommandsInterpreter.cpp
View file

@ -229,7 +229,10 @@ public:
case ArgType::integer:
return typeCheck<integer_t>(arg, value, "integer");
case ArgType::string:
return typeCheck<std::string>(arg, value, "string");
if (!std::holds_alternative<std::string>(value)) {
return !arg->optional;
}
break;
}
return true;
}
@ -316,6 +319,11 @@ public:
if (hasNext() && peekNoJump() != ' ') {
value = parseValue();
if (auto string = std::get_if<std::string>(&value)) {
if ((*string)[0] == '$') {
value = (*interpreter)[string->substr(1)];
}
}
// keyword argument
if (!relative && hasNext() && peek() == '=') {
@ -328,10 +336,9 @@ public:
Argument* arg = nullptr;
do {
if (arg) {
std::cout << "skipped arg " << arg->name << std::endl;
if (auto string = std::get_if<std::string>(&arg->def)) {
if ((*string)[0] == '$') {
args->put((*interpreter)[*string]);
args->put((*interpreter)[string->substr(1)]);
} else {
args->put(arg->def);
}