AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Add support for string literals in Console::executeString, add implicit get/set for CVars

Browse Source
This commit is contained in:
Phillip Stephens
2018-06-12 19:03:29 -07:00
parent eff677ca20
commit 801214d9a8
4 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
hecl/lib/Console.cpp
View File

@@ -1,6 +1,7 @@
#include "hecl/Console.hpp"
#include "hecl/CVarManager.hpp"
#include "hecl/CVar.hpp"
#include "hecl/hecl.hpp"
#include "athena/Utility.hpp"
namespace hecl
@@ -54,10 +55,50 @@ void Console::executeString(const std::string& str)
for (std::string command : commands)
{
command = athena::utility::trim(command);
std::vector<std::string> args = athena::utility::split(command, ' ');
if (args.empty())
std::vector<std::string> tmpArgs = athena::utility::split(command, ' ');
if (tmpArgs.empty())
continue;
std::vector<std::string> args;
args.reserve(tmpArgs.size());
/* detect string literals */
bool isInLiteral = false;
std::string curLiteral;
int depth = 0;
for (std::string arg : tmpArgs)
{
if ((arg.front() == '\'' || arg.front() == '"'))
{
++depth;
isInLiteral = true;
curLiteral += arg;
}
else if ((arg.back() == '\'' || arg.back() == '"') && isInLiteral)
{
--depth;
curLiteral += arg;
args.push_back(curLiteral);
if (depth <= 0)
{
depth = 0;
isInLiteral = false;
curLiteral.clear();
}
}
else if (isInLiteral)
curLiteral += arg;
else
args.push_back(arg);
}
if (isInLiteral)
{
if ((curLiteral.back() != '\'' && curLiteral.back() != '"') || depth > 1)
{
report(Level::Warning, "Unterminated string literal");
return;
}
args.push_back(curLiteral);
}
std::string commandName = args[0];
args.erase(args.begin());
@@ -80,6 +121,14 @@ void Console::executeString(const std::string& str)
}
m_commands[lowComName].m_func(this, args);
}
else if (const CVar* cv = m_cvarMgr->findCVar(commandName))
{
args.insert(args.begin(), commandName);
if (args.size() > 1)
m_cvarMgr->setCVar(this, args);
else
m_cvarMgr->getCVar(this, args);
}
else
report(Level::Error, "Command '%s' is not valid!", commandName.c_str());
}