Tribes2/T2-CPP
1
0
Fork 0
mirror of https://github.com/Ragora/T2-CPP.git synced 2026-07-15 22:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor adjustments to reIterBegin and reIterNext

Browse source
This commit is contained in:
Robert MacGregor 2016-05-01 20:15:12 -04:00
parent bf3ff3caba
commit b4bbf80dcb
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp
View file

@ -459,7 +459,6 @@ bool reIterBegin(Linker::SimObject* obj, S32 argc, const char* argv[])
currentRegex = std::regex(argv[1], std::regex::extended); currentRegex = std::regex(argv[1], std::regex::extended);
currentString = std::string(argv[2]); currentString = std::string(argv[2]);
matchBegin = std::sregex_iterator(currentString.begin(), currentString.end(), currentRegex); matchBegin = std::sregex_iterator(currentString.begin(), currentString.end(), currentRegex);
matchEnd = std::sregex_iterator();
currentMatchIter = matchBegin; currentMatchIter = matchBegin;
return true; return true;
@ -480,8 +479,11 @@ bool reIterEnd(Linker::SimObject* obj, S32 argc, const char* argv[])
const char* reIterNext(Linker::SimObject* obj, S32 argc, const char* argv[]) const char* reIterNext(Linker::SimObject* obj, S32 argc, const char* argv[])
{ {
if (currentMatchIter == matchEnd)
return "-1";
std::string currentResult = (*currentMatchIter).str(); std::string currentResult = (*currentMatchIter).str();
++currentMatchIter; ++currentMatchIter;
return currentResult.c_str(); return currentResult.data();
} }