zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure last field in infostring is still output even if it is empty

Browse Source
This commit is contained in:
Jan 2021-03-26 15:26:44 +01:00
parent 3520a9bd2c
commit 540e631fd5
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ObjCommon/InfoString/InfoString.cpp
View File

@ -99,20 +99,31 @@ void InfoString::ToGdtProperties(const std::string& prefix, GdtEntry& gdtEntry)
class InfoStringInputStream class InfoStringInputStream
{ {
std::istream& m_stream; std::istream& m_stream;
int m_last_separator;
public: public:
explicit InfoStringInputStream(std::istream& stream) explicit InfoStringInputStream(std::istream& stream)
: m_stream(stream) : m_stream(stream),
m_last_separator(EOF)
{ {
} }
bool NextField(std::string& value) const bool NextField(std::string& value)
{ {
std::ostringstream str; std::ostringstream str;
auto c = m_stream.get(); auto c = m_stream.get();
if (c == EOF) if (c == EOF)
{
if(m_last_separator != EOF)
{
m_last_separator = EOF;
value = std::string();
return true;
}
return false; return false;
}
while (c != EOF && c != '\\') while (c != EOF && c != '\\')
{ {
@ -120,6 +131,7 @@ public:
c = m_stream.get(); c = m_stream.get();
} }
m_last_separator = c;
value = str.str(); value = str.str();
return true; return true;
} }
@ -127,7 +139,7 @@ public:
bool InfoString::FromStream(std::istream& stream) bool InfoString::FromStream(std::istream& stream)
{ {
const InfoStringInputStream infoStream(stream); InfoStringInputStream infoStream(stream);
std::string key; std::string key;
while (infoStream.NextField(key)) while (infoStream.NextField(key))
@ -153,7 +165,7 @@ bool InfoString::FromStream(std::istream& stream)
bool InfoString::FromStream(const std::string& prefix, std::istream& stream) bool InfoString::FromStream(const std::string& prefix, std::istream& stream)
{ {
const InfoStringInputStream infoStream(stream); InfoStringInputStream infoStream(stream);
std::string readPrefix; std::string readPrefix;
if (!infoStream.NextField(readPrefix)) if (!infoStream.NextField(readPrefix))
@ -163,14 +175,14 @@ bool InfoString::FromStream(const std::string& prefix, std::istream& stream)
return false; return false;
std::string key; std::string key;
while(infoStream.NextField(key)) while (infoStream.NextField(key))
{ {
std::string value; std::string value;
if (!infoStream.NextField(value)) if (!infoStream.NextField(value))
return false; return false;
const auto existingEntry = m_values.find(key); const auto existingEntry = m_values.find(key);
if(existingEntry == m_values.end()) if (existingEntry == m_values.end())
{ {
m_keys_by_insertion.push_back(key); m_keys_by_insertion.push_back(key);
m_values.emplace(std::make_pair(key, value)); m_values.emplace(std::make_pair(key, value));