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 comment removing preprocessor not recognize comments when inside a string

Browse Source
This commit is contained in:
Jan 2021-03-13 15:48:04 +01:00
parent 8a227d1171
commit cff70daccb
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Parser/Parsing/Impl/CommentRemovingStreamProxy.cpp
View File

@ -17,7 +17,9 @@ ParserLine CommentRemovingStreamProxy::NextLine()
return ParserLine(line.m_filename, line.m_line_number, std::string()); return ParserLine(line.m_filename, line.m_line_number, std::string());
} }
unsigned multiLineCommentStart = 0; auto multiLineCommentStart = 0u;
auto inString = false;
auto isEscaped = false;
for (auto i = 0u; i < line.m_line.size(); i++) for (auto i = 0u; i < line.m_line.size(); i++)
{ {
const auto c = line.m_line[i]; const auto c = line.m_line[i];
@ -31,9 +33,22 @@ ParserLine CommentRemovingStreamProxy::NextLine()
m_inside_multi_line_comment = false; m_inside_multi_line_comment = false;
} }
} }
else if(inString)
{
if (isEscaped)
isEscaped = false;
else if (c == '\\')
isEscaped = true;
else if (c == '"')
inString = false;
}
else else
{ {
if(c == '/' && i + 1 < line.m_line.size()) if(c == '"')
{
inString = true;
}
else if(c == '/' && i + 1 < line.m_line.size())
{ {
const auto c1 = line.m_line[i + 1]; const auto c1 = line.m_line[i + 1];