chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Added workaround for bang with trailing backspace.

Browse Source 
http://rainmeter.net/forum/viewtopic.php?t=11229&p=64075
This commit is contained in:
spx 2012-02-08 01:52:54 +00:00
parent 340570437e
commit 82e8c6e307
1 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Library/Rainmeter.cpp
View File

@ -111,10 +111,25 @@ std::vector<std::wstring> CRainmeter::ParseString(LPCTSTR str)
// Split the argument between first space. // Split the argument between first space.
// Or if string is in quotes, the after the second quote. // Or if string is in quotes, the after the second quote.
auto stripQuotes = [&](std::wstring& string)
{
size_t pos = 0;
do
{
pos = string.find(L'"', pos);
if (pos != std::wstring::npos)
{
string.erase(pos, 1);
}
}
while (pos != std::wstring::npos);
};
size_t pos; size_t pos;
std::wstring newStr; std::wstring newStr;
while ((pos = arg.find_first_not_of(L' ')) != std::wstring::npos) while ((pos = arg.find_first_not_of(L' ')) != std::wstring::npos)
{ {
size_t extra = 1;
if (arg[pos] == L'"') if (arg[pos] == L'"')
{ {
if (arg.size() > (pos + 2) && if (arg.size() > (pos + 2) &&
@ -123,23 +138,12 @@ std::vector<std::wstring> CRainmeter::ParseString(LPCTSTR str)
// Eat found quotes and finding ending """ // Eat found quotes and finding ending """
arg.erase(0, pos + 3); arg.erase(0, pos + 3);
size_t extra = 4; extra = 4;
if ((pos = arg.find(L"\"\"\" ")) == std::wstring::npos) if ((pos = arg.find(L"\"\"\" ")) == std::wstring::npos)
{ {
extra = 3; extra = 3;
pos = arg.find(L"\"\"\""); pos = arg.rfind(L"\"\"\""); // search backward
} }
if (pos != std::wstring::npos)
{
newStr.assign(arg, 0, pos);
arg.erase(0, pos + extra);
result.push_back(newStr);
}
// Skip stripping quotes
continue;
} }
else else
{ {
@ -163,44 +167,25 @@ std::vector<std::wstring> CRainmeter::ParseString(LPCTSTR str)
if (pos != std::wstring::npos) if (pos != std::wstring::npos)
{ {
newStr.assign(arg, 0, pos); newStr.assign(arg, 0, pos);
arg.erase(0, pos + 1); arg.erase(0, pos + extra);
// Strip quotes
size_t start = 0;
do
{
pos = newStr.find(L'"', start);
if (pos != std::wstring::npos)
{
newStr.erase(pos, 1);
start = pos;
}
}
while (pos != std::wstring::npos);
if (extra == 1) stripQuotes(newStr);
result.push_back(newStr); result.push_back(newStr);
} }
else // quote or space not found else // quote or space not found
{ {
newStr = arg;
arg.clear();
if (extra == 1) stripQuotes(newStr);
result.push_back(newStr);
break; break;
} }
} }
if (!arg.empty()) if (!arg.empty() && result.empty())
{ {
// Strip quotes stripQuotes(arg);
size_t start = 0;
do
{
pos = arg.find(L'"', start);
if (pos != std::wstring::npos)
{
arg.erase(pos, 1);
start = pos;
}
}
while (pos != std::wstring::npos);
result.push_back(arg); result.push_back(arg);
} }
} }