blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 23:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore comment character if it appears in quotes

Browse source
This commit is contained in:
Dan Paulat 2023-07-17 21:57:04 -05:00
parent 6767c0c50a
commit c99e24f2c1
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
wxdata/include/scwx/gr/placefile.hpp
View file

@ -33,7 +33,7 @@ public:
Placefile(Placefile&&) noexcept; Placefile(Placefile&&) noexcept;
Placefile& operator=(Placefile&&) noexcept; Placefile& operator=(Placefile&&) noexcept;
bool IsValid() const; bool IsValid() const;
static std::shared_ptr<Placefile> Load(const std::string& filename); static std::shared_ptr<Placefile> Load(const std::string& filename);
static std::shared_ptr<Placefile> Load(std::istream& is); static std::shared_ptr<Placefile> Load(std::istream& is);
@ -43,5 +43,5 @@ private:
std::unique_ptr<Impl> p; std::unique_ptr<Impl> p;
}; };
} // namespace common } // namespace gr
} // namespace scwx } // namespace scwx

17
wxdata/source/scwx/gr/placefile.cpp
View file

@ -110,11 +110,20 @@ std::shared_ptr<Placefile> Placefile::Load(std::istream& is)
while (scwx::util::getline(is, line)) while (scwx::util::getline(is, line))
{ {
// Find position of comment (;) // Find position of comment (;)
std::size_t lineEnd = line.find(';'); bool inQuotes = false;
if (lineEnd == std::string::npos) for (std::size_t i = 0; i < line.size(); ++i)
{ {
// Remove comment if (!inQuotes && line[i] == ';')
line.erase(lineEnd); {
// Remove comment
line.erase(i);
break;
}
else if (line[i] == '"')
{
// Toggle quote state
inQuotes = !inQuotes;
}
} }
// Remove extra spacing from line // Remove extra spacing from line